ufs-community · DeniseWorthen · Jun 2, 2022 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
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/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
@@ -677,7 +677,7 @@ export DZ_MIN=6
 # P7 Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
-export NSTF_NAME=2,1,0,0,0
+export NSTF_NAME=2,0,0,0,0
 
 export LHEATSTRG=.true.
 export LSEASPRAY=.true.
@@ -697,7 +697,7 @@ export CDMBWD=${CDMBWD_c96}
 # P8 RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
-export DOGP_LWSCAT=.true
+export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
 #P8 UGWD

diff --git a/tests/parm/nems.configure.atm_aerosols.IN → tests/parm/nems.configure.atmaero.IN b/tests/parm/nems.configure.atm_aerosols.IN → tests/parm/nems.configure.atmaero.IN
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -6,7 +6,7 @@ COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8
 RUN     | cpld_control_p8                                                                                                         | - wcoss_cray  wcoss2.intel              | fv3 |
 RUN     | cpld_restart_p8                                                                                                         | - wcoss_cray  wcoss2.intel              |     | cpld_control_p8
 RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray  wcoss2.intel              |     |
-RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray  wcoss2.intel jet.intel    |     |
+RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray  wcoss2.intel              |     |
 RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray  wcoss2.intel              |     |
 #RUN     | cpld_multigrid_p8                                                                                                       | - wcoss_cray  wcoss2.intel              |     |
 
@@ -201,5 +201,5 @@ RUN     | control_atmwav
 # ATM-GOCART tests                                                                                                                                                                #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16                                                                               | - wcoss_cray wcoss2.intel                 | fv3 |
