Skip to content

Ensemble mode bug fix #266

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.

Sign up for GitHub

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

Merged
JeffBeck-NOAA merged 12 commits into from
Aug 21, 2020
Merged

Ensemble mode bug fix #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5deb7a8
Remove all references to /lfs3 on Jet
JeffBeck-NOAA Jun 10, 2020
43722f8
Add Ben and Ratko to the CODEOWNERS file
JeffBeck-NOAA Jun 10, 2020
90977b0
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jun 11, 2020
6f3e294
Replace hard-coded make_orog module file with build-level module file…
JeffBeck-NOAA Jun 11, 2020
bf87e02
Remove hard-coded make_sfc_climo module file
JeffBeck-NOAA Jun 11, 2020
16192ec
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jun 17, 2020
b6c8ae8
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Jun 19, 2020
6fff10e
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
JeffBeck-NOAA Aug 15, 2020
199698e
Make sure DO_ENSEMBLE is set correctly to either "TRUE" or "FALSE"
JeffBeck-NOAA Aug 15, 2020
279ac43
Remove !!python/none entries for all "nam_sfcperts" and "nam_stochy" …
JeffBeck-NOAA Aug 15, 2020
6433760
Remove echo statements used for testing.
JeffBeck-NOAA Aug 15, 2020
ad97375
Add # to line
JeffBeck-NOAA Aug 15, 2020
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
15 changes: 13 additions & 2 deletions ush/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,11 +1225,22 @@ NEMS_CONFIG_FP="${EXPTDIR}/${NEMS_CONFIG_FN}"
#-----------------------------------------------------------------------
#
check_var_valid_value "DO_ENSEMBLE" "valid_vals_DO_ENSEMBLE"

#
# Set DO_ENSEMBLE to either "TRUE" or "FALSE" so we don't have to consider
# other valid values later on.
#
DO_ENSEMBLE=${DO_ENSEMBLE^^}
if [ "$DO_ENSEMBLE" = "TRUE" ] || \
[ "$DO_ENSEMBLE" = "YES" ]; then
DO_ENSEMBLE="TRUE"
elif [ "$DO_ENSEMBLE" = "FALSE" ] || \
[ "$DO_ENSEMBLE" = "NO" ]; then
DO_ENSEMBLE="FALSE"
fi
NDIGITS_ENSMEM_NAMES="0"
ENSMEM_NAMES=("")
FV3_NML_ENSMEM_FPS=("")
if [ "${DO_ENSEMBLE}" = TRUE ]; then
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
NDIGITS_ENSMEM_NAMES="${#NUM_ENS_MEMBERS}"
# Strip away all leading zeros in NUM_ENS_MEMBERS by converting it to a
# decimal (leading zeros will cause bash to interpret the number as an
Expand Down
10 changes: 0 additions & 10 deletions ush/templates/FV3.input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ FV3_GFS_2017_gfdlmp:
satmedmf: !!python/none
shal_cnv: False
ttendlim: !!python/none
nam_sfcperts: !!python/none
nam_stochy: !!python/none
gfdl_cloud_microphysics_nml: &gfs_gfdl_cloud_mp
c_cracw: 0.8
c_paut: 0.5
Expand Down Expand Up @@ -177,8 +175,6 @@ FV3_GFS_2017_gfdlmp_regional:
satmedmf: False
gfdl_cloud_microphysics_nml:
<<: *gfs_gfdl_cloud_mp
nam_sfcperts: !!python/none
nam_stochy: !!python/none

FV3_GFS_v15p2:
atmos_model_nml:
Expand Down Expand Up @@ -263,8 +259,6 @@ FV3_GFS_v15p2:
xkzm_h: 1.0
xkzm_m: 1.0
xkzminv: 0.3
nam_sfcperts: !!python/none
nam_stochy: !!python/none
namsfc:
landice: True
ldebug: False
Expand Down Expand Up @@ -327,8 +321,6 @@ FV3_GFS_v16beta:
lgfdlmprad: True
lheatstrg: True
lsoil: 4
nam_sfcperts: !!python/none
nam_stochy: !!python/none
nstf_name: [2, 1, 0, 0, 0]
prautco: [0.00015, 0.00015]
psautco: [0.0008, 0.0005]
Expand All @@ -344,8 +336,6 @@ FV3_GFS_v16beta:
namsfc:
landice: True
ldebug: False
nam_sfcperts: !!python/none
nam_stochy: !!python/none
surf_map_nml: !!python/none

FV3_CPT_v0:
Expand Down