Ref NOAA-EMC#41

Add module for orion.
EdwardSafford-NOAA · Aug 14, 2024 · cb524fa · cb524fa
1 parent 02bb913
commit cb524fa
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/driver/runObsMon.sh b/driver/runObsMon.sh
@@ -105,17 +105,19 @@ if [[ ! -d ${logdir} ]]; then mkdir -p ${logdir}; fi
 logfile="${logdir}/OM_setup.log"
 if [[ -e ${logfile} ]]; then rm ${logfile}; fi
 
+echo MACHINE_ID: $MACHINE_ID
+
 case ${MACHINE_ID} in
-   hera)
+   hera|orion|hercules)
       ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=400M --time=0:05:00 \
              -J ${jobname} --partition service -o ${logfile} ${jobfile}
       ;;
 
-   orion|hercules)
-      echo "on orion"
-      ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=400M --time=0:05:00 \
-             -J ${jobname} --partition service -o ${logfile} ${jobfile}
-      ;;
+#   orion|hercules)
+#      echo "on orion"
+#      ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=400M --time=0:05:00 \
+#             -J ${jobname} --partition service -o ${logfile} ${jobfile}
+#      ;;
 
    wcoss2)	
       $SUB -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} \

diff --git a/modulefiles/obs-monitor/orion.lua b/modulefiles/obs-monitor/orion.lua
@@ -0,0 +1,39 @@
+help([[
+Load python virtual environment for obs-monitor
+]])
+
+local pkgName    = myModuleName()
+local pkgVersion = myModuleVersion()
+local pkgNameVer = myModuleFullName()
+
+conflict(pkgName)
+
+
+prepend_path("MODULEPATH", " /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")
+
+load ("stack-intel/2021.9.0")
+load ("python/3.10.8")
+
+local pyenvpath = "/work/noaa/da/esafford/noscrub/python/envs/"
+local pyenvname = "obs-mon"
+
+local pyenvactivate = pathJoin(pyenvpath, pyenvname, "bin/activate")
+
+if (mode() == "load") then
+  local activate_cmd = "source "..pyenvactivate
+  execute{cmd=activate_cmd, modeA={"load"}}
+  prepend_path("PATH", "/work/noaa/da/esafford/noscrub/python/envs/obs-mon/bin")
+  prepend_path("PYTHONPATH", "/work/noaa/da/esafford/noscrub/python/envs/obs-mon")
+
+else
+  if (mode() == "unload") then
+    local deactivate_cmd = "deactivate"
+    execute{cmd=deactivate_cmd, modeA={"unload"}}
+  end
+end
+
+whatis("Name: ".. pkgName)
+whatis("Version: ".. pkgVersion)
+whatis("Category: Obs-monitor")
+whatis("Description: Load all libraries needed for obs-monitor")
+
diff --git a/parm/OM_config b/parm/OM_config
@@ -22,7 +22,7 @@ case ${MACHINE_ID} in
       account="da-cpu"
       aprun_py="python"
       module use ${HOMEobsmon}/modulefiles
-      module load obs-monitor
+      module load obs-monitor/hera
       ;;
 
    wcoss2)
@@ -34,7 +34,7 @@ case ${MACHINE_ID} in
       project="GDAS-DEV"
       account="GFS-DEV"
       module use ${HOMEobsmon}/modulefiles
-      module load obs-monitor
+      module load obs-monitor/wcoss2
       aprun_py=`which python`
       ;;
 
@@ -48,6 +48,8 @@ case ${MACHINE_ID} in
       project=""
       account="da-cpu"
       aprun_py="python"
+      module use ${HOMEobsmon}/modulefiles
+      module load obs-monitor/orion
       ;;
 esac