Merge branch 'develop' into feature/radbcor

.github/ISSUE_TEMPLATE/dump_request.yml

@@ -0,0 +1,37 @@
+name: Global Observation Dump Request
+description: Request additional dates be added to a machine's global dump archive (GDA) or introduce experimental dump data to the GDA
+labels: ["Static Data Mgmt"]
+assignees:
+  - KateFriedman-NOAA
+  - WalterKolczynski-NOAA
+
+body:
+  - type: dropdown
+    attributes:
+      label: Machine
+      options:
+        - WCOSS2
+        - Hera/Ursa
+        - Orion/Hercules
+        - Jet
+      multiple: true
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Start date
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: End date
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      placeholder: |
+        Any additional information needed (experimental obs, etc.)

parm/archive/enkf.yaml.j2

@@ -27,7 +27,7 @@ enkf:
            {% else %}
               {% set steps = ["eobs", "eupd"] %}
               {% for mem in range(1, nmem_ens + 1) %}
-                 {% do steps.append("eomg_mem{{ '%03d' % mem }}") %}
+                 {% do steps.append("eomg_mem" ~ '%03d' % mem) %}
               {% endfor %}
            {% endif %}
         {% endif %}

parm/config/gfs/config.resources

@@ -988,8 +988,8 @@ case ${step} in
     threads_per_task=1
     walltime_gdas="03:00:00"
     walltime_gfs="06:00:00"
-    ntasks=1
-    tasks_per_node=1
+    ntasks=4
+    tasks_per_node=4
     export memory="80G"
     ;;
 

workflow/rocoto/gfs_tasks.py

@@ -855,8 +855,8 @@ def fcst(self):
         try:
             task = fcst_map[self.app_config.mode]()
         except KeyError:
-            raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n' +
-                                      'Currently supported forecast types are:\n' +
+            raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n'
+                                      f'Currently supported forecast types are:\n'
                                       f'{" | ".join(fcst_map.keys())}')
 
         return task
@@ -2330,6 +2330,10 @@ def cleanup(self):
                     dep_dict = {'type': 'task', 'name': f'{self.run}npoess_pgrb2_0p5deg'}
                     deps.append(rocoto.add_dependency(dep_dict))
 
+        if self.app_config.do_metp and self.run in ['gfs']:
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}metp'}
+            deps.append(rocoto.add_dependency(dep_dict))
+
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('cleanup')