ufs-community · zach1221 · Aug 29, 2023 · Aug 4, 2023 · Aug 8, 2023 · Aug 8, 2023
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20230824
+export BL_DATE=20230825
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1300,3 +1300,152 @@ export NFHOUT_HF=3
 export NSOUT=-1
 export OUTPUT_FH=-1
 }
+export_hrrr() {
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=300
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+
+export FRAC_GRID=.false.
+export FRAC_ICE=.true.
+
+export FV3_RUN=lake_control_run.IN
+export CCPP_SUITE=FV3_HRRR
+export INPUT_NML=rap.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke
+export NEW_DIAGTABLE=diag_table_rap
+
+export SFCLAY_COMPUTE_FLUX=.true.
+
+export LKM=1
+export IOPT_LAKE=2
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export IALB=2
+export IEMS=2
+export HYBEDMF=.false.
+export DO_MYNNEDMF=.true.
+export DO_MYNNSFCLAY=.true.
+export DO_DEEP=.false.
+export SHAL_CNV=.false.
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
+export LHEATSTRG=.false.
+export LSM=3
+export LSOIL_LSM=9
+export KICE=9
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+}
+export_hrrr_conus13km()
+{
+export_fv3
+export SYEAR=2021
+export SMONTH=05
+export SDAY=12
+export SHOUR=16
+export FHMAX=2
+export DT_ATMOS=120
+export RESTART_INTERVAL=1
+export QUILTING=.true.
+export WRITE_GROUP=1
+export WRTTASK_PER_GROUP=6
+export NTILES=1
+export WRITE_DOPOST=.false.
+export OUTPUT_HISTORY=.true.
+export OUTPUT_GRID=lambert_conformal
+export OUTPUT_FILE="'netcdf'"
+
+# Revert these two to GFS_typedefs defaults to avoid a crash:
+export SEDI_SEMI=.false.
+export DECFL=8
+
+export RRFS_SMOKE=.true.
+export SEAS_OPT=0
+
+export LKM=1
+export SFCLAY_COMPUTE_FLUX=.true.
+export IALB=2
+export ICLIQ_SW=2
+export IEMS=2
+export IOVR=3
+export KICE=9
+export LSM=3
+export LSOIL_LSM=9
+export DO_MYNNSFCLAY=.true.
+export DO_MYNNEDMF=.true.
+export DO_MYJPBL=.true
+export HYBEDMF=.false.
+export SHAL_CNV=.false.
+export DO_SAT_ADJ=.false.
+export DO_DEEP=.false.
+export CCPP_SUITE='FV3_HRRR'
+export INPES=12
+export JNPES=12
+export NPX=397
+export NPY=233
+export NPZ=65
+export MAKE_NH=.false.
+export NA_INIT=0
+export DNATS=0
+export EXTERNAL_IC=.false.
+export NGGPS_IC=.false.
+export MOUNTAIN=.true.
+export WARM_START=.true.
+export READ_INCREMENT=.false.
+export RES_LATLON_DYNAMICS="'fv3_increment.nc'"
+export NPZP=66
+export FHZERO=1.0
+export IMP_PHYSICS=8
+export LDIAG3D=.false.
+export QDIAG3D=.false.
+export PRINT_DIFF_PGR=.true.
+export FHCYC=0.0
+export IAER=1011
+export LHEATSTRG=.false.
+export RANDOM_CLDS=.false.
+export CNVCLD=.false.
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
+export CDMBWD='3.5,1.0'
+export DO_SPPT=.false.
+export DO_SHUM=.false.
+export DO_SKEB=.false.
+export LNDP_TYPE=0
+export N_VAR_LNDP=0
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+
+export FV3_RUN=rrfs_warm_run.IN
+export INPUT_NML=rrfs_conus13km_hrrr.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke_smoke
+export DIAG_TABLE=diag_table_hrrr
+export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
+export DIAG_TABLE_ADDITIONAL=diag_additional_rrfs_smoke
+export FRAC_ICE=.true.
+}
diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -113,7 +113,7 @@ RUN | regional_ifi_control                              | + acorn
 RUN | regional_ifi_decomp                               | + acorn                    |          |
 RUN | regional_ifi_2threads                             | + acorn                    |          |
 
-COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
+COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl,FV3_HRRR_gf,FV3_HRRR_c3 -D32BIT=ON | | fv3 |
 RUN | rap_control                                       |                            | baseline |
 RUN | regional_spp_sppt_shum_skeb                       |                            | baseline |
 RUN | rap_decomp                                        |                            |          |
@@ -131,17 +131,8 @@ RUN | hrrr_control_restart_qr                           | - wcoss2
 RUN | rrfs_v1beta                                       |                            | baseline |
 RUN | rrfs_v1nssl                                       |                            | baseline |
 RUN | rrfs_v1nssl_nohailnoccn                           |                            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm                    |                            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 | - cheyenne                 |          |
-RUN | rrfs_smoke_conus13km_hrrr_warm_2threads           |                            |          |
-RUN | rrfs_conus13km_hrrr_warm                          |                            | baseline |
-RUN | rrfs_smoke_conus13km_radar_tten_warm              |                            | baseline |
-# These two should run and not crash, but they do not match their baselines:
-#RUN | rrfs_smoke_conus13km_hrrr_warm_decomp            |                            |          |
-#RUN | rrfs_smoke_conus13km_hrrr_warm_restart           |                            |          | rrfs_smoke_conus13km_hrrr_warm
-# Just to make sure restart doesn't crash again:
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch   |                            | baseline | rrfs_smoke_conus13km_hrrr_warm
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | - cheyenne                |          | rrfs_smoke_conus13km_hrrr_warm_qr
+RUN | hrrr_gf                                           |                            | baseline |
+RUN | hrrr_c3                                           |                            | baseline |
 
 COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | | fv3 |
 RUN | control_csawmg                                    | - gaea.intel               | baseline |
@@ -158,11 +149,6 @@ RUN | regional_control_faster                           |
 
 ### DEBUG ATM tests ###
 COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta | | fv3 |
-RUN | rrfs_smoke_conus13km_hrrr_warm_debug              |                            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_debug_2threads     |                            |          |
-RUN | rrfs_conus13km_hrrr_warm_debug                    |                            | baseline |
-# This should run and not crash, but does not match its baseline
-#RUN | rrfs_smoke_conus13km_hrrr_warm_debug_decomp      |                            |          |
 RUN | control_CubedSphereGrid_debug                     |                            | baseline |
 RUN | control_wrtGauss_netcdf_parallel_debug            |                            | baseline |
 RUN | control_stochy_debug                              |                            | baseline |
@@ -204,18 +190,29 @@ RUN | rap_restart_dyn32_phy32                           |
 RUN | hrrr_control_restart_dyn32_phy32                  |                            |          | hrrr_control_dyn32_phy32
 RUN | hrrr_control_restart_qr_dyn32_phy32               |                            |          | hrrr_control_qr_dyn32_phy32
 
-COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DFASTER=ON | | fv3 |
-RUN | rrfs_smoke_conus13km_fast_phy32                   |                            | baseline |
-RUN | rrfs_smoke_conus13km_fast_phy32_qr                | - cheyenne                 | baseline |
-RUN | rrfs_smoke_conus13km_fast_phy32_restart_mismatch  |                            | baseline | rrfs_smoke_conus13km_fast_phy32
-RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch | - cheyenne               |          | rrfs_smoke_conus13km_fast_phy32_qr
+COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DFASTER=ON -DCCPP_SUITES=FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | | fv3 |
+RUN | conus13km_control             |                            | baseline |
+RUN | conus13km_2threads            |                            |          | conus13km_control
+RUN | conus13km_restart_mismatch    |                            | baseline | conus13km_control
+
+# Expected to fail:
+# RUN | conus13km_restart             |                            |          | conus13km_control
+# RUN | conus13km_decomp              |                            |          | conus13km_control
+# RUN | conus13km_control_qr          |                            | baseline |
+# RUN | conus13km_restart_qr_mismatch |                            | baseline | conus13km_control
 
 COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | | fv3 |
 RUN | rap_control_dyn64_phy32                           |                            | baseline |
 
-COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | | fv3 |
+COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | | fv3 |
 RUN | rap_control_debug_dyn32_phy32                     |                            | baseline |
 RUN | hrrr_control_debug_dyn32_phy32                    |                            | baseline |
