From 666d7d6d89c8c17ef9627367a3efdb76454d07f7 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Tue, 10 Sep 2024 15:03:43 +0000 Subject: [PATCH] initial attempt to generalize processing of variational bias correction files using jedi class (#2862) --- ush/python/pygfs/jedi/jedi.py | 6 +++--- ush/python/pygfs/task/atm_analysis.py | 6 ++++-- ush/python/pygfs/task/atmens_analysis.py | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ush/python/pygfs/jedi/jedi.py b/ush/python/pygfs/jedi/jedi.py index 4e527460ab..2b899df4e3 100644 --- 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 index c1a6558ade..454d557e87 100644 --- 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 index 1f3a065133..01fc4faac0 100644 --- 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}")