Merge remote-tracking branch 'ufs/develop' into fms/2020.04.01

ufs-community · Feb 4, 2021 · 9ef43d4 · 9ef43d4
2 parents 28af697 + 13053c1
commit 9ef43d4
Show file tree

Hide file tree

Showing 163 changed files with 3,690 additions and 2,377 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -16,17 +16,17 @@ else()
 endif()
 
 list(APPEND _nems_util_files
-  CMEPS/nems/util/shr_abort_mod.F90
-  CMEPS/nems/util/shr_log_mod.F90
-  CMEPS/nems/util/shr_pio_mod.F90
-  CMEPS/nems/util/shr_sys_mod.F90
-  CMEPS/nems/util/shr_flux_mod.F90
-  CMEPS/nems/util/shr_mpi_mod.F90
-  CMEPS/nems/util/glc_elevclass_mod.F90
-  CMEPS/nems/util/shr_mem_mod.F90
-  CMEPS/nems/util/shr_kind_mod.F90
-  CMEPS/nems/util/perf_mod.F90
-  CMEPS/nems/util/shr_const_mod.F90)
+  CMEPS/util/shr_abort_mod.F90
+  CMEPS/util/shr_log_mod.F90
+  CMEPS/util/shr_pio_mod.F90
+  CMEPS/util/shr_sys_mod.F90
+  CMEPS/util/shr_flux_mod.F90
+  CMEPS/util/shr_mpi_mod.F90
+  CMEPS/util/glc_elevclass_mod.F90
+  CMEPS/util/shr_mem_mod.F90
+  CMEPS/util/shr_kind_mod.F90
+  CMEPS/util/perf_mod.F90
+  CMEPS/util/shr_const_mod.F90)
 
 list(APPEND _mediator_files
   CMEPS/mediator/med_phases_restart_mod.F90

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,10 +111,7 @@ endif()
 target_link_libraries(nemsio::nemsio INTERFACE w3emc::w3emc_d bacio::bacio_4)
 
 # Configure Python
-find_package(Python 3 QUIET COMPONENTS Interpreter)
-if (NOT Python_Interpreter_FOUND)
-  find_package(Python 2.7 REQUIRED COMPONENTS Interpreter)
-endif()
+find_package(Python 3 REQUIRED COMPONENTS Interpreter)
 message("Found Python: ${Python_EXECUTABLE}")
 
 ###############################################################################
@@ -239,8 +236,7 @@ list(APPEND _nems_srcs NEMS/src/module_NEMS_UTILS.F90
                        NEMS/src/module_NEMS_INTERNAL_STATE.F90
                        NEMS/src/module_NEMS_GRID_COMP.F90
                        NEMS/src/module_NEMS_Rusage.F90
-                       NEMS/src/nems_c_rusage.c
-                       NEMS/src/ENS_Cpl/ENS_CplComp_ESMFMod_STUB.F90)
+                       NEMS/src/nems_c_rusage.c)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/NEMS/src/ESMFVersionDefine_ESMF_NUOPC.h
                ${CMAKE_CURRENT_BINARY_DIR}/NEMS/src/ESMFVersionDefine.h

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/NEMS b/NEMS
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -13,6 +13,7 @@ setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
+module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 

diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/orion.intel/fv3_debug
@@ -13,6 +13,7 @@ setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
+module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 

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_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile
@@ -1,4 +1,4 @@
-From noaaemc/ubuntu-hpc:v1
+From noaaemc/ubuntu-hpc:v1.1
 
 ENV HOME=/home/builder
 COPY --chown=builder:builder . $HOME/ufs-weather-model

diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh
@@ -74,8 +74,8 @@ if [ $BUILD = "true" ]; then
 
 elif [ $RUN == "true" ]; then
 
-  sudo docker run -d --rm -v DataVolume:/tmp minsukjinoaa/fv3-input-data:develop-20200713
-  sudo docker run -d -e test_case=${TEST_CASE} -v DataVolume:/home/builder/data/NEMSfv3gfs/develop-20201118 --name my-container ${IMG_NAME}
+  sudo docker run -d --rm -v DataVolume:/tmp minsukjinoaa/fv3-input-data:input-data-20210115
+  sudo docker run -d -e test_case=${TEST_CASE} -v DataVolume:/home/builder/data/NEMSfv3gfs/input-data-20210115 --name my-container ${IMG_NAME}
 
   echo 'cache,rss,shmem' >memory_stat
   sleep 3

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -25,6 +25,10 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -64,6 +68,10 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -103,6 +111,10 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -156,6 +168,42 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   TASKS_stretch=48 ; TPN_stretch=18 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=18 ; INPES_strnest=2 ; JNPES_strnest=4
 
