Sync with ESCOMP/CDEPS (2024-12) + Update global_control.nml.IN based on GW specs (#2528) + Sync with ESCOMP/CMEPS

.gitmodules

@@ -16,8 +16,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS
+  branch = feature/updcmeps
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
   url = https://github.com/NOAA-EMC/HYCOM-src
@@ -32,8 +34,8 @@
   branch = develop
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
-  url = https://github.com/NOAA-EMC/CDEPS
-  branch = develop
+  url = https://github.com/NickSzapiro-NOAA/CDEPS
+  branch = sync_escomp_2024-10
 [submodule "GOCART"]
   path = GOCART
   url = https://github.com/GEOS-ESM/GOCART

CDEPS-interface/CMakeLists.txt

@@ -95,6 +95,14 @@ 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>
@@ -104,7 +112,8 @@ add_library(cdeps STATIC $<TARGET_OBJECTS:share>
                          $<TARGET_OBJECTS:dlnd>
                          $<TARGET_OBJECTS:docn>
                          $<TARGET_OBJECTS:drof>
-                         $<TARGET_OBJECTS:dwav>)
+                         $<TARGET_OBJECTS:dwav>
+                         $<TARGET_OBJECTS:dglc>)
 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,6 +25,7 @@ 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
@@ -68,6 +69,8 @@ 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
 )
@@ -79,3 +82,8 @@ 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,6 +43,7 @@ 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
@@ -66,7 +67,6 @@ 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

tests/default_vars.sh

@@ -891,19 +891,10 @@ export MAX_OUTPUT_FIELDS=310
 export UPDATE_FULL_OMEGA=.false.
 
 # Stochastic physics
-export HIDE_LAND_PERT=' '
-export HIDE_NEST='!'
-export HIDE_SPPT='!'
-export HIDE_SKEB='!'
-export HIDE_SHUM='!'
-export HIDE_OCNSPPT='!'
-export HIDE_EPBL='!'
-export HIDE_IAU='!'
-
 export LCNORM=.false.
 export PERT_MP=.false.
 export PERT_RADTEND=.false.
-export PERT_CLDS=.true.
+export PERT_CLDS=.false.
 
 export STOCHINI=.false.
 export DO_SPPT=.false.

tests/fv3_conf/cpld_datm_cdeps.IN

@@ -46,4 +46,9 @@ else
  cp ../${DEP_RUN}${RT_SUFFIX}/${CICE_RESTART_DIR}/iced.2011-10-01-43200.nc ./INPUT
  RFILE="iced.2011-10-01-43200.nc"
  ls -1 "./INPUT/"${RFILE}>ice.restart_file
+
+# CDEPS restart and pointer files
+ RFILE="DATM_${DATM_SRC}.datm.r.2011-10-01-43200.nc"
+ cp ../${DEP_RUN}${RT_SUFFIX}/${RFILE} ./INPUT
+ ls -1 "./INPUT/"${RFILE}>rpointer.atm
 fi

tests/fv3_conf/cpld_datm_cdeps_gfs.IN

@@ -35,12 +35,17 @@ else
  cp ../${DEP_RUN}${RT_SUFFIX}/${MOM6_RESTART_DIR}/MOM.res.2021-03-22-18*.nc ./INPUT/MOM.res.nc
 
 # CMEPS restart and pointer files
- RFILE="DATM_${DATM_SRC}.cpl.r.2021-03-22-64800.nc.nc"
+ RFILE="DATM_${DATM_SRC}.cpl.r.2021-03-22-64800.nc"
  cp ../${DEP_RUN}${RT_SUFFIX}/${CMEPS_RESTART_DIR}/${RFILE} .
  ls -1 ${RFILE}>rpointer.cpl
 
 # CICE restart and pointer files
  cp ../${DEP_RUN}${RT_SUFFIX}/${CICE_RESTART_DIR}/iced.2021-03-22-64800.nc ./INPUT
  RFILE="iced.2021-03-22-64800.nc"
  ls -1 "./INPUT/"${RFILE}>ice.restart_file
+
+# CDEPS restart and pointer files
+ RFILE="DATM_${DATM_SRC}.datm.r.2021-03-22-64800.nc"
+ cp ../${DEP_RUN}${RT_SUFFIX}/${RFILE} ./INPUT
+ ls -1 "./INPUT/"${RFILE}>rpointer.atm
 fi