Skip to content

Commit

Permalink
[production/AQM.v7] update workflow for AQMv7 implementation (ufs-com…
Browse files Browse the repository at this point in the history
…munity#958)

* update setup.sh to use static fix dir

* change setup.py back to use statis fix files
  • Loading branch information
JianpingHuang-NOAA authored Oct 31, 2023
1 parent 2fcdaab commit c7d22e3
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions ush/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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??
Expand All @@ -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
Expand Down Expand Up @@ -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}""")

#
# -----------------------------------------------------------------------
#
Expand Down

0 comments on commit c7d22e3

Please sign in to comment.