Ref NOAA-EMC#162

Merge branch 'develop' into feature/rgn-xfer-162
EdwardSafford-NOAA · Feb 6, 2025 · 1b0b1d6 · 1b0b1d6
2 parents 3daa22e + 2e32094
commit 1b0b1d6
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 30 deletions.
diff --git a/modulefiles/hera.gnu-run.lua b/modulefiles/hera.gnu-run.lua
@@ -1,10 +1,10 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch4/NCEPDEV/stmp/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
 
 local stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0"
-local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
+local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 local grads_ver=os.getenv("grads_ver") or "2.2.3"
 local perl_ver=os.getenv("perl_ver") or "5.38.0"

diff --git a/modulefiles/hera.gnu.lua b/modulefiles/hera.gnu.lua
@@ -1,10 +1,10 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch4/NCEPDEV/stmp/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
 
 local stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0"
-local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
+local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 
 load(pathJoin("stack-gcc", stack_gnu_ver))

diff --git a/modulefiles/hera.intel-run.lua b/modulefiles/hera.intel-run.lua
@@ -1,7 +1,7 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/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-dev-rocky8/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/hera.intel.lua b/modulefiles/hera.intel.lua
@@ -1,7 +1,7 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/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-dev-rocky8/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/src/Radiance_Monitor/image_gen/html/install_glb.sh b/src/Radiance_Monitor/image_gen/html/install_glb.sh
@@ -13,25 +13,27 @@
 echo "BEGIN install_glb.sh"; echo; echo
 
 do_cmp=0
-cmp_src=""
+cmp_src_default="GDAS"
+cmp_src=${cmp_src_default}
+comp_source_value="gdas"
+comp_source_name="Operational GDAS"
 
 
 #--------------------------------------------------------------
 #  Allow user to enable comparison plots 
 #
 echo "Do you wish to enable data plots to include comparison to"
-echo " operational GDAS data, or another data source?"
-echo 
+echo " operational ${cmp_src} data, or another data source?"
+echo ""
 echo -n "  Enter YES to enable comparison plots, any other input to disable.  > "
 read text
 short=`echo $text | cut -c1`
 
 if [[ $short = "Y" || $short = "y" ]]; then
    do_cmp=1
-   cmp_src="GDAS"
 
    echo "Please specify the suffix of your comparison data source,"
-   echo "  or just hit the return key to use the operational GDAS as "
+   echo "  or just hit the return key to use the operational ${cmp_src} as "
    echo "  the comparison source"
    echo 
    echo -n " > "
@@ -279,7 +281,7 @@ if [[ $do_cmp == 1 ]]; then
    comp_html_files="plot_summary.html plot_time.html"
 
    #-------------------------------------------------------------------------
-   #  If cmp_src == GDAS we only have to uncomment the comparison check box
+   #  If cmp_src == $cmp_src_default we only have to uncomment the comparison check box
    #  in the html files.  If it's another source then we'll have to change
    #  the values of compSrc, compName, and compHome in the html files.
    #
@@ -296,17 +298,24 @@ if [[ $do_cmp == 1 ]]; then
       mv -f ${tmp_html} ${html_file}
 
       #---------------------------------------------------------------
-      # if we're using a source other than GDAS make that change here
+      # if we're using a source other than $cmp_src_default that change here
       #
-      if [[ $cmp_src != "GDAS" ]]; then
+      if [[ $cmp_src != ${cmp_src_default} ]]; then
          cmp_sc_line="            var compSrc  = \"${cmp_src}\";"
          cmp_nm_line="            var compName = \"${cmp_src}\";"
          cmp_hm_line="            var compHome = \"../${cmp_src}/\";"
 
          sed -i "/var compSrc /c ${cmp_sc_line}" ${html_file}
          sed -i "/var compName /c ${cmp_nm_line}" ${html_file}
          sed -i "/var compHome /c ${cmp_hm_line}" ${html_file}
+
+	 comp_source_value="${cmp_src}"
+         comp_source_name="Experimental $cmp_src"
+
       fi
+
+      sed -i "s/COMP_SOURCE_VALUE/${comp_source_value}/" ${html_file}
+      sed -i "s/COMP_SOURCE_NAME/${comp_source_name}/" ${html_file}
 
    done
 fi
@@ -328,7 +337,7 @@ new_index="index.html"
 
 $NCP ${RADMON_IMAGE_GEN}/html/${index_file} .
 sed s/INSERT_SUFFIX/${SUFFIX}/g $index_file > ${tmp_index}
-if [[ $SUFFIX == "GFS" || $SUFFIX == "nrx" ]]; then
+if [[ $SUFFIX == ${cmp_src_default} ]]; then
    sed s/Experimental/Operational/1 ${tmp_index} > ${new_index}
 fi
 

