Merge pull request #935 from emkemp/fix/py39_patch

Fix several typos in S2S Python scripts.

ldt/utils/usaf/s2s_ensrst/generate_ldtconfig_files_ensrst_nrt.py

@@ -16,6 +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 typos reported by K. Arsenault and
+#                R. Zamora.
 #
 #------------------------------------------------------------------------------
 """
@@ -44,7 +46,7 @@
     "GNEMO" : 10,
     "GEOSv2" : 10,
     "CFSv2" : 24,
-    "GFDL" : 30,
+    "GFDL" : 15,
 }
 
 # Options for scaling to 0.25 deg
@@ -123,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}"
 

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}"