From ed29d27e0612c839159a4d089ef0f8f0ac854c72 Mon Sep 17 00:00:00 2001 From: Eric Kemp Date: Fri, 19 Nov 2021 16:23:54 -0500 Subject: [PATCH 1/3] Fixed typo reported by Kristi Arsenault. --- lvt/utils/usaf/s2spost/run_s2spost_9months.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lvt/utils/usaf/s2spost/run_s2spost_9months.py b/lvt/utils/usaf/s2spost/run_s2spost_9months.py index 081920d43..c7243c0ab 100755 --- a/lvt/utils/usaf/s2spost/run_s2spost_9months.py +++ b/lvt/utils/usaf/s2spost/run_s2spost_9months.py @@ -11,6 +11,7 @@ # 24 Sep 2021: Eric Kemp (SSAI), first version. # 27 Oct 2021: Eric Kemp/SSAI, address pylint string objections. # 29 Oct 2021: Eric Kemp/SSAI, add config file. +# 19 Nov 2021: Eric Kemp/SSAI, fixed typo reported by Kristi Arsenault. # #------------------------------------------------------------------------------ """ @@ -118,7 +119,7 @@ def _submit_batch_jobs(config, configfile, topdatadir, curdate = startdate for _ in range(0, total_months): txt = "[INFO] Submitting batch job for" - txt += f" cf_{model_forcing}_{curdate.year:04d}{curdate.month:04d}" + txt += f" cf_{model_forcing}_{curdate.year:04d}{curdate.month:02d}" print(txt) cmd = f"sbatch {scriptdir}/run_s2spost_1month.sh" cmd += f" {configfile} {scriptdir} {topdatadir}" From 15756c80d6c2eb95dff959322dd27a673a628473 Mon Sep 17 00:00:00 2001 From: Eric Kemp Date: Fri, 19 Nov 2021 16:25:31 -0500 Subject: [PATCH 2/3] Fixed number of ensemble members for GFDL. --- .../usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py b/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py index 547aec09e..db3a86456 100755 --- a/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py +++ b/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py @@ -16,6 +16,7 @@ # * 14 Oct 2021: Eric Kemp/SSAI, first version. # * 01 Nov 2021: Eric Kemp/SSAI, addressed pylint format complaints. # * 15 Nov 2021: K. Arsenault/SAIC, made minor fixes and added config entries. +# * 19 Nov 2021: Eric Kemp/SSAI, fixed typo reported by K. Arsenault. # #------------------------------------------------------------------------------ """ @@ -44,7 +45,7 @@ "GNEMO" : 10, "GEOSv2" : 10, "CFSv2" : 24, - "GFDL" : 30, + "GFDL" : 15, } # Options for scaling to 0.25 deg From 6df611e98bf2bb4ac12e07c02cf62effe4273339 Mon Sep 17 00:00:00 2001 From: Eric Kemp Date: Fri, 19 Nov 2021 16:28:06 -0500 Subject: [PATCH 3/3] Fixed typo reported by Ryan Zamora. --- .../usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py b/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py index db3a86456..b4db8683e 100755 --- a/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py +++ b/ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py @@ -16,7 +16,8 @@ # * 14 Oct 2021: Eric Kemp/SSAI, first version. # * 01 Nov 2021: Eric Kemp/SSAI, addressed pylint format complaints. # * 15 Nov 2021: K. Arsenault/SAIC, made minor fixes and added config entries. -# * 19 Nov 2021: Eric Kemp/SSAI, fixed typo reported by K. Arsenault. +# * 19 Nov 2021: Eric Kemp/SSAI, fixed typos reported by K. Arsenault and +# R. Zamora. # #------------------------------------------------------------------------------ """ @@ -124,7 +125,7 @@ def _customize_ldt_config(ldtconfig_lsm_target, lsm_rstdir, currentdate, rst_monname = currentdate.strftime("%b") output_fname = f"{nmme_model}/LIS_RST_NOAHMP401_{rst_date}2345.ICS_" + \ - f"{prevdate.year:04d}.ens{num_ensmems:d}.nc" + f"{rst_monname}{prevdate.year:04d}.ens{num_ensmems:d}.nc" lsm_logfile = \ f"{nmme_model}/ldtlog_{_LSM_NAME}_{rst_monname}{prevdate.year:04d}"