+  TASKS_cpl_dflt=192; TPN_cpl_dflt=36; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
+
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
+  TASKS_cpl_thrd=120; TPN_cpl_thrd=18; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
+  OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
+
+  TASKS_cpl_bmrk=480; TPN_cpl_bmrk=36; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
+  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
+  OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"
+
+  TASKS_cpl_wwav=520; TPN_cpl_wwav=36; INPES_cpl_wwav=6; JNPES_cpl_wwav=8
+  THRD_cpl_wwav=1; WPG_cpl_wwav=24; MPB_cpl_wwav="0 287"; APB_cpl_wwav="0 311"
+  OPB_cpl_wwav="312 431"; IPB_cpl_wwav="432 479"; WPB_cpl_wwav="480 519"
+
+  TASKS_cpl_c192=288; TPN_cpl_c192=36; INPES_cpl_c192=4; JNPES_cpl_c192=8
+  THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
+  OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
+
+  TASKS_cpl_c384=318; TPN_cpl_c384=36; INPES_cpl_c384=3; JNPES_cpl_c384=8
+  THRD_cpl_c384=1; WPG_cpl_c384=6;  MPB_cpl_c384="0 143"; APB_cpl_c384="0 149"
+  OPB_cpl_c384="150 269"; IPB_cpl_c384="270 317"
+
+  TASKS_datm_100=120; TPN_datm_100=36
+  MPB_datm_100="16 77"; APB_datm_100="0 15"
+  OPB_datm_100="78 107"; IPB_datm_100="108 119"
+
+  TASKS_datm_025=208; TPN_datm_025=36
+  MPB_datm_025="0 39"; APB_datm_025="0 39"
+  OPB_datm_025="40 159"; IPB_datm_025="160 207"
+
 elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -167,6 +215,10 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -205,6 +257,10 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -487,6 +543,15 @@ export CPLFLX='.T.'
 export CPL='.true.'
 export NSTF_NAME='0,0,0,0,0'
 
+# resolution dependent settings
+export CDMBWD_c96='0.14,1.8,1.0,1.0'
+export CDMBWD_c192='0.23,1.5,1.0,1.0'
+export CDMBWD_c384='1.1,0.72,1.0,1.0'
+export CDMBWD_c768='4.0,0.15,1.0,1.0'
+
+# set default
+export CDMBWD=${CDMBWD_c96}
+
 # for FV3: default values will be changed if doing a warm-warm restart
 export WARM_START='.F.'
 export MAKE_NH='.T.'
@@ -557,6 +622,7 @@ export JATM=768
 export ATMRES='C96'
 export OCNRES='100'
 export ICERES='1.00'
+export WAVRES='1.00'
 export NX_GLB=360
 export NY_GLB=320
 

diff --git a/tests/fv3_conf/ccpp_control_run.IN b/tests/fv3_conf/ccpp_control_run.IN
@@ -11,26 +11,40 @@ fi
 echo "inputdir=$inputdir,NPX=$NPX"
 
 UNIT_TEST=${UNIT_TEST:-false}
+SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
   mkdir RESTART
 else
   mkdir INPUT RESTART
 