+RUN | conus13km_debug                                   |                            | baseline |
+RUN | conus13km_debug_2threads                          |                            |          |
+RUN | conus13km_radar_tten_debug                        |                            | baseline |
+
+# Expected to fail:
+# RUN | conus13km_debug_decomp                            |                            |          |
 
 COMPILE | rrfs_dyn64_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DDEBUG=ON | | fv3 |
 RUN | rap_control_dyn64_phy32_debug                     |                            | baseline |
@@ -318,7 +315,7 @@ RUN | control_ras                                       | + hera cheyenne
 RUN | control_p8                                        | + hera cheyenne            | baseline |
 RUN | control_flake                                     | + hera cheyenne            | baseline |
 
-COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera cheyenne | fv3 |
+COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_HRRR_gf,FV3_HRRR_c3 -D32BIT=ON | + hera cheyenne | fv3 |
 RUN | rap_control                                       | + hera cheyenne            | baseline |
 RUN | rap_decomp                                        | + hera cheyenne            |          |
 RUN | rap_2threads                                      | + hera cheyenne            |          |
@@ -333,17 +330,10 @@ RUN | hrrr_control_decomp                               | + hera cheyenne
 RUN | hrrr_control_restart                              | + hera cheyenne            |          | hrrr_control
 RUN | hrrr_control_restart_qr                           | + hera cheyenne            |          | hrrr_control_qr
 RUN | rrfs_v1beta                                       | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm                    | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 | + hera                     |          |
-RUN | rrfs_smoke_conus13km_hrrr_warm_2threads           | + hera cheyenne            |          |
-RUN | rrfs_smoke_conus13km_radar_tten_warm              | + hera cheyenne            | baseline |
-RUN | rrfs_conus13km_hrrr_warm                          | + hera cheyenne            | baseline |
-# These two will run and not crash, but they do not match their baselines:
-#RUN | rrfs_smoke_conus13km_hrrr_warm_decomp            | + hera cheyenne            |          |
-#RUN | rrfs_smoke_conus13km_hrrr_warm_restart           | + hera cheyenne            |          | rrfs_smoke_conus13km_hrrr_warm
-# Just to make sure restart doesn't crash again:
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch   | + hera cheyenne            | baseline | rrfs_smoke_conus13km_hrrr_warm
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | + hera                    |          | rrfs_smoke_conus13km_hrrr_warm_qr
+RUN | hrrr_gf                                           | + hera cheyenne            | baseline |
+
+# Crashes on Cheyenne
+# RUN | hrrr_c3                                           | + hera cheyenne            | baseline |
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
@@ -359,14 +349,10 @@ RUN | rrfs_v1beta_debug                                 | + hera cheyenne
 RUN | control_ras_debug                                 | + hera cheyenne            | baseline |
 RUN | control_stochy_debug                              | + hera cheyenne            | baseline |
 RUN | control_debug_p8                                  | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_debug              | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_debug_2threads     | + hera cheyenne            |          |
-RUN | rrfs_conus13km_hrrr_warm_debug                    | + hera cheyenne            | baseline |
-# This will run and not crash, but will not match its baseline:
-#RUN | rrfs_smoke_conus13km_hrrr_warm_debug_decomp      | + hera cheyenne            |          |
 RUN | rap_flake_debug                                   | + hera cheyenne            | baseline |
 RUN | rap_clm_lake_debug                                | + hera cheyenne            | baseline |
 
+
 COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera cheyenne | fv3 |
 RUN | control_wam_debug                                 | + hera cheyenne            | baseline |
 
@@ -382,17 +368,28 @@ RUN | hrrr_control_decomp_dyn32_phy32                   | + hera cheyenne
 RUN | rap_restart_dyn32_phy32                           | + hera cheyenne            |          | rap_control_dyn32_phy32
 RUN | hrrr_control_restart_dyn32_phy32                  | + hera cheyenne            |          | hrrr_control_dyn32_phy32
 RUN | hrrr_control_restart_qr_dyn32_phy32               | + hera cheyenne            |          | hrrr_control_qr_dyn32_phy32
