diff --git a/parm/parm_gdas/aero_crtm_coeff.yaml b/parm/gdas/aero_crtm_coeff.yaml similarity index 100% rename from parm/parm_gdas/aero_crtm_coeff.yaml rename to parm/gdas/aero_crtm_coeff.yaml diff --git a/parm/parm_gdas/aero_jedi_fix.yaml b/parm/gdas/aero_jedi_fix.yaml similarity index 100% rename from parm/parm_gdas/aero_jedi_fix.yaml rename to parm/gdas/aero_jedi_fix.yaml diff --git a/parm/parm_gdas/aeroanl_inc_vars.yaml b/parm/gdas/aeroanl_inc_vars.yaml similarity index 100% rename from parm/parm_gdas/aeroanl_inc_vars.yaml rename to parm/gdas/aeroanl_inc_vars.yaml diff --git a/parm/parm_gdas/atm_crtm_coeff.yaml b/parm/gdas/atm_crtm_coeff.yaml similarity index 100% rename from parm/parm_gdas/atm_crtm_coeff.yaml rename to parm/gdas/atm_crtm_coeff.yaml diff --git a/parm/parm_gdas/atm_jedi_fix.yaml b/parm/gdas/atm_jedi_fix.yaml similarity index 100% rename from parm/parm_gdas/atm_jedi_fix.yaml rename to parm/gdas/atm_jedi_fix.yaml diff --git a/parm/parm_gdas/atmanl_inc_vars.yaml b/parm/gdas/atmanl_inc_vars.yaml similarity index 100% rename from parm/parm_gdas/atmanl_inc_vars.yaml rename to parm/gdas/atmanl_inc_vars.yaml diff --git a/parm/parm_gdas/land_jedi_fix.yaml b/parm/gdas/land_jedi_fix.yaml similarity index 100% rename from parm/parm_gdas/land_jedi_fix.yaml rename to parm/gdas/land_jedi_fix.yaml diff --git a/ush/python/pygfs/task/aero_analysis.py b/ush/python/pygfs/task/aero_analysis.py index c1afef98f6..e2af703236 100644 --- a/ush/python/pygfs/task/aero_analysis.py +++ b/ush/python/pygfs/task/aero_analysis.py @@ -72,13 +72,13 @@ def initialize(self: Analysis) -> None: super().initialize() # stage CRTM fix files - crtm_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'parm_gdas', 'aero_crtm_coeff.yaml') + crtm_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'gdas', 'aero_crtm_coeff.yaml') logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}") crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config) FileHandler(crtm_fix_list).sync() # stage fix files - jedi_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'parm_gdas', 'aero_jedi_fix.yaml') + jedi_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'gdas', 'aero_jedi_fix.yaml') logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}") jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config) FileHandler(jedi_fix_list).sync() @@ -208,7 +208,7 @@ def _add_fms_cube_sphere_increments(self: Analysis) -> None: inc_template = os.path.join(self.task_config.DATA, 'anl', 'aeroinc.' + template) bkg_template = os.path.join(self.task_config.COM_ATMOS_RESTART_PREV, template) # get list of increment vars - incvars_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'parm_gdas', 'aeroanl_inc_vars.yaml') + incvars_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'gdas', 'aeroanl_inc_vars.yaml') incvars = YAMLFile(path=incvars_list_path)['incvars'] super().add_fv3_increments(inc_template, bkg_template, incvars) diff --git a/ush/python/pygfs/task/atm_analysis.py b/ush/python/pygfs/task/atm_analysis.py index 6a24a5c0a9..22d6d2f8c6 100644 --- a/ush/python/pygfs/task/atm_analysis.py +++ b/ush/python/pygfs/task/atm_analysis.py @@ -71,13 +71,13 @@ def initialize(self: Analysis) -> None: super().initialize() # stage CRTM fix files - crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'parm_gdas', 'atm_crtm_coeff.yaml') + crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_crtm_coeff.yaml') logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}") crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config) FileHandler(crtm_fix_list).sync() # stage fix files - jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'parm_gdas', 'atm_jedi_fix.yaml') + jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_jedi_fix.yaml') logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}") jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config) FileHandler(jedi_fix_list).sync() diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py index bfddf30d47..1399c76469 100644 --- a/ush/python/pygfs/task/atmens_analysis.py +++ b/ush/python/pygfs/task/atmens_analysis.py @@ -96,13 +96,13 @@ def initialize(self: Analysis) -> None: FileHandler({'mkdir': dirlist}).sync() # stage CRTM fix files - crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'parm_gdas', 'atm_crtm_coeff.yaml') + crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_crtm_coeff.yaml') logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}") crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config) FileHandler(crtm_fix_list).sync() # stage fix files - jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'parm_gdas', 'atm_jedi_fix.yaml') + jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_jedi_fix.yaml') logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}") jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config) FileHandler(jedi_fix_list).sync() diff --git a/ush/python/pygfs/task/land_analysis.py b/ush/python/pygfs/task/land_analysis.py index e6a7d57b64..0ac5c19a8d 100644 --- a/ush/python/pygfs/task/land_analysis.py +++ b/ush/python/pygfs/task/land_analysis.py @@ -258,7 +258,7 @@ def initialize(self) -> None: FileHandler({'mkdir': dirlist}).sync() # stage fix files - jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'parm_gdas', 'land_jedi_fix.yaml') + jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'land_jedi_fix.yaml') logger.info(f"Staging JEDI fix files from {jedi_fix_list_path}") jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config) FileHandler(jedi_fix_list).sync()