Merge remote-tracking branch 'origin/develop' into feature/ss_180

* origin/develop: Move to contrib spack-stack on Jet Ref NOAA-EMC#141 Ref NOAA-EMC#141
DavidHuber-NOAA · Sep 6, 2024 · 16128d6 · 16128d6
2 parents 2f84a4b + 278ee62
commit 16128d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/modulefiles/jet.intel-run.lua b/modulefiles/jet.intel-run.lua
@@ -1,7 +1,7 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-intel/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"

diff --git a/modulefiles/jet.intel.lua b/modulefiles/jet.intel.lua
@@ -1,7 +1,7 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-intel/install/modulefiles/Core")
 
 local stack_python_ver=os.getenv("stack_python_ver") or "3.11.6"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"

diff --git a/ush/find_last_cycle.sh b/ush/find_last_cycle.sh
@@ -16,7 +16,7 @@
 #
 #   The supported directory structures are:
 #      Operations:  $tankdir/$net/version/$run.$pdy/$hh/atmos/$monitor
-#      Workflow  :  $tankdir/$monitor/stats/$net/$run.$pdy/$hh
+#      Workflow  :  $tankdir/$net/$run.$pdy/$hh/products/atmos/$monitor
 #      Monitors* :  $tankdir/stats/$net/$run.$pdy/$hh/$monitor
 #
 #   The get_stats_path.sh script will be used to find a valid path from 
@@ -68,7 +68,6 @@ done
 #
 path=`${MON_USH}/get_stats_path.sh --net ${net} --run ${run} --tank ${tankdir} --mon ${monitor} --rpath base`
 
-
 #--------------------------------------------------
 # Set search string per monitor
 #
@@ -109,18 +108,7 @@ if [[ ${#path} -gt 0 ]]; then
 
       for hr in $hrs; do
 
-	 #----------------------------------------------------------------
-	 #  The workflow (wkfl) directory structure is a special case
-	 #    in that $monitor is the first subdirectory in the $tankdir.  
-	 #    To take that into account this check is added.
-	 #     
-	 wkfl_check=`echo ${path} | grep ${monitor}`
-	 if [[ ${#wkfl_check} -gt 0 ]]; then
-            wkfl_test=`find -L "${path}/${file}/${hr}/" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
-	 else
-	     wkfl_test=""
-         fi
-
+         wkfl_test=`find -L "${path}/${file}/${hr}/products/atmos/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
          mon_test=`find -L "${path}/${file}/${hr}/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
          ops_test=`find -L "${path}/${file}/${hr}/atmos/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
 

diff --git a/ush/get_stats_path.sh b/ush/get_stats_path.sh
@@ -80,8 +80,8 @@ ops_base=${tankdir}/${net}/${version}
 ops_xtn=${run}.${pdy}/${hh}/atmos/${monitor}
 ops=${ops_base}/${ops_xtn}
 
-wkf_base=${tankdir}/${monitor}/stats/${net}
-wkf_xtn=${run}.${pdy}/${hh}
+wkf_base=${tankdir}/${net}
+wkf_xtn=${run}.${pdy}/${hh}/products/atmos/${monitor}
 wkf=${wkf_base}/${wkf_xtn}
 
 mon_base=${tankdir}/stats/${net}