Add C48L127 atmosphere only test and turn on the control_csawmg test …

…on jet/cheyenne (ufs-community#724) * add c48 atmosphere only test control_c48 using 8 tasks * fix control_csawmg test on jet, turn on control_csawmg on cheyenne * remove LT_ENHANCE=3 in MOM_input_template_025 and MOM_input_template_050 * update rt.sh to disable running rt.sh without ecflow on ecflow node * add regional inline post Lambert Conformal fix Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com> Co-authored-by: Jiande Wang <jiande.wang@noaa.gov> Co-authored-by: Minsuk Ji <minsuk.ji@noaa.gov>
NOAA-GSL · Aug 6, 2021 · 4ff260a · 4ff260a
1 parent 1c2d16e
commit 4ff260a
Show file tree

Hide file tree

Showing 20 changed files with 4,372 additions and 3,126 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.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/default_vars.sh b/tests/default_vars.sh
@@ -123,7 +123,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=40 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; TPN_thrd=20 ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=336 ; TPN_c384=20 ; INPES_c384=8 ; JNPES_c384=6
+  TASKS_c384=336 ; TPN_c384=20 ; INPES_c384=6 ; JNPES_c384=8
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
@@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; TPN_thrd=18 ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=480 ; TPN_c384=18 ; INPES_c384=12 ; JNPES_c384=6
+  TASKS_c384=336 ; TPN_c384=18 ; INPES_c384=6 ; JNPES_c384=8
   TASKS_stretch=48 ; TPN_stretch=18 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=18 ; INPES_strnest=2 ; JNPES_strnest=4
 
@@ -490,6 +490,7 @@ export DO_UGWP_V1=.F.
 export DO_UGWP_V1_OROG_ONLY=.F.
 
 # resolution dependent settings
+export CDMBWD_c48='0.071,2.1,1.0,1.0'
 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'
@@ -560,6 +561,8 @@ export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb',"
 export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb',"
 export FNSOTC="'global_soiltype.statsgo.t126.384.190.rg.grb',"
 export FNSMCC="'global_soilmgldas.t126.384.190.grb',"
+export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb',"
+export FNMSKH_control="'global_slmask.t1534.3072.1536.grb',"
 export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb',"
 
 

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -1,6 +1,8 @@
 rm -fr INPUT RESTART
 if [ $NPX = 97 ]; then
   inputdir=FV3_input_data
+elif [ $NPX = 49 ]; then
+  inputdir=FV3_input_data48
 elif [ $NPX = 193 ]; then
   inputdir=FV3_input_data192
 elif [ $NPX = 385 ]; then
@@ -67,10 +69,17 @@ else
 
 fi
 
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
+if [ $NPX = 49 ]; then
+    cp    @[INPUTDATA_ROOT]/${inputdir}/aerosol.dat .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/co2historicaldata_201*.txt .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/sfc_emissivity_idx.txt .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/solarconstant_noaa_an.txt .
+else
+    cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
+fi
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_o3prdlos.f77 .
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
 cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .

diff --git a/tests/parm/MOM_input_template_025 b/tests/parm/MOM_input_template_025
@@ -743,13 +743,6 @@ MIX_LEN_EXPONENT = 1.0          !   [nondim] default = 2.0
 USE_LA_LI2016 = MOM6_REPRO_LA   !   [nondim] default = False
                                 ! A logical to use the Li et al. 2016 (submitted) formula to determine the
                                 ! Langmuir number.
-LT_ENHANCE = 3                  !   [nondim] default = 0
-                                ! Integer for Langmuir number mode.
-                                !  *Requires USE_LA_LI2016 to be set to True.
-                                ! Options: 0 - No Langmuir
-                                !          1 - Van Roekel et al. 2014/Li et al., 2016
-                                !          2 - Multiplied w/ adjusted La.
-                                !          3 - Added w/ adjusted La.
 USE_WAVES = MOM6_USE_WAVES      !   [Boolean] default = False
                                 ! If true, enables surface wave modules.
 

diff --git a/tests/parm/MOM_input_template_050 b/tests/parm/MOM_input_template_050
@@ -773,13 +773,6 @@ MIX_LEN_EXPONENT = 1.0          !   [nondim] default = 2.0
 USE_LA_LI2016 = MOM6_REPRO_LA   !   [nondim] default = False
                                 ! A logical to use the Li et al. 2016 (submitted) formula to determine the
                                 ! Langmuir number.
-LT_ENHANCE = 3                  !   [nondim] default = 0
-                                ! Integer for Langmuir number mode.
-                                !  *Requires USE_LA_LI2016 to be set to True.
-                                ! Options: 0 - No Langmuir
-                                !          1 - Van Roekel et al. 2014/Li et al., 2016
-                                !          2 - Multiplied w/ adjusted La.
-                                !          3 - Added w/ adjusted La.
 USE_WAVES = MOM6_USE_WAVES      !   [Boolean] default = False
                                 ! If true, enables surface wave modules.
 WAVE_METHOD = "SURFACE_BANDS"   ! default = "EMPTY"

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -254,8 +254,8 @@ deflate_level=1
   FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
   FNVETC   = @[FNVETC]
   FNSOTC   = @[FNSOTC]
-  FNSMCC   = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
-  FNMSKH   = 'global_slmask.t1534.3072.1536.grb'
+  FNSMCC   = @[FNSMCC_control]
+  FNMSKH   = @[FNMSKH_control]
   FNTSFA   = ''
   FNACNA   = ''
   FNSNOA   = ''

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -43,8 +43,9 @@ RUN     | control_restart
 RUN     | control_fhzero                                                                                                          |                                         |     |
 RUN     | control_CubedSphereGrid                                                                                                 |                                         | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel                                                                                        |                                         | fv3 |
+RUN     | control_c48                                                                                                             |                                         | fv3 |
 RUN     | control_c192                                                                                                            |                                         | fv3 |
-RUN     | control_c384                                                                                                            | - gaea.intel wcoss_cray                 | fv3 |
+RUN     | control_c384                                                                                                            | - wcoss_cray                            | fv3 |
 RUN     | control_c384gdas                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | control_stochy                                                                                                          |                                         | fv3 |
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
@@ -59,7 +60,7 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_
 RUN     | control_rrtmgp                                                                                                          |                                         | fv3 |
 #RUN     | control_rrtmgp_2threads                                                                                                 |                                         |     |
 #RUN     | control_rrtmgp_c192                                                                                                     |                                         | fv3 |
-RUN     | control_csawmg                                                                                                          | - jet.intel cheyenne.intel              | fv3 |
+RUN     | control_csawmg                                                                                                          |                                         | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |
 RUN     | control_flake                                                                                                           |                                         | fv3 |
 RUN     | control_ugwpv1                                                                                                          |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,7 +415,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210729
+BL_DATE=20210805
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
@@ -570,6 +570,13 @@ EOF
     die "ecFlow is not supported on this machine $MACHINE_ID"
   fi
 
+else
+
+  if [[ $MACHINE_ID = hera.* ]] && [[ $HOSTNAME = hecflow* ]]; then
+    echo "ERROR: To run without using ECFlow on Hera, please do not use ecflow node."
+    exit 1
+  fi
+
 fi
 
 ##

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -6,6 +6,7 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_RRTM
 
 RUN     | control                                                                                                                 |                | fv3         |
 RUN     | control_restart                                                                                                         |                |             | control
+RUN     | control_c48                                                                                                             |                | fv3         |
 RUN     | control_stochy                                                                                                          |                | fv3         |
 RUN     | control_flake                                                                                                           |                | fv3         |
 RUN     | control_rrtmgp                                                                                                          |                | fv3         |

diff --git a/tests/tests/control_c48 b/tests/tests/control_c48
@@ -0,0 +1,83 @@
+###############################################################################
+#
+#  global control test: GFSv16 atmosphere only at C48L127
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control C48L127 results with previous trunk version"
+
+export CNTL_DIR=control_c48
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf024.nc \
+                   atmf000.nc \
+                   atmf024.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc"
+
+export_fv3
+export TASKS=8
+export TPN=8
+export INPES=1
+export JNPES=1
+export WRTTASK_PER_GROUP=2
+export NPZ=127
+export NPZP=128
+export NPX=49
+export NPY=49
+export DT_ATMOS=1200
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL=0
+export CDMBWD=${CDMBWD_c48}
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.false.
+export OUTPUT="6 -1"
+export IAER=5111
+export IMO=192
+export JMO=94
+
+export FNALBC="'global_snowfree_albedo.bosu.t62.192.94.rg.grb',"
+export FNVETC="'global_vegtype.igbp.t62.192.94.rg.grb',"
+export FNSOTC="'global_soiltype.statsgo.t62.192.94.rg.grb',"
+export FNABSC="'global_mxsnoalb.uariz.t62.192.94.rg.grb',"
+export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb',"
+export FNMSKH_control="'global_slmask.t62.192.94.grb',"
+
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_csawmg b/tests/tests/control_csawmg
@@ -30,7 +30,7 @@ export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 
 export DT_ATMOS=600
-export IAER=1111
+export IAER=1011
 export NEW_DIAGTABLE='diag_table_aod'
 export NEW_FIELDTABLE='field_table_csawmgshoc'
 export USE_MERRA2=.T.

diff --git a/tests/tests/control_csawmg_debug b/tests/tests/control_csawmg_debug
@@ -25,7 +25,7 @@ export NSTF_NAME='2,0,0,0,0'
 export FHMAX=01
 
 export DT_ATMOS=600
-export IAER=1111
+export IAER=1011
 export NEW_DIAGTABLE='diag_table_aod'
 export NEW_FIELDTABLE='field_table_csawmgshoc'
 export USE_MERRA2=.T.