Revert "Merge branch 'develop' of https://github.com/ufs-community/uf…

…s-weather-model into feature/rad-fix-new"

This reverts commit cf66a90, reversing
changes made to 49445ac.

.github/pull_request_template.md

@@ -146,11 +146,10 @@ Please delete what is not needed.
   - [ ] Orion
   - [ ] Hercules
   - [ ] Jet
-  - [ ] GaeaC5
-  - [ ] GaeaC6
+  - [ ] Gaea
   - [ ] Derecho
 - WCOSS2
   - [ ] Dogwood/Cactus
   - [ ] Acorn
 - [ ] CI
-- [ ] opnReqTest (complete task if unnecessary)
+- [ ] opnReqTest (complete task if unnecessary)

CDEPS-interface/CMakeLists.txt

@@ -95,14 +95,6 @@ target_include_directories(dwav PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY
 target_link_libraries(dwav PRIVATE dshr share streams)
 target_link_libraries(dwav PRIVATE esmf)
 
-# CDEPS/dglc
-add_library(dglc OBJECT ${cdeps_dglc_files})
-add_dependencies(dglc share streams dshr)
-set_target_properties(dglc PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(dglc PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
-target_link_libraries(dglc PRIVATE dshr share streams)
-target_link_libraries(dglc PRIVATE esmf PIO::PIO_Fortran)
-
 # CDEPS
 add_library(cdeps STATIC $<TARGET_OBJECTS:share>
                          $<TARGET_OBJECTS:streams>
@@ -112,8 +104,7 @@ add_library(cdeps STATIC $<TARGET_OBJECTS:share>
                          $<TARGET_OBJECTS:dlnd>
                          $<TARGET_OBJECTS:docn>
                          $<TARGET_OBJECTS:drof>
-                         $<TARGET_OBJECTS:dwav>
-                         $<TARGET_OBJECTS:dglc>)
+                         $<TARGET_OBJECTS:dwav>)
 add_library(cdeps::cdeps ALIAS cdeps)
 target_include_directories(cdeps PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                         $<INSTALL_INTERFACE:mod>)

CDEPS-interface/cdeps_files.cmake

@@ -25,7 +25,6 @@ list(APPEND cdeps_share_files
   CDEPS/share/shr_timer_mod.F90
   CDEPS/share/shr_file_mod.F90
   CDEPS/share/shr_nl_mod.F90
-  CDEPS/share/nuopc_shr_methods.F90
 )
 
 list(APPEND cdeps_streams_files
@@ -69,8 +68,6 @@ list(APPEND cdeps_docn_files
   CDEPS/docn/docn_datamode_iaf_mod.F90
   CDEPS/docn/docn_datamode_som_mod.F90
   CDEPS/docn/docn_datamode_cplhist_mod.F90
-  CDEPS/docn/docn_datamode_multilev_mod.F90
-  CDEPS/docn/docn_datamode_multilev_dom_mod.F90
   CDEPS/docn/docn_import_data_mod.F90
   CDEPS/docn/ocn_comp_nuopc.F90
 )
@@ -82,8 +79,3 @@ list(APPEND cdeps_drof_files
 list(APPEND cdeps_dwav_files
   CDEPS/dwav/wav_comp_nuopc.F90
 )
-
-list(APPEND cdeps_dglc_files
-  CDEPS/dglc/dglc_datamode_noevolve_mod.F90
-  CDEPS/dglc/glc_comp_nuopc.F90
-)

CMEPS-interface/CMakeLists.txt

@@ -43,7 +43,6 @@ list(APPEND _ufs_util_files
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
-  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/nuopc_shr_methods.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90)
 
 list(APPEND _mediator_files
@@ -67,6 +66,7 @@ list(APPEND _mediator_files
   CMEPS/mediator/med_phases_prep_ocn_mod.F90
   CMEPS/mediator/esmFlds.F90
   CMEPS/mediator/med.F90
+  CMEPS/mediator/med_time_mod.F90
   CMEPS/mediator/med_phases_ocnalb_mod.F90
   CMEPS/mediator/med_phases_prep_wav_mod.F90
   CMEPS/mediator/med_utils_mod.F90

modulefiles/ufs_gaeac5.intel.lua → modulefiles/ufs_gaea.intel.lua

@@ -3,7 +3,7 @@ help([[
   on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
 ]])
 
-whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C5 ]===])
+whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])
 
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
@@ -30,4 +30,4 @@ unload("cray-libsci")
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
-setenv("CMAKE_Platform","gaeac5.intel")
+setenv("CMAKE_Platform","gaea.intel")

modulefiles/ufs_gaeac5.intelllvm.lua → modulefiles/ufs_gaea.intelllvm.lua

@@ -3,7 +3,7 @@ help([[
   on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
 ]])
 
-whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C5]===])
+whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])
 
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
@@ -36,4 +36,4 @@ setenv("I_MPI_F90", "ifx")
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
-setenv("CMAKE_Platform","gaeac5.intelllvm")
+setenv("CMAKE_Platform","gaea.intelllvm")

tests-dev/ufs_test_utils.sh

@@ -5,13 +5,8 @@ function set_run_task() {
     source default_vars.sh
     source rt_utils.sh
     source "${PATHRT}"/tests/"${TEST_NAME}"
-    #jkim compute_petbounds_and_tasks
-    if [[ ${ESMF_THREADING} == true ]]; then
-        compute_petbounds_and_tasks_esmf_threading
-    else
-        compute_petbounds_and_tasks_traditional_threading
-    fi
-
+    compute_petbounds_and_tasks
+
     TPN=$(( TPN / THRD ))
     NODES=$(( TASKS / TPN ))
     if (( NODES * TPN < TASKS )); then

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20241230
+export BL_DATE=20241206

tests/compile.sh

@@ -61,10 +61,7 @@ case ${MACHINE_ID} in
     ;;
   *)
     # Activate lua environment for gaea c5
-    if [[ ${MACHINE_ID} == gaeac5 ]]; then
-      module reset
-    fi
-    if [[ ${MACHINE_ID} == gaeac6 ]]; then
+    if [[ ${MACHINE_ID} == gaea ]]; then
       module reset
     elif [[ ${MACHINE_ID} == hercules ]]; then
       module purge
@@ -100,6 +97,17 @@ SUITES=$(grep -Po "\-DCCPP_SUITES=\K[^ ]*" <<< "${MAKE_OPT}")
 export SUITES
 set -ex
 
+# Valid applications
+if [[ ${MACHINE_ID} != gaea ]] || [[ ${RT_COMPILER} != intelllvm ]]; then # skip MOM6SOLO on gaea with intelllvm
+  if [[ "${MAKE_OPT}" == *"-DAPP=S2S"* ]]; then
+      CMAKE_FLAGS+=" -DMOM6SOLO=ON"
+  fi
+
+  if [[ "${MAKE_OPT}" == *"-DAPP=NG-GODAS"* ]]; then
+      CMAKE_FLAGS+=" -DMOM6SOLO=ON"
+  fi
+fi
+
 CMAKE_FLAGS=$(set -e; trim "${CMAKE_FLAGS}")
 echo "CMAKE_FLAGS = ${CMAKE_FLAGS}"