Skip to content

Commit

Permalink
Get SOCA vrfy job working on Hera again (#1045)
Browse files Browse the repository at this point in the history
What the title says. Fixes #994

---------

Co-authored-by: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
  • Loading branch information
CoryMartin-NOAA and guillaumevernieres authored Apr 17, 2024
1 parent 52c0d2d commit 1389383
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 3 additions & 2 deletions test/soca/gw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_POST"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")
"JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
# TODO(WaterPeople) Add back to the list of tested jobs once fixed
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")

set(setup "")
foreach(jjob ${jjob_list})
Expand Down
6 changes: 5 additions & 1 deletion ush/soca/run_jjobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,16 @@ def _conda_envs(self, jjob):
"""
Write a section that will load the machine dependent modules
"""
if self.machine != "container":
if self.machine in ["orion", "hercules"]:
if jjob in ENVS:
# set +/-u is a workaround for an apparent conda bug
self.f.write(f"set +u \n")
self.f.write(f"conda activate {ENVS[jjob]} \n")
self.f.write(f"set -u \n")
elif self.machine == "hera":
if jjob in ENVS:
self.f.write(f"module unload GDAS \n")
self.f.write(f"module load {ENVS[jjob].upper()/{self.machine}} \n")

def precom(self, com, tmpl):
cmd = f"RUN={self.RUN} YMD={self.gPDY} HH={self.gcyc} declare_from_tmpl -xr {com}:{tmpl}"
Expand Down

0 comments on commit 1389383

Please sign in to comment.