-RUN | rrfs_smoke_conus13km_phy32                        | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_phy32_qr                     | + hera                     | baseline |
-RUN | rrfs_smoke_conus13km_phy32_restart_mismatch       | + hera cheyenne            | baseline | rrfs_smoke_conus13km_phy32
-RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch    | + hera                     |          | rrfs_smoke_conus13km_phy32_qr
+RUN | conus13km_control                                 | + hera cheyenne            | baseline |
+RUN | conus13km_2threads                                | + hera cheyenne            |          | conus13km_control
+RUN | conus13km_restart_mismatch                        | + hera cheyenne            | baseline | conus13km_control
+
+# Expected to fail:
+# RUN | conus13km_restart                                 | + hera cheyenne            |          | conus13km_control
+# RUN | conus13km_decomp                                  | + hera cheyenne            |          | conus13km_control
+# RUN | conus13km_control_qr                              | + hera cheyenne            | baseline |
+# RUN | conus13km_restart_qr_mismatch                     | + hera cheyenne            | baseline | conus13km_control
 
 COMPILE | atm_dyn64_phy32 | gnu | -DAPP=ATM -DCCPP_32BIT=ON | + hera cheyenne | fv3 |
 RUN | rap_control_dyn64_phy32                           | + hera cheyenne            | baseline |
 
 COMPILE | atm_dyn32_phy32_debug | gnu | -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | + hera cheyenne | fv3 |
 RUN | rap_control_debug_dyn32_phy32                     | + hera cheyenne            | baseline |
 RUN | hrrr_control_debug_dyn32_phy32                    | + hera cheyenne            | baseline |
+RUN | conus13km_debug                                   | + hera cheyenne            | baseline |
+RUN | conus13km_debug_2threads                          | + hera cheyenne            |          |
+RUN | conus13km_radar_tten_debug                        | + hera cheyenne            | baseline |
+
+# Expected to fail:
+# RUN | conus13km_debug_decomp       | + hera cheyenne            |          |
 
 COMPILE | atm_dyn64_phy32_debug | gnu | -DAPP=ATM -DCCPP_32BIT=ON -DDEBUG=ON | + hera cheyenne | fv3 |
 RUN | rap_control_dyn64_phy32_debug                     | + hera cheyenne            | baseline |

diff --git a/tests/tests/conus13km_2threads b/tests/tests/conus13km_2threads
@@ -0,0 +1,26 @@
+###############################################################################
+#
+#  HRRR physics on 13km domain, two threads
+#
+###############################################################################
+
+# This configuration is supposed to match the rrfs_dev1 parallel, so
+# do not change the namelist without checking the current parallel.
+
+export TEST_DESCR="HRRR physics on 13km domain, two threads"
+
+export CNTL_DIR=conus13km_control
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf001.nc \
+                   atmf000.nc \
+                   atmf001.nc"
+
+export_hrrr_conus13km
+export SMONTH=5
+export RESTART_INTERVAL=1
+export FHMAX=1
+export atm_omp_num_threads=2
+export INPES=12
+export JNPES=12
+export WRTTASK_PER_GROUP=6
diff --git a/tests/tests/conus13km_control b/tests/tests/conus13km_control
@@ -0,0 +1,29 @@
+###############################################################################
+#
+#  HRRR physics on 13km domain, control
+#
+###############################################################################
+
+# This configuration is supposed to match the rrfs_dev1 parallel, so
+# do not change the namelist without checking the current parallel.
+
+export TEST_DESCR="HRRR physics on 13km domain, control"
+
+export CNTL_DIR=conus13km_control
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf001.nc \
+                   sfcf002.nc \
+                   atmf000.nc \
+                   atmf001.nc \
+                   atmf002.nc \
+                   RESTART/20210512.170000.coupler.res \
+                   RESTART/20210512.170000.fv_core.res.nc \
+                   RESTART/20210512.170000.fv_core.res.tile1.nc \
+                   RESTART/20210512.170000.fv_srf_wnd.res.tile1.nc \
+                   RESTART/20210512.170000.fv_tracer.res.tile1.nc \
+                   RESTART/20210512.170000.phy_data.nc \
+                   RESTART/20210512.170000.sfc_data.nc"
+
+export_hrrr_conus13km
+export RESTART_INTERVAL=1
+1 −1		ccpp/suites/suite_FV3_HRRR_c3.xml
+1 −1		ccpp/suites/suite_FV3_HRRR_gf.xml
+59 −1		io/fv3atm_clm_lake_io.F90
+3 −0		io/fv3atm_restart_io.F90
+40 −9		io/module_wrt_grid_comp.F90