re-introduce ocean verify task ctest (#511)

* changed handling of var.yaml * saving original var with different name * adding error handling for cnvstat * pep8 correction * made diag_statistics.py executable * make vrfy work again * added comment for conda workaroundWq * pep8 correction
NOAA-EMC · Jun 15, 2023 · f568d19 · f568d19
1 parent 9b69daf
commit f568d19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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}"