From c7d22e3e8b8af379e8734ce79ec2d8762c73305f Mon Sep 17 00:00:00 2001 From: JianpingHuang-NOAA <54634403+JianpingHuang-NOAA@users.noreply.github.com> Date: Tue, 31 Oct 2023 10:35:24 -0400 Subject: [PATCH] [production/AQM.v7] update workflow for AQMv7 implementation (#958) * update setup.sh to use static fix dir * change setup.py back to use statis fix files --- ush/setup.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ush/setup.py b/ush/setup.py index fdcce9a9b1..74ff713ec0 100644 --- a/ush/setup.py +++ b/ush/setup.py @@ -1127,13 +1127,6 @@ def get_location(xcs, fmt, expt_cfg): RUN_TASK_VX_ENSPOINT = \"{run_task_vx_enspoint}\"''' ) - # Temporary solution to link fix directory for AQM.v7 - homeaqm = expt_config.get("user", {}).get("HOMEaqm") - homeaqm_fix = os.path.join(homeaqm,"fix") - print(homeaqm_fix) - if os.path.islink(homeaqm_fix) or os.path.exists(homeaqm_fix): - rm_vrfy("-rf", homeaqm_fix) - # # ----------------------------------------------------------------------- # NOTE: currently this is executed no matter what, should it be dependent on the logic described below?? @@ -1143,9 +1136,6 @@ def get_location(xcs, fmt, expt_cfg): # # ----------------------------------------------------------------------- # - fixlam = workflow_config["FIXlam"] - mkdir_vrfy(f' -p "{fixlam}"') - # # Use the pregenerated domain files if the RUN_TASK_MAKE* tasks are # turned off. Link the files, and check that they all contain the @@ -1240,15 +1230,6 @@ def get_location(xcs, fmt, expt_cfg): workflow_config["RES_IN_FIXLAM_FILENAMES"] = res_in_fixlam_filenames workflow_config["CRES"] = f"C{res_in_fixlam_filenames}" - # Temporary solution to link fix directory for AQM.v7 - homeaqm = expt_config.get("user", {}).get("HOMEaqm") - homeaqm_fix = os.path.join(homeaqm,"fix") - if os.path.exists(homeaqm_fix): - rm_vrfy("-rf", homeaqm_fix) - - fixaqm_sav = expt_config["platform"].get("FIXaqm_sav") - ln_vrfy(f"""-fsn {fixaqm_sav} {homeaqm_fix}""") - # # ----------------------------------------------------------------------- #