From 78f62f27685dd6a1441497b1ac0d44ed3b2cf5eb Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Fri, 21 Jun 2024 10:09:31 +0000
Subject: [PATCH] remove wxflow hack from modulefiles, add wxflow to PYTHONPATH
 in aero test genyaml script (#1186)

---
 modulefiles/GDAS/gaea.intel.lua      | 3 ---
 modulefiles/GDAS/hera.intel.lua      | 3 ---
 modulefiles/GDAS/noaacloud.intel.lua | 3 ---
 test/aero/genyaml_3dvar.sh           | 9 +++++++++
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modulefiles/GDAS/gaea.intel.lua b/modulefiles/GDAS/gaea.intel.lua
index 744995ca7..e2da9aea6 100644
--- a/modulefiles/GDAS/gaea.intel.lua
+++ b/modulefiles/GDAS/gaea.intel.lua
@@ -74,9 +74,6 @@ load("py-xarray/2023.7.0")
 load("py-f90nml/1.4.3")
 load("py-pip/23.1.2")
 
--- hack for wxflow
---prepend_path("PYTHONPATH", "/scratch1/NCEPDEV/da/python/gdasapp/wxflow/20240307/src")
-
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua
index 109b1e938..4889000d8 100644
--- a/modulefiles/GDAS/hera.intel.lua
+++ b/modulefiles/GDAS/hera.intel.lua
@@ -74,9 +74,6 @@ load("py-xarray/2023.7.0")
 load("py-f90nml/1.4.3")
 load("py-pip/23.1.2")
 
--- hack for wxflow
-prepend_path("PYTHONPATH", "/scratch1/NCEPDEV/da/python/gdasapp/wxflow/20240307/src")
-
 setenv("CC","mpiicc")
 setenv("FC","mpiifort")
 setenv("CXX","mpiicpc")
diff --git a/modulefiles/GDAS/noaacloud.intel.lua b/modulefiles/GDAS/noaacloud.intel.lua
index b976d75bc..2fcfb4af4 100644
--- a/modulefiles/GDAS/noaacloud.intel.lua
+++ b/modulefiles/GDAS/noaacloud.intel.lua
@@ -72,9 +72,6 @@ load("py-xarray/2023.7.0")
 load("py-f90nml/1.4.3")
 load("py-pip/23.1.2")
 
--- hack for wxflow
---prepend_path("PYTHONPATH", "/contrib/Wei.Huang/data/glopara/data/gdasapp-wxflow-20240307/src/wxflow")
-
 setenv("CC","mpiicc")
 setenv("FC","mpiifort")
 setenv("CXX","mpiicpc")
diff --git a/test/aero/genyaml_3dvar.sh b/test/aero/genyaml_3dvar.sh
index 82363d15f..43f5eea9b 100755
--- a/test/aero/genyaml_3dvar.sh
+++ b/test/aero/genyaml_3dvar.sh
@@ -24,6 +24,15 @@ export YAMLout=$DATA/3dvar_gfs_aero.yaml
 rm -rf $DATA
 mkdir -p $DATA
 
+# Set g-w HOMEgfs
+topdir=$(cd "$(dirname "$(readlink -f -n "${bindir}" )" )/../../.." && pwd -P)
+export HOMEgfs=$topdir
+
+# Set python path for workflow utilities and tasks
+wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow"
+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
+export PYTHONPATH
+
 # run some python code to generate the YAML
 python3 - <<EOF
 from wxflow import parse_j2yaml