sync up against develop branch

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/bl_date.conf

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

tests/default_vars.sh

@@ -911,19 +911,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

tests/parm/global_control.nml.IN

@@ -251,15 +251,15 @@
   ca_trigger   = @[CA_TRIGGER]
   nspinup      = @[NSPINUP]
   iseed_ca     = @[ISEED_CA]
-@[HIDE_LAND_PERT] lndp_type   = @[LNDP_TYPE]
-@[HIDE_LAND_PERT] n_var_lndp  = @[N_VAR_LNDP]
-@[HIDE_NEST] lcnorm  = @[LCNORM]
-@[HIDE_SPPT] pert_mp = @[PERT_MP]
-@[HIDE_SPPT] pert_radtend = @[PERT_RADTEND]
-@[HIDE_SPPT] pert_clds = @[PERT_CLDS]
-@[HIDE_IAU] iau_inc_files= @[IAU_INC_FILES]
-@[HIDE_IAU] iau_drymassfixer = .false.
-@[HIDE_IAU] iau_filter_increments = @[IAU_FILTER_INCREMENTS]
+  lndp_type   = @[LNDP_TYPE]
+  n_var_lndp  = @[N_VAR_LNDP]
+  lcnorm  = @[LCNORM]
+  pert_mp = @[PERT_MP]
+  pert_radtend = @[PERT_RADTEND]
+  pert_clds = @[PERT_CLDS]
+  iau_inc_files= @[IAU_INC_FILES]
+  iau_drymassfixer = .false.
+  iau_filter_increments = @[IAU_FILTER_INCREMENTS]
 /
 
 &cires_ugwp_nml
@@ -391,43 +391,43 @@
 /
 
 &nam_stochy
-@[HIDE_SKEB] skeb = @[SKEB]
-@[HIDE_SKEB] iseed_skeb = @[ISEED_SKEB]
-@[HIDE_SKEB] skeb_tau = @[SKEB_TAU]
-@[HIDE_SKEB] skeb_lscale = @[SKEB_LSCALE]
-@[HIDE_SKEB] skebnorm = @[SKEBNORM]
-@[HIDE_SKEB] skeb_npass = @[SKEB_NPASS]
-@[HIDE_SKEB] skeb_vdof = @[SKEB_VDOF]
-@[HIDE_SHUM] shum = @[SHUM]
-@[HIDE_SHUM] iseed_shum = @[ISEED_SHUM]
-@[HIDE_SHUM] shum_tau = @[SHUM_TAU]
-@[HIDE_SHUM] shum_lscale = @[SHUM_LSCALE]
-@[HIDE_SPPT] sppt = @[SPPT]
-@[HIDE_SPPT] iseed_sppt = @[ISEED_SPPT]
-@[HIDE_SPPT] sppt_tau = @[SPPT_TAU]
-@[HIDE_SPPT] sppt_lscale = @[SPPT_LSCALE]
-@[HIDE_SPPT] sppt_logit = @[SPPT_LOGIT]
-@[HIDE_SPPT] sppt_sfclimit = @[SPPT_SFCLIMIT]
-@[HIDE_SPPT] use_zmtnblck = @[USE_ZMTNBLCK]
-@[HIDE_SPPT] pbl_taper = @[PBL_TAPER]
-@[HIDE_OCNSPPT] OCNSPPT = @[OCNSPPT]
-@[HIDE_OCNSPPT] OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
-@[HIDE_OCNSPPT] OCNSPPT_TAU = @[OCNSPPT_TAU] 
-@[HIDE_OCNSPPT] ISEED_OCNSPPT =@[ISEED_OCNSPPT]
-@[HIDE_EPBL] EPBL = @[EPBL]
-@[HIDE_EPBL] EPBL_LSCALE = @[EPBL_LSCALE]
-@[HIDE_EPBL] EPBL_TAU = @[EPBL_TAU]
-@[HIDE_EPBL] ISEED_EPBL = @[ISEED_EPBL]
+  skeb = @[SKEB]
+  iseed_skeb = @[ISEED_SKEB]
+  skeb_tau = @[SKEB_TAU]
+  skeb_lscale = @[SKEB_LSCALE]
+  skebnorm = @[SKEBNORM]
+  skeb_npass = @[SKEB_NPASS]
+  skeb_vdof = @[SKEB_VDOF]
+  shum = @[SHUM]
+  iseed_shum = @[ISEED_SHUM]
+  shum_tau = @[SHUM_TAU]
+  shum_lscale = @[SHUM_LSCALE]
+  sppt = @[SPPT]
+  iseed_sppt = @[ISEED_SPPT]
+  sppt_tau = @[SPPT_TAU]
+  sppt_lscale = @[SPPT_LSCALE]
+  sppt_logit = @[SPPT_LOGIT]
+  sppt_sfclimit = @[SPPT_SFCLIMIT]
+  use_zmtnblck = @[USE_ZMTNBLCK]
+  pbl_taper = @[PBL_TAPER]
+  OCNSPPT = @[OCNSPPT]
+  OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
+  OCNSPPT_TAU = @[OCNSPPT_TAU] 
+  ISEED_OCNSPPT =@[ISEED_OCNSPPT]
+  EPBL = @[EPBL]
+  EPBL_LSCALE = @[EPBL_LSCALE]
+  EPBL_TAU = @[EPBL_TAU]
+  ISEED_EPBL = @[ISEED_EPBL]
 /
 
 &nam_sfcperts