diff --git a/src/Radiance_Monitor/image_gen/html/install_rgn.sh b/src/Radiance_Monitor/image_gen/html/install_rgn.sh
@@ -13,25 +13,27 @@ echo "BEGIN install_rgn.sh"
 echo ""
 
 do_cmp=0
-cmp_src=""
+cmp_src_default="NAM"
+cmp_src=${cmp_src_default}
+comp_source_value="nam"
+comp_source_name="Operational NAM"
 
 
 #--------------------------------------------------------------
 #  Allow user to enable comparison plots 
 #
 echo "Do you wish to enable data plots to include comparison to"
-echo " operational NAM data, or another regional data source?"
+echo " operational ${cmp_src} data, or another regional data source?"
 echo ""
 echo -n "  Enter YES to enable comparison plots, any other input to disable.  > "
 read text
 short=`echo $text | cut -c1`
 
 if [[ $short = "Y" || $short = "y" ]]; then
    do_cmp=1
-   cmp_src="NAM"
 
    echo "Please specify the suffix of your comparison data source,"
-   echo "  or just hit the return key to use the operational NAM as "
+   echo "  or just hit the return key to use the operational ${cmp_src} as "
    echo "  the comparison source"
    echo ""
    echo -n " > "
@@ -280,13 +282,10 @@ done
 if [[ $do_cmp == 1 ]]; then
 
    comp_html_files="plot_summary.html plot_time.html"
-   comp_source_value="nam"
-   echo "comp_source_value = $comp_source_value"
-   comp_source_name="Operational NAM"
-   #-------------------------------------------------------------------------
-   #  If cmp_src == GDAS we only have to uncomment the comparison check box
-   #  in the html files.  If it's another source then we'll have to change
-   #  the values of compSrc, compName, and compHome in the html files.
+   #--------------------------------------------------------------------------
+   #  If cmp_src == $cmp_src_default we only have to uncomment the comparison
+   #  check box in the html files.  If it's another source then we'll have to
+   #  change the values of compSrc, compName, and compHome in the html files.
    #
 
    for html_file in $comp_html_files; do
@@ -301,7 +300,7 @@ if [[ $do_cmp == 1 ]]; then
 
       #---------------------------------------------------------------
       # if we're using a source other than GDAS make that change here
-      if [[ $cmp_src != "NAM" ]]; then
+      if [[ ${cmp_src} != ${cmp_src_default} ]]; then
          cmp_sc_line="            var compSrc  = \"${cmp_src}\";"
          cmp_nm_line="            var compName = \"${cmp_src}\";"
          cmp_hm_line="            var compHome = \"../${cmp_src}/\";"

diff --git a/src/Radiance_Monitor/image_gen/html/plot_summary.html.glb b/src/Radiance_Monitor/image_gen/html/plot_summary.html.glb
@@ -1090,7 +1090,7 @@
                 <table style="position:absolute;left:1px;top:80px;width:150px" id="compareTable">
                     <caption style="test-indent:2em"> <b>Compare With:</b> </caption>
                     <tr><td>
-                        <input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="gfs" onclick="boxCheck(this.value)"><label id="ckboxCompLbl" for="ckboxCmp">operational GDAS</label></input>
+			<input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="COMP_SOURCE_VALUE" onclick="boxCheck(this.value)"> <label for="ckboxCmp">COMP_SOURCE_NAME</label></input>
                     </td></tr>
                 </table>
      RM line to install OPTIONAL_COMPARE  -->

diff --git a/src/Radiance_Monitor/image_gen/html/plot_time.html.glb b/src/Radiance_Monitor/image_gen/html/plot_time.html.glb
@@ -1447,7 +1447,7 @@
 <table style="position:absolute;left:2px;top:150px;width:150px" id="compareTable">
     <caption style="test-indent:2em"> <b>Compare With:</b> </caption>
     <tr><td>
-        <input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="gfs" onclick="boxCheck(this.value)"><label id="ckboxCompLbl" for="ckboxCmp">operational GDAS</label></input>
+	<input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="COMP_SOURCE_VALUE" onclick="boxCheck(this.value)"><label for="ckboxCmp">COMP_SOURCE_NAME</label></input>
     </td></tr>
 </table>
      RM line to install OPTIONAL_COMPARE -->

diff --git a/src/Radiance_Monitor/image_gen/html/plot_time.html.rgn b/src/Radiance_Monitor/image_gen/html/plot_time.html.rgn
@@ -1180,7 +1180,7 @@
 <table style="position:absolute;left:2px;top:150px;width:150px" id="compareTable">
     <caption style="test-indent:2em"> <b>Compare With:</b> </caption>
     <tr><td>
-        <input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="nam" onclick="boxCheck(this.value)"><label for="ckboxCmp">Operational NAM</label></input>
+	<input type="checkbox" id="ckboxCmp" name="ckboxCmp" value="COMP_SOURCE_VALUE" onclick="boxCheck(this.value)"><label for="ckboxCmp">COMP_SOURCE_NAME</label></input>
     </td></tr>
 </table>