generalize lgetkf observer and solver configuration, save observer an…

…d solver yamls (NOAA-EMC#2415)
RussTreadon-NOAA · Aug 19, 2024 · dd05d39 · dd05d39
1 parent 252a9db
commit dd05d39
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/parm/config/gfs/config.atmensanlobs b/parm/config/gfs/config.atmensanlobs
@@ -8,6 +8,6 @@ echo "BEGIN: config.atmensanlobs"
 # Get task specific resources
 . "${EXPDIR}/config.resources" atmensanlobs
 
-export JCB_ALGO_YAML=${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_observer.yaml.j2
+export JCB_ALGO_YAML=@JCB_ALGO_YAML@
 
 echo "END: config.atmensanlobs"
diff --git a/parm/config/gfs/config.atmensanlsol b/parm/config/gfs/config.atmensanlsol
@@ -8,6 +8,6 @@ echo "BEGIN: config.atmensanlsol"
 # Get task specific resources
 . "${EXPDIR}/config.resources" atmensanlsol
 
-export JCB_ALGO_YAML=${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_solver.yaml.j2
+export JCB_ALGO_YAML=@JCB_ALGO_YAML@
 
 echo "END: config.atmensanlsol"
diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -37,6 +37,12 @@ atmensanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
 
+atmensanlobs:
+  JCB_ALGO_YAML: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_observer.yaml.j2"
+
+atmensanlsol:
+  JCB_ALGO_YAML: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_solver.yaml.j2"
+
 aeroanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1

diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py
@@ -310,16 +310,18 @@ def finalize(self: Analysis) -> None:
                 diaggzip = f"{diagfile}.gz"
                 archive.add(diaggzip, arcname=os.path.basename(diaggzip))
 
+        # get list of yamls to cop to ROTDIR
+        yamls = glob.glob(os.path.join(self.task_config.DATA, '*atmens*yaml'))
+
         # copy full YAML from executable to ROTDIR
-        logger.info(f"Copying {self.task_config.jedi_yaml} to {self.task_config.COM_ATMOS_ANALYSIS_ENS}")
-        src = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmens.yaml")
-        dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmens.yaml")
-        logger.debug(f"Copying {src} to {dest}")
-        yaml_copy = {
-            'mkdir': [self.task_config.COM_ATMOS_ANALYSIS_ENS],
-            'copy': [[src, dest]]
-        }
-        FileHandler(yaml_copy).sync()
+        for src in yamls:
+            logger.info(f"Copying {src} to {self.task_config.COM_ATMOS_ANALYSIS_ENS}")
+            dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, os.path.basename(src))
+            logger.debug(f"Copying {src} to {dest}")
+            yaml_copy = {
+                'copy': [[src, dest]]
+            }
+            FileHandler(yaml_copy).sync()
 
         # create template dictionaries
         template_inc = self.task_config.COM_ATMOS_ANALYSIS_TMPL