Merge latest RUC LSM into community develop (#1646)

* bug fix from @tanyasmirnova for rrfs crashes during restart * new regression test rrfs_conus13km_hrrr_warm_restart_mismatch * Update CMEPS with ufsdev_ruclsm * point to top of ufsdev_ruclsm for FV3 and FV3/ccpp/physics * FV3: incorrect character lengths in two calls Co-authored-by: samuel.trahan <[email protected]> Co-authored-by: Ratko Vasic <[email protected]> Co-authored-by: joeolson42 <[email protected]> Co-authored-by: tanya Smirnova <[email protected]>
ufs-community · Mar 31, 2023 · 20e21f6 · 20e21f6
1 parent 7267be0
commit 20e21f6
Show file tree

Hide file tree

Showing 15 changed files with 10,373 additions and 10,828 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
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/rt.conf b/tests/rt.conf
@@ -119,6 +119,9 @@ RUN     | rrfs_smoke_conus13km_radar_tten_warm
 #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_conus13km_hrrr_warm_restart_mismatch                                                                               |                                         | fv3 | rrfs_conus13km_hrrr_warm
+
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp                        |                                         | fv3 |
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230324
+BL_DATE=20230329
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -33,6 +33,9 @@ RUN     | rrfs_smoke_conus13km_radar_tten_warm
 #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_conus13km_hrrr_warm_restart_mismatch                                                                               |                                         | fv3 | rrfs_conus13km_hrrr_warm
+
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
 ##################################################################################################################################################################

diff --git a/tests/tests/rrfs_conus13km_hrrr_warm_restart_mismatch b/tests/tests/rrfs_conus13km_hrrr_warm_restart_mismatch
@@ -0,0 +1,106 @@
+###############################################################################
+#
+#  HRRR physics on 13km domain, control run
+#
+###############################################################################
+
+# 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 run"
+
+export CNTL_DIR=rrfs_conus13km_hrrr_warm_restart_mismatch
+
+export LIST_FILES="sfcf002.nc \
+                   atmf002.nc"
+
+export_fv3
+
+export SYEAR=2021
+export SMONTH=5
+export SDAY=12
+export SHOUR=16
+export FHMAX=2
+export DT_ATMOS=120
+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'"
+
+export FHROT=1
+export RESTART_FILE_PREFIX=$( printf %04d%02d%02d.%02d0000 $SYEAR $SMONTH $SDAY $(( SHOUR+FHROT )) )
+export RRFS_RESTART=YES
+
+# Revert these two to GFS_typedefs defaults to avoid a crash:
+export SEDI_SEMI=.false.
+export DECFL=8
+
+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=5111
+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
+export DIAG_TABLE=diag_table_hrrr
+export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
+15 −2		ufs/ccpp/data/MED_typedefs.F90
+47 −0		ufs/ccpp/data/MED_typedefs.meta
+0 −28		ccpp/data/CCPP_typedefs.meta
+111 −14		ccpp/data/GFS_typedefs.F90
+130 −11		ccpp/data/GFS_typedefs.meta
+166 −16		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+114 −76		io/FV3GFS_io.F90
-Original file line number
+Diff line change
@@ Expand Up @@
     fi
-    BL_DATE=20230324
+    BL_DATE=20230329
     RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
@@ Expand Down @@