diff --git a/modulefiles/EVA/hera.lua b/modulefiles/EVA/hera.lua index d5188a652..865676c9f 100644 --- a/modulefiles/EVA/hera.lua +++ b/modulefiles/EVA/hera.lua @@ -8,11 +8,24 @@ local pkgNameVer = myModuleFullName() conflict(pkgName) -prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +load("stack-intel/2021.5.0") +load("python/3.10.13") +load("proj/9.2.1") -load("hpc/1.2.0") -load("miniconda3/4.6.14") -load("eva/1.0.0") +local pyenvpath = "/scratch1/NCEPDEV/da/python/envs/" +local pyenvname = "eva" + +local pyenvactivate = pathJoin(pyenvpath, pyenvname, "bin/activate") +if (mode() == "load") then + local activate_cmd = "source "..pyenvactivate + execute{cmd=activate_cmd, modeA={"load"}} +else + if (mode() == "unload") then + local deactivate_cmd = "deactivate" + execute{cmd=deactivate_cmd, modeA={"unload"}} + end +end whatis("Name: ".. pkgName) whatis("Version: ".. pkgVersion) diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua index 50556a7d0..dadf95689 100644 --- a/modulefiles/GDAS/hera.intel.lua +++ b/modulefiles/GDAS/hera.intel.lua @@ -6,8 +6,8 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') -prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') +prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core') +--prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') -- below two lines get us access to the spack-stack modules load("stack-intel/2021.5.0") @@ -42,7 +42,7 @@ load("eckit/1.24.5") load("fftw/3.3.10") load("fckit/0.11.0") load("fiat/1.2.0") -load("ectrans/1.2.0") +--load("ectrans/1.2.0") load("atlas/0.35.1") load("sp/2.5.0") load("gsl-lite/0.37.0") @@ -60,15 +60,20 @@ load("udunits/2.2.28") load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") load("json/3.10.5") -load("py-pybind11/2.11.0") --load("crtm/v2.4_jedi") load("rocoto/1.3.6") +load("prod_util/2.1.1") + +load("py-jinja2/3.0.3") +load("py-netcdf4/1.5.8") +load("py-pybind11/2.11.0") +load("py-pycodestyle/2.11.0") +load("py-pyyaml/6.0") +load("py-scipy/1.11.3") +load("py-xarray/2023.7.0") -load("hpc/1.2.0") -unload("python/3.10.13") -unload("py-numpy/1.22.3") -load("miniconda3/4.6.14") -load("gdasapp/1.0.0") +-- hack for wxflow +prepend_path("PYTHONPATH", "/scratch1/NCEPDEV/da/python/gdasapp/wxflow/20240307/src") setenv("CC","mpiicc") setenv("FC","mpiifort") @@ -81,7 +86,7 @@ setenv('MPIEXEC_NPROC', mpinproc) setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data") -prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin") +--prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin") whatis("Name: ".. pkgName) whatis("Version: ".. pkgVersion)