initial attempt to generalize processing of variational bias correcti…

…on files using jedi class (NOAA-EMC#2862)
RussTreadon-NOAA · Sep 10, 2024 · 666d7d6 · 666d7d6
1 parent 73e56a7
commit 666d7d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ush/python/pygfs/jedi/jedi.py b/ush/python/pygfs/jedi/jedi.py
@@ -191,7 +191,7 @@ def get_obs_dict(self, task_config: AttrDict) -> Dict[str, Any]:
         return obs_dict
 
     @logit(logger)
-    def get_bias(self, task_config: AttrDict) -> Dict[str, Any]:
+    def get_bias(self, task_config: AttrDict, bias_file) -> Dict[str, Any]:
         """Compile a dictionary of observation files to copy
 
         This method stages radiance bias correction files in the obs sub-diretory of the run directory
@@ -215,9 +215,9 @@ def get_bias(self, task_config: AttrDict) -> Dict[str, Any]:
                 obdir = os.path.dirname(obfile)
                 basename = os.path.basename(obfile)
                 prefix = '.'.join(basename.split('.')[:-3])
-                bfile = f"{prefix}.rad_varbc_params.tar"
+                bfile = f"{prefix}.{bias_file}"
                 radtar = os.path.join(obdir, bfile)
-                copylist.append([os.path.join(task_config.COM_ATMOS_ANALYSIS_PREV, bfile), radtar])
+                copylist.append([os.path.join(task_config.VarBcDir, bfile), radtar])
                 break
 
         bias_dict = {

diff --git a/ush/python/pygfs/task/atm_analysis.py b/ush/python/pygfs/task/atm_analysis.py
@@ -66,7 +66,8 @@ def __init__(self, config: Dict[str, Any], yaml_name: Optional[str] = None):
                 'GPREFIX': f"gdas.t{self.task_config.previous_cycle.hour:02d}z.",
                 'atm_obsdatain_path': f"{self.task_config.DATA}/obs/",
                 'atm_obsdataout_path': f"{self.task_config.DATA}/diags/",
-                'BKG_TSTEP': "PT1H"  # Placeholder for 4D applications
+                'BKG_TSTEP': "PT1H",  # Placeholder for 4D applications
+                'VarBcDir': f"{self.task_config.COM_ATMOS_ANALYSIS_PREV}",
             }
         )
 
@@ -139,7 +140,8 @@ def initialize_analysis(self) -> None:
 
         # stage bias corrections
         logger.info(f"Staging list of bias correction files generated from JEDI config")
-        self.jedi.get_bias(self.task_config)
+        bias_file = f"rad_varbc_params.tar"
+        self.jedi.get_bias(self.task_config, bias_file)
 
         # stage CRTM fix files
         logger.info(f"Staging CRTM fix files from {self.task_config.CRTM_FIX_YAML}")

diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py
@@ -66,7 +66,8 @@ def __init__(self, config: Dict[str, Any], yaml_name: Optional[str] = None):
                 'GPREFIX': f"gdas.t{self.task_config.previous_cycle.hour:02d}z.",
                 'atm_obsdatain_path': f"./obs/",
                 'atm_obsdataout_path': f"./diags/",
-                'BKG_TSTEP': "PT1H"  # Placeholder for 4D applications
+                'BKG_TSTEP': "PT1H",  # Placeholder for 4D applications
+                'VarBcDir': f"{self.task_config.COM_ATMOS_ANALYSIS_PREV}",
             }
         )
 
@@ -138,7 +139,8 @@ def initialize_analysis(self) -> None:
 
         # stage bias corrections
         logger.info(f"Staging list of bias correction files generated from JEDI config")
-        self.jedi.get_bias(self.task_config)
+        bias_file = f"rad_varbc_params.tar"
+        self.jedi.get_bias(self.task_config, bias_file)
 
         # stage CRTM fix files
         logger.info(f"Staging CRTM fix files from {self.task_config.CRTM_FIX_YAML}")