-@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
-@[HIDE_LAND_PERT] lndp_model_type = @[LNDP_MODEL_TYPE]
-@[HIDE_LAND_PERT] LNDP_TAU=@[LNDP_TAU]
-@[HIDE_LAND_PERT] LNDP_LSCALE=@[LNDP_LSCALE]
-@[HIDE_LAND_PERT] ISEED_LNDP=@[ISEED_LNDP]
-@[HIDE_LAND_PERT] lndp_var_list = @[LNDP_VAR_LIST]
-@[HIDE_LAND_PERT] lndp_prt_list = @[LNDP_PRT_LIST]
+  lndp_type = @[LNDP_TYPE]
+  lndp_model_type = @[LNDP_MODEL_TYPE]
+  LNDP_TAU=@[LNDP_TAU]
+  LNDP_LSCALE=@[LNDP_LSCALE]
+  ISEED_LNDP=@[ISEED_LNDP]
+  lndp_var_list = @[LNDP_VAR_LIST]
+  lndp_prt_list = @[LNDP_PRT_LIST]
 /
 
 &MOM_input_nml

tests/parm/global_control_lnd_iau.nml.IN

@@ -251,15 +251,6 @@
   ca_trigger   = @[CA_TRIGGER]
   nspinup      = @[NSPINUP]
   iseed_ca     = @[ISEED_CA]
-@[HIDE_LAND_PERT] lndp_type   = @[LNDP_TYPE]
-@[HIDE_LAND_PERT] n_var_lndp  = @[N_VAR_LNDP]
-@[HIDE_NEST] lcnorm  = @[LCNORM]
-@[HIDE_SPPT] pert_mp = @[PERT_MP]
-@[HIDE_SPPT] pert_radtend = @[PERT_RADTEND]
-@[HIDE_SPPT] pert_clds = @[PERT_CLDS]
-@[HIDE_IAU] iau_inc_files= @[IAU_INC_FILES]
-@[HIDE_IAU] iau_drymassfixer = .false.
-@[HIDE_IAU] iau_filter_increments = @[IAU_FILTER_INCREMENTS]
 /
 
 &land_iau_nml
@@ -403,44 +394,14 @@
   grid_file = 'INPUT/grid_spec.nc'
 /
 
