From f568d19958c7496e0aa01b56742839ae5b7a40ff Mon Sep 17 00:00:00 2001
From: AndrewEichmann-NOAA
 <58948505+AndrewEichmann-NOAA@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:58:08 -0400
Subject: [PATCH] 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
---
 test/soca/gw/CMakeLists.txt | 4 ++--
 ush/soca/run_jjobs.py       | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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}"