Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SPP to the SRW App #685

Merged
merged 60 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
beeb04b
Add default namelist with SPP entries.
JeffBeck-NOAA Jan 13, 2021
48bcacc
Changes necessary to run with SPP
JeffBeck-NOAA Jan 13, 2021
03b4aa8
Typo fix in generate script.
JeffBeck-NOAA Jan 13, 2021
abddc04
Changes to implement SPP.
JeffBeck-NOAA Jan 13, 2021
2950904
Add comment regarding use of SPP.
JeffBeck-NOAA Jan 20, 2021
ea9f387
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jan 28, 2021
89eb7ba
Pass N_VAR_SPP to the var_defns.sh file.
JeffBeck-NOAA Jan 28, 2021
6e4814d
Add spp_wts_pbl to the FV3_GSD_SAR SDF diag_table file
JeffBeck-NOAA Mar 17, 2021
61c3727
Remove the contents of the &nam_spperts stanza and n_var_spp from the…
JeffBeck-NOAA Mar 18, 2021
b178707
Remove SPP namelist entries from the template input.nml file. These …
JeffBeck-NOAA Mar 18, 2021
b239954
Add MYNN SFC pattern variable to the diag_table file for the FV3_GSD_…
JeffBeck-NOAA Mar 22, 2021
13418b7
Add 'sfc' perturbation option to SPP
JeffBeck-NOAA Mar 24, 2021
f2bf18e
Add iseed array to namelist generation
JeffBeck-NOAA Mar 24, 2021
eede48a
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Apr 28, 2021
6f4f22d
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Aug 10, 2021
a635561
Changes to add "rad" and "gwd" SPP perturbations.
JeffBeck-NOAA Aug 10, 2021
4cccb68
Add SPP and ad-hoc stochastic physics to SDFs.
JeffBeck-NOAA Aug 10, 2021
024e83a
Add LSM SPP functionality to the SRW App.
JeffBeck-NOAA Aug 12, 2021
988fe33
Add random number generation for LSM SPP iseeds in ensemble mode.
JeffBeck-NOAA Aug 12, 2021
906fc90
Fix undeclared variable for LSM SPP.
JeffBeck-NOAA Aug 12, 2021
f69f8ae
Add if statement for LSM SPP namelist entries and set fhcyc to 999 if…
JeffBeck-NOAA Aug 12, 2021
8a2f11e
Modify how namelist settings are applied for LSM SPP.
JeffBeck-NOAA Aug 12, 2021
d59f271
Fix implementation of fhcyc changes.
JeffBeck-NOAA Aug 12, 2021
df4e097
Typo fix.
JeffBeck-NOAA Aug 12, 2021
ba7fb50
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Sep 29, 2021
d75788c
Add do_gsl* namelist entries to YAML file for FV3_HRRR SDF.
JeffBeck-NOAA Sep 11, 2021
e24cef5
Remove diss_est from the diag table files since it's unavailable for …
JeffBeck-NOAA Oct 22, 2021
3450cd2
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Dec 23, 2021
0a9eae7
Change LSM SPP perturbation seed to be the same as all other SPP.
JeffBeck-NOAA Dec 23, 2021
f6ee1ec
Changes to FV3_HRRR field_table
JeffBeck-NOAA Jan 19, 2022
22d8dd0
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jan 20, 2022
89714aa
Change to the FV3_HRRR field_table file
JeffBeck-NOAA Jan 20, 2022
0175fb5
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jan 20, 2022
671ef73
Update name for SPP block in input.nml
JeffBeck-NOAA Feb 15, 2022
9b39fa8
Change SPP_LSM_* to LSM_SPP_*
JeffBeck-NOAA Feb 24, 2022
f098395
Remove space.
JeffBeck-NOAA Feb 24, 2022
5130a86
Update descriptions of LSM perturbations.
JeffBeck-NOAA Feb 24, 2022
95a8102
Shut off PET file generation.
JeffBeck-NOAA Feb 24, 2022
08ee469
Modifications for land and SPP perturbations (templates, namelists, d…
JeffBeck-NOAA Feb 25, 2022
af6d543
Merge branch 'develop' of https://github.com/ufs-community/regional_w…
JeffBeck-NOAA Feb 26, 2022
e4173df
Remove diss_est from diag_table files and remove the FV3_GSD_SAR and …
JeffBeck-NOAA Feb 26, 2022
eb702ef
Fix in setup.sh for LSM SPP
JeffBeck-NOAA Feb 28, 2022
bf82e6c
Update Thompson MP SPP settings.
JeffBeck-NOAA Feb 28, 2022
ee3957d
Merge branch 'develop' of https://github.com/ufs-community/regional_w…
JeffBeck-NOAA Mar 1, 2022
c799e8c
Merge branch 'develop' of https://github.com/ufs-community/regional_w…
JeffBeck-NOAA Mar 2, 2022
cc997ab
Add back FV3_GSD_SAR and FV3_GSD_v0 SDFs. Will be removed in future,…
JeffBeck-NOAA Mar 2, 2022
ed9f5a7
Requested modifications to the input.nml template and in-line documen…
JeffBeck-NOAA Mar 3, 2022
732999e
Fix check for LSM SPP namelist settings
JeffBeck-NOAA Mar 3, 2022
bc6cc28
Fix to LSM SPP namelist check.
JeffBeck-NOAA Mar 3, 2022
010c1d9
Merge branch 'develop' of https://github.com/ufs-community/regional_w…
JeffBeck-NOAA Mar 4, 2022
05d8849
Merge branch 'feature/spp' of https://github.com/JeffBeck-NOAA/region…
JeffBeck-NOAA Mar 4, 2022
d91836e
Changes request based on PR review.
JeffBeck-NOAA Mar 8, 2022
d80dd3e
Changes requested in PR review.
JeffBeck-NOAA Mar 8, 2022
54bfd42
Merge branch 'feature/spp' of https://github.com/JeffBeck-NOAA/region…
JeffBeck-NOAA Mar 8, 2022
7599e48
Variable descriptions.
JeffBeck-NOAA Mar 8, 2022
4b9bde0
Fix comment formatting.
JeffBeck-NOAA Mar 8, 2022
7b95df1
Merge branch 'develop' of https://github.com/ufs-community/regional_w…
JeffBeck-NOAA Mar 8, 2022
ac4ef74
Merge branch 'feature/spp' of https://github.com/JeffBeck-NOAA/region…
JeffBeck-NOAA Mar 8, 2022
ca0a8fc
Fix MET/METplus/obs paths in machine files to allow for user-defined …
JeffBeck-NOAA Mar 8, 2022
45b56d9
Only add/modify stochastic physics namelist entries when running with…
JeffBeck-NOAA Mar 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 55 additions & 14 deletions ush/config_defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1505,6 +1505,7 @@ FIXgsm_FILES_TO_COPY_TO_FIXam=( \
"global_zorclim.1x1.grb" \
"global_sfc_emissivity_idx.txt" \
"global_solarconstant_noaa_an.txt" \
"global_albedo4.1x1.grb" \
"geo_em.d01.lat-lon.2.5m.HGT_M.nc" \
"HGT.Beljaars_filtered.lat-lon.30s_res.nc" \
"replace_with_FIXgsm_ozone_prodloss_filename" \
Expand Down Expand Up @@ -1555,6 +1556,7 @@ CYCLEDIR_LINKS_TO_FIXam_FILES_MAPPING=( \
"co2historicaldata_glob.txt | global_co2historicaldata_glob.txt" \
"co2monthlycyc.txt | co2monthlycyc.txt" \
"global_h2oprdlos.f77 | global_h2o_pltc.f77" \
"global_albedo4.1x1.grb | global_albedo4.1x1.grb" \
"global_zorclim.1x1.grb | global_zorclim.1x1.grb" \
"sfc_emissivity_idx.txt | global_sfc_emissivity_idx.txt" \
"solarconstant_noaa_an.txt | global_solarconstant_noaa_an.txt" \
Expand Down Expand Up @@ -1808,27 +1810,63 @@ USE_ZMTNBLCK="FALSE"
#
#-----------------------------------------------------------------------
#
# Set default SPP stochastic physics options.
# Each SPP option is an array, applicable (in order) to the scheme/parameter
# listed in SPP_VAR_LIST. Enter each value of the array in config.sh as
# shown below without commas or single quotes (e.g., SPP_VAR_LIST=
# ( "pbl" "lsm" "mp" ). Both commas and single quotes will be added by
# Jinja when creating the namelist.
# Set default SPP stochastic physics options. Each SPP option is an array,
# applicable (in order) to the scheme/parameter listed in SPP_VAR_LIST.
# Enter each value of the array in config.sh as shown below without commas
# or single quotes (e.g., SPP_VAR_LIST=( "pbl" "sfc" "mp" "rad" "gwd" ).
# Both commas and single quotes will be added by Jinja when creating the
# namelist.
#
# Note that SPP is currently only available for specific physics schemes
# used in the RAP/HRRR physics suite. Users need to be aware of which SDF
# is chosen when turning this option on.
#
# Patterns evolve and are applied at each time step.
#
#-----------------------------------------------------------------------
#
DO_SPP="FALSE"
SPP_VAR_LIST=( "pbl" )
SPP_MAG_LIST=( "0.2" ) #Variable "spp_prt_list" in input.nml
SPP_LSCALE=( "150000.0" )
SPP_TSCALE=( "21600.0" ) #Variable "spp_tau" in input.nml
SPP_SIGTOP1=( "0.1" )
SPP_SIGTOP2=( "0.025" )
SPP_STDDEV_CUTOFF=( "1.5" )
DO_SPP="false"
SPP_VAR_LIST=( "pbl" "sfc" "mp" "rad" "gwd" )
SPP_MAG_LIST=( "0.2" "0.2" "0.75" "0.2" "0.2" ) #Variable "spp_prt_list" in input.nml
SPP_LSCALE=( "150000.0" "150000.0" "150000.0" "150000.0" "150000.0" )
SPP_TSCALE=( "21600.0" "21600.0" "21600.0" "21600.0" "21600.0" ) #Variable "spp_tau" in input.nml
SPP_SIGTOP1=( "0.1" "0.1" "0.1" "0.1" "0.1")
SPP_SIGTOP2=( "0.025" "0.025" "0.025" "0.025" "0.025" )
SPP_STDDEV_CUTOFF=( "1.5" "1.5" "2.5" "1.5" "1.5" )
ISEED_SPP=( "4" "4" "4" "4" "4" )
#
#-----------------------------------------------------------------------
#
# Turn on SPP in Noah or RUC LSM (support for Noah MP is in progress).
# Please be aware of the SDF that you choose if you wish to turn on LSM
# SPP.
#
# SPP in LSM schemes is handled in the &nam_sfcperts namelist block
# instead of in &nam_sppperts, where all other SPP is implemented.
#
# The default perturbation frequency is determined by the fhcyc namelist
# entry. Since that parameter is set to zero in the SRW App, use
# LSM_SPP_EACH_STEP to perturb every time step.
#
# Perturbations to soil moisture content (SMC) are only applied at the
# first time step.
#
# LSM perturbations include SMC - soil moisture content (volume fraction),
# VGF - vegetation fraction, ALB - albedo, SAL - salinity,
# EMI - emissivity, ZOL - surface roughness (cm), and STC - soil temperature.
#
# Only six perturbations at a time can be applied currently, but all seven
# are shown below. In addition, only five unique iseed values are allowed
# at the moment. Therefore, if the iseeds are set to unique values (instead of
# a single value), only five perturbations can be applied.
#
DO_LSM_SPP="false" #If true, sets lndp_type=2
LSM_SPP_TSCALE=( "21600" "21600" "21600" "21600" "21600" "21600" "21600" )
LSM_SPP_LSCALE=( "150000" "150000" "150000" "150000" "150000" "150000" "150000" )
ISEED_LSM_SPP=( "9" "9" "9" "9" "9" "9" "9" )
LSM_SPP_VAR_LIST=( "smc" "vgf" "alb" "sal" "emi" "zol" "stc" )
LSM_SPP_MAG_LIST=( "0.2" "0.001" "0.001" "0.001" "0.001" "0.001" "0.2" )
LSM_SPP_EACH_STEP="true" #Sets lndp_each_step=.true.
#
#-----------------------------------------------------------------------
#
Expand Down Expand Up @@ -1936,3 +1974,6 @@ OMP_STACKSIZE_RUN_FCST="1024m"
KMP_AFFINITY_RUN_POST="scatter"
OMP_NUM_THREADS_RUN_POST="1"
OMP_STACKSIZE_RUN_POST="1024m"
#
#-----------------------------------------------------------------------
#
43 changes: 42 additions & 1 deletion ush/generate_FV3LAM_wflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,12 @@ settings="\
'do_shum': ${DO_SHUM},
'do_sppt': ${DO_SPPT},
'do_skeb': ${DO_SKEB},
'do_spp': ${DO_SPP},
'n_var_spp': ${N_VAR_SPP},
gsketefian marked this conversation as resolved.
Show resolved Hide resolved
'n_var_lndp': ${N_VAR_LNDP},
'lndp_type': ${LNDP_TYPE},
'lndp_each_step': ${LSM_SPP_EACH_STEP},
'fhcyc': ${FHCYC_LSM_SPP_OR_NOT},
}
'nam_stochy': {
'shum': ${SHUM_MAG},
Expand Down Expand Up @@ -841,7 +847,42 @@ done
#
settings="$settings
}"

#
# Add the relevant SPP namelist variables to "settings" when running with
# SPP turned on. Otherwise only include an empty "nam_sppperts" stanza.
#
settings="$settings
'nam_sppperts': {"
if [ "${DO_SPP}" = "TRUE" ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indent settings="$settings" line.

settings="$settings
'iseed_spp': [ $( printf "%s, " "${ISEED_SPP[@]}" ) ],
'spp_lscale': [ $( printf "%s, " "${SPP_LSCALE[@]}" ) ],
'spp_prt_list': [ $( printf "%s, " "${SPP_MAG_LIST[@]}" ) ],
'spp_sigtop1': [ $( printf "%s, " "${SPP_SIGTOP1[@]}" ) ],
'spp_sigtop2': [ $( printf "%s, " "${SPP_SIGTOP2[@]}" ) ],
'spp_stddev_cutoff': [ $( printf "%s, " "${SPP_STDDEV_CUTOFF[@]}" ) ],
'spp_tau': [ $( printf "%s, " "${SPP_TSCALE[@]}" ) ],
'spp_var_list': [ $( printf "%s, " "${SPP_VAR_LIST[@]}" ) ],"
fi
settings="$settings
}"
#
# Add the relevant LSM SPP namelist variables to "settings" when running with
# LSM SPP turned on.
#
settings="$settings
'nam_sfcperts': {"
if [ "${DO_LSM_SPP}" = "TRUE" ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indent settings="$settings" line.

settings="$settings
'lndp_type': ${LNDP_TYPE},
'lndp_tau': [ $( printf "%s, " "${LSM_SPP_TSCALE[@]}" ) ],
'lndp_lscale': [ $( printf "%s, " "${LSM_SPP_LSCALE[@]}" ) ],
'iseed_lndp': [ $( printf "%s, " "${ISEED_LSM_SPP[@]}" ) ],
'lndp_var_list': [ $( printf "%s, " "${LSM_SPP_VAR_LIST[@]}" ) ],
'lndp_prt_list': [ $( printf "%s, " "${LSM_SPP_MAG_LIST[@]}" ) ],"
fi
settings="$settings
}"
print_info_msg $VERBOSE "
The variable \"settings\" specifying values of the weather model's
namelist variables has been set as follows:
Expand Down
21 changes: 18 additions & 3 deletions ush/set_FV3nml_stoch_params.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ function set_FV3nml_stoch_params() {
iseed_skeb \
iseed_sppt \
iseed_spp \
iseed_lsm_spp \
num_iseed_spp \
num_iseed_lsm_spp \
settings
#
#-----------------------------------------------------------------------
Expand All @@ -98,16 +101,28 @@ function set_FV3nml_stoch_params() {
iseed_shum=$(( cdate*1000 + ensmem_num*10 + 2 ))
iseed_skeb=$(( cdate*1000 + ensmem_num*10 + 3 ))
iseed_sppt=$(( cdate*1000 + ensmem_num*10 + 1 ))
iseed_spp=$(( cdate*1000 + ensmem_num*10 + 4 ))

num_iseed_spp=${#ISEED_SPP[@]}
for (( i=0; i<${num_iseed_spp}; i++ )); do
iseed_spp[$i]=$(( cdate*1000 + ensmem_num*10 + ${ISEED_SPP[$i]} ))
done

num_iseed_lsm_spp=${#ISEED_LSM_SPP[@]}
for (( i=0; i<${num_iseed_lsm_spp}; i++ )); do
iseed_lsm_spp[$i]=$(( cdate*1000 + ensmem_num*10 + ${ISEED_LSM_SPP[$i]} ))
done

settings="\
'nam_stochy': {
'iseed_shum': ${iseed_shum},
'iseed_skeb': ${iseed_skeb},
'iseed_sppt': ${iseed_sppt},
}
'nam_spperts': {
'iseed_spp': ${iseed_spp},
'nam_sppperts': {
'iseed_spp': [ $( printf "%s, " "${iseed_spp[@]}" ) ]
}
'nam_sfcperts': {
'iseed_lndp': [ $( printf "%s, " "${iseed_lsm_spp[@]}" ) ]
}"

$USHDIR/set_namelist.py -q \
Expand Down
68 changes: 68 additions & 0 deletions ush/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ DO_SKEB=$(boolify $DO_SKEB)

check_var_valid_value "DO_SPP" "valid_vals_DO_SPP"
DO_SPP=$(boolify $DO_SPP)

check_var_valid_value "DO_LSM_SPP" "valid_vals_DO_LSM_SPP"
DO_LSM_SPP=$(boolify $DO_LSM_SPP)
#
#-----------------------------------------------------------------------
#
Expand Down Expand Up @@ -239,6 +242,71 @@ fi
#
#-----------------------------------------------------------------------
#
# If running with LSM SPP, count the number of entries in LSM_SPP_VAR_LIST
# to correctly set N_VAR_LNDP, otherwise set it to zero. Also set
# LNDP_TYPE to 2 for LSM SPP, otherwise set it to zero. Finally, initialize
# an "FHCYC_LSM_SPP" variable to 0 and set it to 999 if LSM SPP is turned
# on. This requirement is necessary since LSM SPP cannot run with
# FHCYC=0 at the moment, but FHCYC cannot be set to anything less than the
# length of the forecast either. A bug fix will be issued ufs-weather-model
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issued "in" ufs-weather-model

# soon, at which point, this requirement can be removed from regional_workflow.
#
#-----------------------------------------------------------------------
#
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the variables N_VAR_LNDP, LNDP_TYPE, and FHCYC_LSM_SPP_OR_NOT are used in at least one other script (generate_FV3LAM_wflow.sh), they are not local variables. So we should treat them as experiment variables and record them in var_defns.sh (at the end of setup.sh).

N_VAR_LNDP=0
LNDP_TYPE=0
FHCYC_LSM_SPP_OR_NOT=0
if [ "${DO_LSM_SPP}" = "TRUE" ]; then
N_VAR_LNDP=${#LSM_SPP_VAR_LIST[@]}
LNDP_TYPE=2
FHCYC_LSM_SPP_OR_NOT=999
fi
#
#-----------------------------------------------------------------------
#
# If running with SPP, confirm that each SPP-related namelist value
# contains the same number of entries as N_VAR_SPP (set above to be equal
# to the number of entries in SPP_VAR_LIST).
#
#-----------------------------------------------------------------------
#
if [ "${DO_SPP}" = "TRUE" ]; then
if [ "${#SPP_MAG_LIST[@]}" != "${N_VAR_SPP}" ] || \
[ "${#SPP_LSCALE[@]}" != "${N_VAR_SPP}" ] || \
[ "${#SPP_TSCALE[@]}" != "${N_VAR_SPP}" ] || \
[ "${#SPP_SIGTOP1[@]}" != "${N_VAR_SPP}" ] || \
[ "${#SPP_SIGTOP2[@]}" != "${N_VAR_SPP}" ] || \
[ "${#SPP_STDDEV_CUTOFF[@]}" != "${N_VAR_SPP}" ] || \
[ "${#ISEED_SPP[@]}" != "${N_VAR_SPP}" ]; then
print_err_msg_exit "\
All SPP-related namelist variables set in config.sh must be equal in number
of entries to what is found in SPP_VAR_LIST:
Number of entries in SPP_VAR_LIST = \"${#SPP_VAR_LIST[@]}\""
fi
fi
#
#-----------------------------------------------------------------------
#
# If running with LSM SPP, confirm that each LSM SPP-related namelist
# value contains the same number of entries as N_VAR_LNDP (set above to
# be equal to the number of entries in LSM_SPP_VAR_LIST).
#
#-----------------------------------------------------------------------
#
if [ "${DO_LSM_SPP}" = "TRUE" ]; then
if [ "${#LSM_SPP_MAG_LIST[@]}" != "${N_VAR_LNDP}" ] || \
[ "${#LSM_SPP_LSCALE[@]}" != "${N_VAR_LNDP}" ] || \
[ "${#LSM_SPP_TSCALE[@]}" != "${N_VAR_LNDP}" ] || \
[ "${#ISEED_LSM_SPP[@]}" != "${N_VAR_LNDP}" ]; then
print_err_msg_exit "\
All SPP-related namelist variables set in config.sh must be equal in number
of entries to what is found in SPP_VAR_LIST:
Number of entries in SPP_VAR_LIST = \"${#SPP_VAR_LIST[@]}\""
fi
fi
#
#-----------------------------------------------------------------------
#
check_var_valid_value "SUB_HOURLY_POST" "valid_vals_SUB_HOURLY_POST"
SUB_HOURLY_POST=$(boolify $SUB_HOURLY_POST)
#
Expand Down
1 change: 0 additions & 1 deletion ush/templates/diag_table.FV3_CPT_v0
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
Copy link
Collaborator Author

@JeffBeck-NOAA JeffBeck-NOAA Mar 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove tendency-based stochastic physics dissipation estimate (diss_est) from diag_table files. It doesn't exist (yet).

#=============================================================================================
#
Expand Down
1 change: 0 additions & 1 deletion ush/templates/diag_table.FV3_GFS_2017_gfdlmp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
#=============================================================================================
#
Expand Down
1 change: 0 additions & 1 deletion ush/templates/diag_table.FV3_GFS_v15p2
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
Expand Down
1 change: 0 additions & 1 deletion ush/templates/diag_table.FV3_GFS_v16
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
Expand Down
6 changes: 5 additions & 1 deletion ush/templates/diag_table.FV3_HRRR
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,12 @@
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_pbl", "spp_wts_pbl", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_sfc", "spp_wts_sfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_mp", "spp_wts_mp", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_rad", "spp_wts_rad", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_gwd", "spp_wts_gwd", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
8 changes: 8 additions & 0 deletions ush/templates/diag_table.FV3_RRFS_v1alpha
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,14 @@
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_pbl", "spp_wts_pbl", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_mp", "spp_wts_mp", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_rad", "spp_wts_rad", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
9 changes: 9 additions & 0 deletions ush/templates/diag_table.FV3_RRFS_v1beta
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,15 @@
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_pbl", "spp_wts_pbl", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_sfc", "spp_wts_sfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_mp", "spp_wts_mp", "fv3_history", "all", .false., "none", 2
"gfs_phys", "spp_wts_rad", "spp_wts_rad", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/field_table.FV3_HRRR
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"TRACER", "atmos_mod", "water_nc"
"longname", "cloud liquid water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=1.e30" /
"profile_type", "fixed", "surface_value=0.0" /
# prognostic cloud ice number concentration
"TRACER", "atmos_mod", "ice_nc"
"longname", "cloud ice water number concentration"
Expand Down
Loading