-  rsync -arv ../fv3_ccpp_control${RT_SUFFIX}/RESTART/ INPUT/
-  rm -f INPUT/fv_core.res.*
-  rm -f INPUT/fv_srf_wnd.res.*
-  rm -f INPUT/fv_tracer.res.*
-  rm -f INPUT/phy_data.*
-  rm -f INPUT/sfc_data.*
-  cd INPUT
-  rename 20161004.000000. '' 20161004.000000.*
-  cp ../../fv3_ccpp_control${RT_SUFFIX}/INPUT/grid_spec.nc .
-  cp ../../fv3_ccpp_control${RT_SUFFIX}/INPUT/*_grid.tile*.nc .
-  cp ../../fv3_ccpp_control${RT_SUFFIX}/INPUT/oro_data.tile*.nc .
-  if [[ $IAU_INC_FILES != '' ]] || [[ $READ_INCREMENT = '.T.' ]]; then
-    cp ../../fv3_ccpp_control${RT_SUFFIX}/INPUT/fv3_increment.nc .
+  if [[ ${UNIT_TEST} == true ]]; then
+    SUFFIX=${BL_SUFFIX}
   fi
+
+  rsync -arv ../fv3_ccpp_control${SUFFIX}/RESTART/ INPUT/
+  if [[ $IAU_INC_FILES = 'fv3_increment.nc' ]] || [[ $READ_INCREMENT = '.T.' ]]; then
+    #read_inc and iau tests restart from fh=24
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/coupler.res INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_core.res.* INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_srf_wnd.res.* INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_tracer.* INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/phy_data.* INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/sfc_data.* INPUT/.
+    cp ../fv3_ccpp_control${SUFFIX}/INPUT/fv3_increment.nc INPUT/.
+    cd INPUT
+  else
+    #restart test start from fh=12
+    cp ../fv3_ccpp_control${SUFFIX}/RESTART/20161003.120000.* INPUT/.
+    cd INPUT
+    for RFILE in 20161003.120000.*; do
+      [ -e $RFILE ] || exit 1
+      mv $RFILE ${RFILE#20161003.120000.}
+    done
+  fi
+  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/grid_spec.nc .
+  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/*_grid.tile*.nc .
+  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/oro_data.tile*.nc .
   cd ..
 
 fi

diff --git a/tests/fv3_conf/ccpp_gfs_v16_run.IN b/tests/fv3_conf/ccpp_gfs_v16_run.IN
@@ -2,7 +2,7 @@ rm -fr INPUT RESTART
 rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/ INPUT/
 mkdir RESTART
 if [ $WARM_START = .T. ]; then
-  rsync -arv ../fv3_ccpp_gfs_v16beta${RT_SUFFIX}/RESTART/ INPUT/
+  rsync -arv ../fv3_ccpp_gfs_v16${RT_SUFFIX}/RESTART/ INPUT/
   cd INPUT
   rename 20161004.000000. '' 20161004.000000.*
   cd ..

diff --git a/tests/fv3_conf/ccpp_regional_run.IN b/tests/fv3_conf/ccpp_regional_run.IN
@@ -4,7 +4,7 @@ rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/model_configure .
 rm -rf INPUT RESTART
 mkdir  INPUT RESTART
 
-rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/INPUT/. INPUT/.
+rsync -arv @[INPUTDATA_ROOT]/fv3_regional_control/INPUT/. INPUT/.
 
 if [ $WARM_START = .T. ]; then
     cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res             INPUT/coupler.res

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -50,6 +50,12 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
 cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
 cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 
+# WW3 fix/input
+if [[ $CPLWAV == .T. ]]; then
+  cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
+  cp    @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp
+fi
+
 # No restart
 if [ $WARM_START = .F. ]; then
   # ICs

diff --git a/tests/parm/ccpp_v15p2_c96.nml.IN b/tests/parm/ccpp_v15p2_c96.nml.IN
@@ -146,7 +146,7 @@
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 3.5,0.25
+  cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1

diff --git a/tests/parm/ccpp_v15p2_c96_rrtmgp.nml.IN b/tests/parm/ccpp_v15p2_c96_rrtmgp.nml.IN
@@ -146,7 +146,7 @@
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 3.5,0.25
+  cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1

diff --git a/tests/parm/ccpp_v16_c192L127_rrtmgp.nml.IN b/tests/parm/ccpp_v16_c192L127_rrtmgp.nml.IN
@@ -94,7 +94,7 @@ deflate_level=1
   hord_mt = 5
   hord_vt = 5
   hord_tm = 5
-  hord_dp = 5
+  hord_dp = -5
   hord_tr = 8
   adjust_dry_mass = .false.
   consv_te = 1.

diff --git a/tests/parm/ccpp_v16beta_c96.nml.IN → tests/parm/ccpp_v16_c96.nml.IN b/tests/parm/ccpp_v16beta_c96.nml.IN → tests/parm/ccpp_v16_c96.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v16beta'
+  ccpp_suite = 'FV3_GFS_v16'
 /
 
 &diag_manager_nml
@@ -156,7 +156,7 @@ deflate_level=1
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 4.0,0.15,1.0,1.0
+  cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1

diff --git a/tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN → tests/parm/ccpp_v16_c96_rrtmgp.nml.IN b/tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN → tests/parm/ccpp_v16_c96_rrtmgp.nml.IN
@@ -156,7 +156,7 @@ deflate_level=1
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 4.0,0.15,1.0,1.0
+  cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1

diff --git a/tests/parm/ccpp_v16beta_flake_c96.nml.IN → tests/parm/ccpp_v16_flake_c96.nml.IN b/tests/parm/ccpp_v16beta_flake_c96.nml.IN → tests/parm/ccpp_v16_flake_c96.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v16beta_flake'
+  ccpp_suite = 'FV3_GFS_v16_flake'
 /
 
 &diag_manager_nml
@@ -156,7 +156,7 @@ deflate_level=1
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 4.0,0.15,1.0,1.0
+  cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1

diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN
@@ -175,7 +175,7 @@
   cnvcld       = .true.
   imfshalcnv   = 2
   imfdeepcnv   = 2
-  cdmbgwd      = 1.0,1.2
+  cdmbgwd      = @[CDMBWD]
   prslrd0      = 0.
   ivegsrc      = 1
   isot         = 1
@@ -204,7 +204,7 @@
   ldiag_ugwp   = .false.
   do_ugwp      = .false.
   do_tofd      = .false.
-  cplflx       = .T. 
+  cplflx       = .T.
   cplwav         = @[CPLWAV]
   cplwav2atm     = @[CPLWAV2ATM]