end of day commit

CoryMartin-NOAA · Nov 15, 2024 · 4002bf1 · 4002bf1
1 parent 0c2e80a
commit 4002bf1
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 6 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -121,6 +121,8 @@ elif [[ "${step}" = "snowanl" ]]; then
 
 elif [[ "${step}" = "esnowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
 

diff --git a/env/HERCULES.env b/env/HERCULES.env
@@ -120,6 +120,8 @@ case ${step} in
  ;;
  "esnowanl")
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
 

diff --git a/env/JET.env b/env/JET.env
@@ -104,6 +104,8 @@ elif [[ "${step}" = "snowanl" ]]; then
 
 elif [[ "${step}" = "esnowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -111,6 +111,8 @@ elif [[ "${step}" = "snowanl" ]]; then
 
 elif [[ "${step}" = "esnowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
 

diff --git a/env/S4.env b/env/S4.env
@@ -104,6 +104,8 @@ elif [[ "${step}" = "snowanl" ]]; then
 
 elif [[ "${step}" = "esnowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -97,6 +97,8 @@ elif [[ "${step}" = "snowanl" ]]; then
 
 elif [[ "${step}" = "esnowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_ESNOWANL=${NTHREADSmax}
     export APRUN_ESNOWANL="${APRUN_default}"
 

diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2
@@ -75,7 +75,7 @@ gdas:
         - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aerorawobs"
             {% endif %}
             {% if DO_JEDISNOWDA %}
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat"
             {% endif %}
 
         # Ozone verification

diff --git a/parm/archive/gfs_arcdir.yaml.j2 b/parm/archive/gfs_arcdir.yaml.j2
@@ -46,8 +46,8 @@
     {% endif %}
 
     {% if DO_JEDISNOWDA == True %}
-        {% do det_anl_files.append([COMIN_SNOW_ANALYSIS ~ "/" ~ head ~ "snowstat.tgz",
-                                    ARCDIR ~ "/snowstat." ~ RUN ~ "." ~ cycle_YMDH ~ ".tgz"]) %}
+        {% do det_anl_files.append([COMIN_SNOW_ANALYSIS ~ "/" ~ head ~ "snowstat",
+                                    ARCDIR ~ "/snowstat." ~ RUN ~ "." ~ cycle_YMDH ]) %}
     {% endif %}
 
     {% if AERO_ANL_RUN == RUN or AERO_ANL_RUN == "both" %}

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py
@@ -189,7 +189,7 @@ def prepare_IMS(self) -> None:
 
         # create a temporary dict of all keys needed in this method
         localconf = AttrDict()
-        keys = ['DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
+        keys = ['DATA', 'current_cycle', 'COMIN_OBS',
                 'OPREFIX', 'CASE', 'OCNRES', 'ntiles', 'FIXgfs']
         for key in keys:
             localconf[key] = self.task_config[key]
@@ -199,7 +199,7 @@ def prepare_IMS(self) -> None:
         prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf)
         logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}")
 
-        # copy the IMS obs files from COM_OBS to DATA/obs
+        # copy the IMS obs files from COMIN_OBS to DATA/obs
         logger.info("Copying IMS obs for CALCFIMSEXE")
         FileHandler(prep_ims_config.calcfims).sync()