-&nam_stochy
-@[HIDE_SKEB] skeb = @[SKEB]
-@[HIDE_SKEB] iseed_skeb = @[ISEED_SKEB]
-@[HIDE_SKEB] skeb_tau = @[SKEB_TAU]
-@[HIDE_SKEB] skeb_lscale = @[SKEB_LSCALE]
-@[HIDE_SKEB] skebnorm = @[SKEBNORM]
-@[HIDE_SKEB] skeb_npass = @[SKEB_NPASS]
-@[HIDE_SKEB] skeb_vdof = @[SKEB_VDOF]
-@[HIDE_SHUM] shum = @[SHUM]
-@[HIDE_SHUM] iseed_shum = @[ISEED_SHUM]
-@[HIDE_SHUM] shum_tau = @[SHUM_TAU]
-@[HIDE_SHUM] shum_lscale = @[SHUM_LSCALE]
-@[HIDE_SPPT] sppt = @[SPPT]
-@[HIDE_SPPT] iseed_sppt = @[ISEED_SPPT]
-@[HIDE_SPPT] sppt_tau = @[SPPT_TAU]
-@[HIDE_SPPT] sppt_lscale = @[SPPT_LSCALE]
-@[HIDE_SPPT] sppt_logit = @[SPPT_LOGIT]
-@[HIDE_SPPT] sppt_sfclimit = @[SPPT_SFCLIMIT]
-@[HIDE_SPPT] use_zmtnblck = @[USE_ZMTNBLCK]
-@[HIDE_SPPT] pbl_taper = @[PBL_TAPER]
-@[HIDE_OCNSPPT] OCNSPPT = @[OCNSPPT]
-@[HIDE_OCNSPPT] OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
-@[HIDE_OCNSPPT] OCNSPPT_TAU = @[OCNSPPT_TAU] 
-@[HIDE_OCNSPPT] ISEED_OCNSPPT =@[ISEED_OCNSPPT]
-@[HIDE_EPBL] EPBL = @[EPBL]
-@[HIDE_EPBL] EPBL_LSCALE = @[EPBL_LSCALE]
-@[HIDE_EPBL] EPBL_TAU = @[EPBL_TAU]
-@[HIDE_EPBL] ISEED_EPBL = @[ISEED_EPBL]
-/
-
 &nam_sfcperts
-@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
-@[HIDE_LAND_PERT] lndp_model_type = @[LNDP_MODEL_TYPE]
-@[HIDE_LAND_PERT] LNDP_TAU=@[LNDP_TAU]
-@[HIDE_LAND_PERT] LNDP_LSCALE=@[LNDP_LSCALE]
-@[HIDE_LAND_PERT] ISEED_LNDP=@[ISEED_LNDP]
-@[HIDE_LAND_PERT] lndp_var_list = @[LNDP_VAR_LIST]
-@[HIDE_LAND_PERT] lndp_prt_list = @[LNDP_PRT_LIST]
+  lndp_type = @[LNDP_TYPE]
+  lndp_model_type = @[LNDP_MODEL_TYPE]
+  LNDP_TAU=@[LNDP_TAU]
+  LNDP_LSCALE=@[LNDP_LSCALE]
+  ISEED_LNDP=@[ISEED_LNDP]
+  lndp_var_list = @[LNDP_VAR_LIST]
+  lndp_prt_list = @[LNDP_PRT_LIST]
 /
 
 &MOM_input_nml

tests/tests/control_c48_lnd_iau

@@ -75,6 +75,8 @@ export IOVR=3
 export IMO=192
 export JMO=94
 
+export PERT_CLDS=.true.
+
 export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb'"
 export FNMSKH_control="'global_slmask.t62.192.94.grb'"
 export FNSMCC=${FNSMCC_control}

tests/tests/cpld_debug_pdlib_p8

@@ -125,9 +125,5 @@ export K_SPLIT=2
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update
-export DO_UGWP_V0=.false.
-export DO_UGWP_V1=.true.
-export DO_GSL_DRAG_LS_BL=.true.
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
-export DO_GSL_DRAG_TOFD=.true.