Merge branch 'ufs-community:develop' into develop

ufs-community · Apr 28, 2022 · 8353b9c · 8353b9c
2 parents 2391e4b + 9bf10ca
commit 8353b9c
Show file tree

Hide file tree

Showing 24 changed files with 6,483 additions and 6,155 deletions.
diff --git a/FV3 b/FV3
diff --git a/stochastic_physics b/stochastic_physics
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/default_vars.sh b/tests/default_vars.sh
@@ -993,12 +993,12 @@ export DO_SHUM=.false.
 export DO_SKEB=.false.
 export LNDP_TYPE=0
 export N_VAR_LNDP=0
-export LNDP_EACH_STEP=.false.
 export SKEB=-999.
 export SPPT=-999.
 export SHUM=-999.
-export LNDP_VAR_LIST='XXX'
+export LNDP_VAR_LIST="'XXX'"
 export LNDP_PRT_LIST=-999
+export LNDP_MODEL_TYPE=0
 
 #IAU
 export IAU_INC_FILES="''"

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -327,9 +327,12 @@ deflate_level=1
 
 &nam_sfcperts
  lndp_type = @[LNDP_TYPE]
+ lndp_model_type = @[LNDP_MODEL_TYPE]
  LNDP_TAU=21600,
  LNDP_LSCALE=500000,
  ISEED_LNDP=2010,
+ lndp_var_list = @[LNDP_VAR_LIST]
+ lndp_prt_list = @[LNDP_PRT_LIST]
 /
 
 &cires_ugwp_nml

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -322,6 +322,7 @@ deflate_level=1
 
 &nam_sfcperts
  lndp_type = @[LNDP_TYPE]
+ lndp_model_type = @[LNDP_MODEL_TYPE]
  LNDP_TAU=21600,
  LNDP_LSCALE=500000,
  ISEED_LNDP=2010,

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -237,6 +237,8 @@ deflate_level=1
  ca_trigger = @[CA_TRIGGER]
  nspinup = @[NSPINUP]
  iseed_ca = @[ISEED_CA]
+ lndp_type = @[LNDP_TYPE]
+ n_var_lndp = @[N_VAR_LNDP]
 /
 
 &cires_ugwp_nml
@@ -359,6 +361,13 @@ deflate_level=1
 /
 
 &nam_sfcperts
+ lndp_type = @[LNDP_TYPE]
+ lndp_model_type = @[LNDP_MODEL_TYPE]
+ LNDP_TAU=21600,
+ LNDP_LSCALE=500000,
+ ISEED_LNDP=2010,
+ lndp_var_list = @[LNDP_VAR_LIST]
+ lndp_prt_list = @[LNDP_PRT_LIST]
 /
 
 &MOM_input_nml

diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN
@@ -210,7 +210,6 @@ deflate_level=1
  do_skeb = @[DO_SKEB]
  lndp_type = @[LNDP_TYPE]
  n_var_lndp = @[N_VAR_LNDP]
- lndp_each_step = @[LNDP_EACH_STEP]
  fscav_aero = @[FSCAV_AERO]
  icloud_bl = 1
  bl_mynn_tkeadvect = .true.
@@ -358,11 +357,12 @@ deflate_level=1
 
 &nam_sfcperts
  lndp_type = @[LNDP_TYPE]
+ lndp_model_type = @[LNDP_MODEL_TYPE]
  LNDP_TAU=21600,
  LNDP_LSCALE=500000,
  ISEED_LNDP=2010,
  lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol'
- lndp_prt_list = 0.200, 0.001, 0.001, 0.001, 0.001, 0.001
+ lndp_prt_list = 0.017, 0.001, 0.001, 0.001, 0.001, 0.001
 /
 
 &cires_ugwp_nml

diff --git a/tests/parm/regional_stoch.nml.IN b/tests/parm/regional_stoch.nml.IN
@@ -201,7 +201,6 @@
  kice = 9
  ldiag3d = .false.
  lheatstrg = @[LHEATSTRG]
- lndp_each_step = .true.
  lndp_type = 0
  lradar = .true.
  lsm = 3
