Updating nemelist templates and configuration files to have consisten…

…t format as the global workflow; Update CDEPS (was ufs-community#1741) (ufs-community#1699) * Update cpld_control.nml.IN * Update model_configure.IN * Update nems.configure.cpld_noaero.IN * Update field_table_thompson_noaero_tke * Rename diag_table_gfsv17_template to diag_table_cpld_template * Update CDEPS-interface/cdeps_files.cmake Co-authored-by: Bin.Li <[email protected]> Co-authored-by: SadeghTabas-NOAA <[email protected]>
Qingfu-Liu · May 25, 2023 · daa456c · daa456c
1 parent 7d015e1
commit daa456c
Show file tree

Hide file tree

Showing 19 changed files with 4,791 additions and 4,866 deletions.
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/CDEPS-interface/cdeps_files.cmake b/CDEPS-interface/cdeps_files.cmake
@@ -44,6 +44,7 @@ list(APPEND cdeps_datm_files
   CDEPS/datm/datm_datamode_era5_mod.F90
   CDEPS/datm/datm_datamode_gefs_mod.F90
   CDEPS/datm/datm_datamode_gfs_mod.F90
+  CDEPS/datm/datm_datamode_gfs_hafs_mod.F90
   CDEPS/datm/datm_datamode_jra_mod.F90
 )
 
@@ -62,6 +63,8 @@ list(APPEND cdeps_docn_files
   CDEPS/docn/docn_datamode_copyall_mod.F90
   CDEPS/docn/docn_datamode_iaf_mod.F90
   CDEPS/docn/docn_datamode_som_mod.F90
+  CDEPS/docn/docn_datamode_cplhist_mod.F90
+  CDEPS/docn/docn_import_data_mod.F90
   CDEPS/docn/ocn_comp_nuopc.F90
 )
 

diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -354,6 +354,8 @@ export OUTPUT_GRID="'cubed_sphere_grid'"
 export OUTPUT_FILE="'netcdf'"
 export IDEFLATE=0
 export NBITS=0
+export ICHUNK2D=0
+export JCHUNK2D=0
 export ICHUNK3D=0
 export JCHUNK3D=0
 export KCHUNK3D=0

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
@@ -26,6 +26,7 @@ case $(hostname -f) in
 
   alogin01.acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=acorn ;; ### acorn
   alogin02.acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=acorn ;; ### acorn
+  alogin03.acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=acorn ;; ### acorn
 
   gaea10)                  MACHINE_ID=gaea ;; ### gaea10
   gaea11)                  MACHINE_ID=gaea ;; ### gaea11

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -177,6 +177,7 @@ deflate_level=1
   cnvcld       = @[CNVCLD]
   imfshalcnv   = @[IMFSHALCNV]
   imfdeepcnv   = @[IMFDEEPCNV]
+  progsigma    = @[PROGSIGMA]
   ras          = @[RAS]
   cdmbgwd      = @[CDMBWD]
   prslrd0      = 0.
@@ -206,9 +207,6 @@ deflate_level=1
   effr_in      = .true.
   ldiag_ugwp   = @[LDIAG_UGWP]
   fscav_aero   = @[FSCAV_AERO]
-  do_sppt      = @[DO_SPPT]
-  do_shum      = @[DO_SHUM]
-  do_skeb      = @[DO_SKEB]
   do_RRTMGP          = @[DO_RRTMGP]
   active_gases       = 'h2o_co2_o3_n2o_ch4_o2'
   ngases             = 6
@@ -223,6 +221,9 @@ deflate_level=1
   doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
   doGP_lwscat        = @[DOGP_LWSCAT]
   doGP_sgs_cnv       = @[DOGP_SGS_CNV]
+  do_sppt      = @[DO_SPPT]
+  do_shum      = @[DO_SHUM]
+  do_skeb      = @[DO_SKEB]
   use_med_flux = @[USE_MED_FLUX]
   frac_grid    = @[FRAC_GRID]
   cplchm       = @[CPLCHM]
@@ -259,7 +260,7 @@ deflate_level=1
   knob_ugwp_dokdis  = 1
   knob_ugwp_ndx4lh  = 1 
   knob_ugwp_version = @[KNOB_UGWP_VERSION]
-  launch_level = 54
+  launch_level      = 54
 /
 
 &gfdl_cloud_microphysics_nml
@@ -382,4 +383,4 @@ deflate_level=1
   restart_input_dir = 'INPUT/',
   restart_output_dir = 'RESTART/',
   parameter_filename = 'INPUT/MOM_input',
-  'INPUT/MOM_override'/
+                       'INPUT/MOM_override'/
+2 −2		CMakeLists.txt
+1 −1		cime_config/buildlib
+61 −7		cime_config/stream_cdeps.py
+17 −0		cime_config/stream_definition_v2.0.xsd
+1 −0		datm/CMakeLists.txt
+23 −0		datm/atm_comp_nuopc.F90
+13 −3		datm/cime_config/buildnml
+12 −12		datm/cime_config/config_component.xml
+1 −1		datm/cime_config/namelist_definition_datm.xml
+74 −1		datm/cime_config/stream_definition_datm.xml
+230 −0		datm/datm_datamode_gfs_hafs_mod.F90
+82 −29		doc/source/datm.rst
+17 −14		doc/source/dice.rst
+42 −14		doc/source/dlnd.rst
+104 −23		doc/source/docn.rst
+71 −31		doc/source/drof.rst
+16 −10		doc/source/dwav.rst
+67 −0		doc/source/introduction.rst
+6 −4		docn/CMakeLists.txt
+51 −2		docn/cime_config/config_component.xml
+39 −26		docn/cime_config/namelist_definition_docn.xml
+38 −5		docn/cime_config/stream_definition_docn.xml
+160 −0		docn/docn_datamode_cplhist_mod.F90
+137 −0		docn/docn_import_data_mod.F90
+38 −9		docn/ocn_comp_nuopc.F90
+3 −3		drof/cime_config/namelist_definition_drof.xml
+4 −4		streams/dshr_strdata_mod.F90