Fix LAM inline post and long run time RT tests (ufs-community#513)

* update regional and fv3-wave tests mpi tasks * fix lam post uninitialized value * fix hafs test tasks * fix the spval in openmp * add lam inline post test back * update to upp 10.0.6 and regional.nml * update baseline date * RT JOBS PASSED: gaea.intel. Log file uploaded. * RT JOBS PASSED: jet.intel. Log file uploaded. * RT JOBS PASSED: orion.intel. Log file uploaded. * RT JOBS PASSED: cheyenne.intel. Log file uploaded. * RT JOBS PASSED: cheyenne.gnu. Log file uploaded. * RT JOBS PASSED: hera.gnu. Log file uploaded. * RT JOBS PASSED: hera.intel. Log file uploaded. * update dell RT log file; run-ci * update cray log file Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
mzhangw · Apr 20, 2021 · 4d63a85 · 4d63a85
1 parent 39febc2
commit 4d63a85
Show file tree

Hide file tree

Showing 25 changed files with 4,205 additions and 3,301 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -18,4 +18,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.4
+module load upp/10.0.6
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -18,4 +18,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.4
+module load upp/10.0.6
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/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
@@ -1,7 +1,7 @@
 print_esmf:              .true.
 
 total_member:            1
-PE_MEMBER01:             28
+PE_MEMBER01:             @[TASKS]
 
 start_year:              2018
 start_month:             10
@@ -18,14 +18,14 @@ calendar:                'julian'
 memuse_verbose:          .false.
 atmos_nthreads:          1
 use_hyper_thread:        .false.
-ncores_per_node:         24
+ncores_per_node:         @[TPN]
 debug_affinity:          .true.
 restart_interval:        0
 output_1st_tstep_rst:    .false.
 
 quilting:                .true.
 write_groups:            1
-write_tasks_per_group:   4
+write_tasks_per_group:   8
 write_dopost:            @[WRITE_DOPOST]
 num_files:               2
 filename_base:           'dyn' 'phy'

diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
@@ -24,7 +24,7 @@ output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 write_groups:            1
-write_tasks_per_group:   4
+write_tasks_per_group:   8
 write_dopost:            @[WRITE_DOPOST]
 num_files:               2
 filename_base:           'dyn' 'phy'

diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -164,7 +164,7 @@
        satmedmf       = @[SATMEDMF]
        lheatstrg      = @[LHEATSTRG]
        do_mynnedmf    = .T.
-       do_mynnsfclay  = .false.
+       do_mynnsfclay  = .true.
        lgfdlmprad     = .false.
        effr_in        = .T.
        random_clds    = .true.

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -40,7 +40,7 @@ RUN     | fv3_stretched_nest
 COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y                                                                        |                                         | fv3 |
 RUN     | fv3_regional_control                                                                                                    |                                         | fv3 |
 RUN     | fv3_regional_restart                                                                                                    |                                         | fv3 | fv3_regional_control
-#RUN     | fv3_regional_quilt                                                                                                      |                                         | fv3 |
+RUN     | fv3_regional_quilt                                                                                                      |                                         | fv3 |
 RUN     | fv3_regional_quilt_hafs                                                                                                 |                                         | fv3 |
 RUN     | fv3_regional_quilt_netcdf_parallel                                                                                      |                                         | fv3 |
 #RUN     | fv3_regional_c768                                                                                                      | wcoss_dell_p3                           | fv3 |
@@ -80,7 +80,7 @@ RUN     | fv3_gfs_v16_restart
 RUN     | fv3_gfs_v16_stochy                                                                                                      |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_c192L127                                                                                             |                                         | fv3 |
-RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         | fv3 |
+RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         |     |
 
 COMPILE | APP=ATM SUITES=FV3_GFS_v16_csawmg                                                                                       |                                         | fv3 |
 # fv3_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210414
+BL_DATE=20210419
 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

diff --git a/tests/tests/fv3_gfdlmprad b/tests/tests/fv3_gfdlmprad
@@ -55,7 +55,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export TASKS=192
+export TASKS=232
 export WLCLK=60
 
 DT_ATMOS="1200"
@@ -72,7 +72,7 @@ export CPLWAV=.T.
 export atm_model='fv3'
 export atm_petlist_bounds="0 149"
 export wav_model='ww3'
-export wav_petlist_bounds="150 191"
+export wav_petlist_bounds="150 231"
 export coupling_interval_sec=3600.0  #coupling time step, want it to be multiple of 1800 and FV3 time step
 export NEMS_CONFIGURE="nems.configure.blocked_atm_wav.IN"
 

diff --git a/tests/tests/fv3_gfdlmprad_atmwav b/tests/tests/fv3_gfdlmprad_atmwav
@@ -55,7 +55,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export TASKS=192
+export TASKS=232
 export WLCLK=60
 
 DT_ATMOS="1200"
@@ -73,7 +73,7 @@ export CPLWAV2ATM=.T.
 export atm_model='fv3'
 export atm_petlist_bounds="0 149"
 export wav_model='ww3'
-export wav_petlist_bounds="150 191"
+export wav_petlist_bounds="150 231"
 export coupling_interval_sec=1200.0  #coupling time step, want it to be multiple of 1800 and FV3 time step
 export NEMS_CONFIGURE="nems.configure.blocked_atm_wav_2way.IN"
 

diff --git a/tests/tests/fv3_regional_control b/tests/tests/fv3_regional_control
@@ -17,7 +17,7 @@ export LIST_FILES="  atmos_4xdaily.nc \
 export_fv3
 
 export WLCLK=60
-export TASKS=24
+export TASKS=80
 
 export FV3_RUN=regional_run.IN
 
@@ -33,6 +33,6 @@ export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
 export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
-export INPES=4
-export JNPES=6
+export INPES=10
+export JNPES=8
 export WRITE_RESTART_WITH_BCS=.true.
diff --git a/tests/tests/fv3_regional_quilt b/tests/tests/fv3_regional_quilt
@@ -19,7 +19,7 @@ export LIST_FILES="dynf000.nc \
 
 export_fv3
 
-export TASKS=28
+export TASKS=88
 
 export FV3_RUN=regional_run.IN
 
@@ -35,7 +35,7 @@ export INPUT_NML=regional.nml.IN
 export MODEL_CONFIGURE=model_configure_regional.IN
 
 export FDIAG=3
-export INPES=6
-export JNPES=4
+export INPES=10
+export JNPES=8
 
 export WLCLK=30
diff --git a/tests/tests/fv3_regional_quilt_hafs b/tests/tests/fv3_regional_quilt_hafs
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
 
 export_fv3
 
-export TASKS=28
+export TASKS=88
 
 export FV3_RUN=regional_run.IN
 
@@ -33,7 +33,7 @@ export INPUT_NML=regional.nml.IN
 export MODEL_CONFIGURE=model_configure_hafs.IN
 
 export FDIAG=3
-export INPES=6
-export JNPES=4
+export INPES=10
+export JNPES=8
 
 export WLCLK=30
diff --git a/tests/tests/fv3_regional_quilt_netcdf_parallel b/tests/tests/fv3_regional_quilt_netcdf_parallel
@@ -16,7 +16,7 @@ export LIST_FILES="  atmos_4xdaily.nc \
 
 export_fv3
 
-export TASKS=28
+export TASKS=88
 
 export FV3_RUN=regional_run.IN
 
@@ -32,7 +32,7 @@ export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
 export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
-export INPES=6
-export JNPES=4
+export INPES=10
+export JNPES=8
 
 export WLCLK=30
diff --git a/tests/tests/fv3_regional_restart b/tests/tests/fv3_regional_restart
@@ -14,7 +14,7 @@ export LIST_FILES="  atmos_4xdaily.nc \
 
 export_fv3
 
-export TASKS=24
+export TASKS=80
 export WARM_START=.T.
 
 export FV3_RUN=regional_run.IN
@@ -30,8 +30,8 @@ export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
 export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
-export INPES=4
-export JNPES=6
+export INPES=10
+export JNPES=8
 
 export WARM_START=.T.
 export NGGPS_IC=.F.

diff --git a/tests/tests/fv3_wrtGauss_nemsio_c768 b/tests/tests/fv3_wrtGauss_nemsio_c768
@@ -14,8 +14,8 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
                    atmos_4xdaily.tile4.nc \
                    atmos_4xdaily.tile5.nc \
                    atmos_4xdaily.tile6.nc \
-                   phyf006.nemsio   \
-                   dynf006.nemsio   \
+                   phyf003.nemsio   \
+                   dynf003.nemsio   \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -76,7 +76,7 @@ export SYEAR=2017
 export SMONTH=01
 export SDAY=06
 export DT_ATMOS=225
-export FHMAX=06
+export FHMAX=03
 export WLCLK=30
 export WRITE_GROUP=3
 export WRTTASK_PER_GROUP=36