@@ -236,6 +235,7 @@
 
 &nam_sfcperts
  iseed_lndp = 2010
+ lndp_model_type = 2
  lndp_lscale = 500000
  lndp_prt_list = 0.2, 0.1
  lndp_tau = 21600

diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -211,7 +211,6 @@
 ! lfnc_p0 = @[LFNC_P0]
  lheatstrg = @[LHEATSTRG]
 ! lkm = @[LKM]
-! lndp_each_step = @[LNDP_EACH_STEP]
  lndp_type = @[LNDP_TYPE]
  lradar = @[LRADAR]
 ! lseaspray = @[LSEASPRAY]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -50,6 +50,7 @@ RUN | control_iovr4
 RUN | control_iovr5 | | fv3 |
 
 RUN | control_p8 | | fv3 |
+RUN | control_p8_lndp | | fv3 |
 RUN | control_restart_p8 | | | control_p8
 RUN | control_decomp_p8 | | |
 RUN | control_2threads_p8 | - wcoss_cray | |

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=20220421
+BL_DATE=20220425
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/control_lndp b/tests/tests/control_lndp
@@ -51,3 +51,4 @@ export LNDP_TYPE=2
 export N_VAR_LNDP=2
 export LNDP_VAR_LIST="'smc' , 'vgf',"
 export LNDP_PRT_LIST='0.2,0.1,'
+export LNDP_MODEL_TYPE=1
diff --git a/tests/tests/control_lndp_debug b/tests/tests/control_lndp_debug
@@ -44,6 +44,7 @@ export ISEED_CA=1
 export NSMOOTH=1
 export CA_AMPLITUDE=0.35
 export LNDP_TYPE=2
+export LNDP_MODEL_TYPE=1
 export N_VAR_LNDP=2
 export LNDP_VAR_LIST="'smc' , 'vgf',"
 export LNDP_PRT_LIST='0.2,0.1,'
diff --git a/tests/tests/control_p8_lndp b/tests/tests/control_p8_lndp
@@ -0,0 +1,145 @@
+###############################################################################
+#
+# Global control test GFSv16 atmosphere only at C96L127, P8 configuration
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control results with previous trunk version"
+
+export CNTL_DIR=control_p8_lndp
+
+export LIST_FILES="sfcf000.nc \
+ sfcf021.nc \
+ sfcf024.nc \
+ sfcf048.nc \
+ atmf000.nc \
+ atmf021.nc \
+ atmf024.nc \
+ atmf048.nc \
+ GFSFLX.GrbF00 \
+ GFSFLX.GrbF21 \
+ GFSFLX.GrbF24 \
+ GFSFLX.GrbF48 \
+ GFSPRS.GrbF00 \
+ GFSPRS.GrbF21 \
+ GFSPRS.GrbF24 \
+ GFSPRS.GrbF48"
+
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=720
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL="12 -1"
+export OUTPUT_GRID='gaussian_grid'
+export WRITE_DOPOST=.true.
+export FHMAX=48
+export OUTPUT_FH='0 21 24 48'
+
+# 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
+
+# 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,1,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_v17_p8
+export FIELD_TABLE=field_table_thompson_noaero_tke
+export DIAG_TABLE=diag_table_gfsv16_merra2
+# use same namelist for standalone,coupled P7
+export INPUT_NML=cpld_control.nml.IN
+export LNDP_TYPE=2
+export N_VAR_LNDP=1
+export LNDP_VAR_LIST="'vgf',"
+export LNDP_PRT_LIST='0.05,'
+export LNDP_MODEL_TYPE=1
+
+# RRTMGP
+export DO_RRTMGP=.true.
+export DOGP_CLDOPTICS_LUT=.true.
+export DOGP_LWSCAT=.true.
+export DOGP_SGS_CNV=.true.
diff --git a/tests/tests/rap_lndp_debug b/tests/tests/rap_lndp_debug
@@ -61,5 +61,5 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 
 export LNDP_TYPE=2
 export N_VAR_LNDP=6
-export LNDP_EACH_STEP=.true.
+export LNDP_MODEL_TYPE=2