diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index 4b48c7b6a..bf4b77155 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -40,8 +40,8 @@ set(jjob_list "JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP" # "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY" "JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN" "JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT" - "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST") -# "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY") + "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST" + "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY") set(setup "") foreach(jjob ${jjob_list}) diff --git a/ush/soca/run_jjobs.py b/ush/soca/run_jjobs.py index 4b4e623be..30700ef99 100755 --- a/ush/soca/run_jjobs.py +++ b/ush/soca/run_jjobs.py @@ -138,8 +138,10 @@ def _conda_envs(self, jjob): """ if self.machine != "container": if jjob in ENVS: - # TODO: This does nothing for now. Make the conda activate work! - self.f.write(f"# conda activate {ENVS[jjob]} \n") + # 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") def precom(self, com, tmpl): cmd = f"RUN={self.RUN} YMD={self.gPDY} HH={self.gcyc} generate_com -xr {com}:{tmpl}"