-RUN     | control_atm_aerosols                                                                                                  | - wcoss_cray wcoss2.intel                 | fv3 |
+COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON                                                                 | - wcoss_cray wcoss2.intel                 | fv3 |
+RUN     | atmaero_control_p8                                                                                                    | - wcoss_cray wcoss2.intel cheyenne.intel  | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220531
+BL_DATE=20220601
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]] || [[ $MACHINE_ID = wcoss2.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -283,6 +283,11 @@ if [[ "${DIAG_TABLE_ADDITIONAL:-}Q" != Q ]] ; then
   atparse < "${PATHRT}/parm/diag_table/${DIAG_TABLE_ADDITIONAL:-}" >> diag_table
 fi
 
+# ATMAERO
+if [[ $CPLCHM == .true. ]] && [[ $S2S = 'false' ]]; then
+  atparse < ${PATHRT}/parm/diag_table/${DIAG_TABLE:-diag_table_template} > diag_table
+fi
+
 if [[ $DATM_CDEPS = 'true' ]]; then
   atparse < ${PATHRT}/parm/${DATM_IN_CONFIGURE:-datm_in} > datm_in
   atparse < ${PATHRT}/parm/${DATM_STREAM_CONFIGURE:-datm.streams.IN} > datm.streams

diff --git a/tests/tests/control_atm_aerosols → tests/tests/atmaero_control_p8 b/tests/tests/control_atm_aerosols → tests/tests/atmaero_control_p8
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  global control test with prognostic aerosols: GFSv16 FV3-GOCART at C96L127
+#  global control test with prognostic aerosols: GFSv17 P8 FV3-GOCART at C96L127
 #
 ###############################################################################
 
 export TEST_DESCR="Compare global results for prognostic aerosols with previous trunk version"
 
-export CNTL_DIR=control_atm_aerosols
+export CNTL_DIR=atmaero_control_p8
 
 export LIST_FILES="sfcf000.nc \
                    sfcf024.nc \
@@ -62,20 +62,115 @@ export RESTART_INTERVAL='12 -1'
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
-export IAER=5111
-export IOVR=3
-export FSCAV_AERO='"*:0.6", "seas1:1.0", "seas2:1.0", "seas3:1.0", "seas4:1.0", "seas5:1.0"'
-export DNATS=3
 
 export CPL=.true.
 export CPLCHM=.true.
+export NEMS_CONFIGURE=nems.configure.atmaero.IN
+
 export atm_model='fv3'
 export chm_model='gocart'
 export coupling_interval_sec=${DT_ATMOS}
-export NEMS_CONFIGURE="nems.configure.atm_aerosols.IN"
+
+# default resources
+export DOMAINS_STACK_SIZE=8000000
+
+# P7 default
+export IALB=2
+export IEMS=2
+export LSM=2
+export IOPT_DVEG=4
+export IOPT_CRS=2
+export IOPT_RAD=3
+export IOPT_ALB=1
+export IOPT_STC=3
+# P8
+export IOPT_SFC=3
+export IOPT_TRS=2
+
+# FV3 P7 settings
+export D2_BG_K1=0.20
+export D2_BG_K2=0.04
+export PSM_BC=1
+# P8
+export DDDMP=0.1
+
+# P7 Merra2 Aerosols & NSST
+export USE_MERRA2=.true.
+export IAER=1011
+export NSTF_NAME=2,0,0,0,0
+
+export LHEATSTRG=.true.
+export LSEASPRAY=.true.
+
+# P7 UGWP1
+export GWD_OPT=2
+export DO_UGWP_V1=.false.
+export KNOB_UGWP_VERSION=0
+export KNOB_UGWP_NSLOPE=1
+export DO_UGWP_V0=.true.
+export DO_GSL_DRAG_LS_BL=.false.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+
+# P7 CA
+export DO_CA=.true.
+export CA_SGS=.true.
+export CA_GLOBAL=.false.
+export NCA=1
+export NCELLS=5
+export NLIVES=12
+export NTHRESH=18
+export NSEED=1
+export NFRACSEED=0.5
+export CA_TRIGGER=.true.
+export NSPINUP=1
+export ISEED_CA=12345
+
+# P7 settings
+export TILEDFIX=.true.
+export FNALBC="'C96.snowfree_albedo.tileX.nc'"
+export FNALBC2="'C96.facsf.tileX.nc'"
+export FNTG3C="'C96.substrate_temperature.tileX.nc'"
+export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
+export FNVETC="'C96.vegetation_type.tileX.nc'"
+export FNSOTC="'C96.soil_type.tileX.nc'"
+export FNSMCC=${FNSMCC_control}
+export FNMSKH=${FNMSKH_control}
+export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
+export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
+export FNSLPC="'C96.slope_type.tileX.nc'"
+export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
+export LANDICE=".false."
+export FSICL=0
+export FSICS=0
+
+export IMP_PHYSICS=8
+export LGFDLMPRAD=.false.
+export DO_SAT_ADJ=.false.
+export DNATS=2
+export DZ_MIN=6
+
+#required for NML.IN sharing
+export MIN_SEAICE=0.15
+export FRAC_GRID=.true.
+export MOM6_RESTART_SETTING=n
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
+
+export WRITE_NSFLIP=.true.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
-export DIAG_TABLE=diag_table_GOCART
-export FIELD_TABLE=field_table_GOCART
+export CCPP_SUITE=FV3_GFS_v17_p8
+export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+export DIAG_TABLE=diag_table_p7.2_template
+# use same namelist for standalone,coupled P7
+export INPUT_NML=cpld_control.nml.IN
+
+# RRTMGP
+export DO_RRTMGP=.false.
+export DOGP_CLDOPTICS_LUT=.true.
+export DOGP_LWSCAT=.true.
+export DOGP_SGS_CNV=.true.
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -129,6 +129,9 @@ export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C384.slope_type.tileX.nc'"
 export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 
+#BMICs do not contain NSST spinup
+export NSTF_NAME=2,1,0,0,0
+
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 

diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -142,7 +142,6 @@ export NA_INIT=0
 export EXTERNAL_IC=.false.
 export NGGPS_IC=.false.
 export MOUNTAIN=.true.
-export NSTF_NAME=2,0,0,0,0
 
 # ICE warm start
 export CICERUNTYPE=continue

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -140,7 +140,6 @@ export NA_INIT=0
 export EXTERNAL_IC=.false.
 export NGGPS_IC=.false.
 export MOUNTAIN=.true.
-export NSTF_NAME=2,0,0,0,0
 
 # ICE warm start
 export CICERUNTYPE=continue

diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
@@ -75,7 +75,6 @@ export NA_INIT=0
 export EXTERNAL_IC=.false.
 export NGGPS_IC=.false.
 export MOUNTAIN=.true.
-export NSTF_NAME=2,0,0,0,0
 
 # ICE warm start
 export CICERUNTYPE=continue