Merge pull request #197 from EdwardSafford-NOAA/master

GitHub issue 194.  Update RadMon fix files, correct html errors.

util/Radiance_Monitor/data_extract/ush/MkBase.sh

@@ -85,14 +85,6 @@ echo $area
 #-------------------------------------------------------------------
 top_parm=${this_dir}/../../parm
 
-export RADMON_VERSION=${RADMON_VERSION:-${top_parm}/radmon.ver}
-if [[ -s ${RADMON_VERSION} ]]; then
-   . ${RADMON_VERSION}
-else
-   echo "Unable to source ${RADMON_VERSION} file"
-   exit 2
-fi
-
 export RADMON_CONFIG=${RADMON_CONFIG:-${top_parm}/RadMon_config}
 if [[ -s ${RADMON_CONFIG} ]]; then
    . ${RADMON_CONFIG}
@@ -108,8 +100,6 @@ else
    exit 2
 fi
 
-. ${DE_PARM}/data_extract_config
-
 
 
 REGIONAL_RR=${REGIONAL_RR:-0}
@@ -122,7 +112,7 @@ echo "CYCLE_INTERVAL = $CYCLE_INTERVAL"
 #    EDATE is ending date for 30/60 day range (always use 00 cycle) 
 #-------------------------------------------------------------------
 echo "TANKverf = $TANKverf"
-EDATE=`${DE_SCRIPTS}/find_cycle.pl --cyc 1 --dir ${TANKverf} --run $RUN`
+EDATE=`${DE_SCRIPTS}/nu_find_cycle.pl --cyc 1 --dir ${TANKverf} --run $RUN`
 echo $EDATE
 
 sdate=`echo $EDATE|cut -c1-8`
@@ -147,9 +137,10 @@ if [[ $SINGLE_SAT -eq 0 ]]; then
       SATYPE=`cat ${TANKverf}/info/SATYPE.txt`
    else
       PDY=`echo $EDATE|cut -c1-8`
+      CYC=`echo $EDATE|cut -c9-10`
 
       if [[ $TANK_USE_RUN -eq 1 ]]; then
-         testdir=${TANKverf}/${RUN}.${PDY}/radmon
+         testdir=${TANKverf}/${RUN}.${PDY}/${CYC}/radmon
       else
          testdir=${TANKverf}/radmon.${PDY}
       fi
@@ -219,9 +210,10 @@ for type in ${SATYPE}; do
       fi
 
       day=`echo $cdate | cut -c1-8 `
-
+      cyc=`echo $cdate | cut -c9-10 `
+
       if [[ $TANK_USE_RUN -eq 1 ]]; then
-         testday=${TANKverf}/${RUN}.${day}/radmon
+         testday=${TANKverf}/${RUN}.${day}/${cyc}/radmon
       else
          testday=${TANKverf}/radmon.${day}
       fi
@@ -274,7 +266,7 @@ for type in ${SATYPE}; do
    #  Copy the executable and run it 
    #------------------------------------------------------------------
    out_file=${type}.base
-   $NCP ${DE_EXEC}/radmon_make_base.x ./make_base
+   $NCP ${DE_EXEC}/radmon_mk_base.x ./make_base
 
 cat << EOF > input
  &INPUT
@@ -326,16 +318,13 @@ else
          $UNCOMPRESS ${basefile}.${Z}
       fi
       tar -xvf ${basefile}
-#      rm ${basefile}
    fi
 
    #  copy new *.base file from $tmpdir and build new $basefile (tar file)
    cp -f $tmpdir/*.base .
    tar -cvf ${basefile} *.base
    mv -f ${basefile} $tmpdir/.
    cd $tmpdir
-# keep for testing
-#   rm -rf $newbase
 
 fi
 

util/Radiance_Monitor/image_gen/html/plot_summary.html

@@ -55,7 +55,7 @@
              */
             var compSrc  = "wopr";
             var compName = "GDAS";
-            var compHome = "http://www.emc.ncep.noaa.gov/gmb/gdas/radiance/esafford/" + compSrc + "/";
+            var compHome = "https://www.emc.ncep.noaa.gov/gmb/gdas/radiance/esafford/" + compSrc + "/";
 
             /****************************************************************************************
              ****************************************************************************************

util/Radiance_Monitor/image_gen/html/plot_time.html

@@ -61,7 +61,7 @@
          */
         var compSrc  = "wopr";
         var compName = "GDAS";
-        var compHome = "http://www.emc.ncep.noaa.gov/gmb/gdas/radiance/esafford/" + compSrc;
+        var compHome = "https://www.emc.ncep.noaa.gov/gmb/gdas/radiance/esafford/" + compSrc;
 
 
         /* -----------------------------------

util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_satype.txt

@@ -1,2 +1,2 @@
-abi_g16 abi_g17 ahi_himawari8 amsua_metop-a amsua_metop-b amsua_metop-c amsua_n15 amsua_n18 amsua_n19 atms_npp atms_n20 avhrr_metop-a avhrr_metop-b avhrr_n18 avhrr_n19 cris-fsr_npp cris-fsr_n20 hirs4_metop-a hirs4_n19 iasi_metop-a iasi_metop-b mhs_metop-a mhs_metop-b mhs_metop-c mhs_n19 saphir_meghat seviri_m08 seviri_m11 ssmis_f17 ssmis_f18
+abi_g16 abi_g17 ahi_himawari8 amsua_metop-a amsua_metop-b amsua_metop-c amsua_n15 amsua_n18 amsua_n19 atms_npp atms_n20 avhrr_metop-a avhrr_metop-b avhrr_n18 avhrr_n19 cris-fsr_npp cris-fsr_n20 hirs4_metop-a hirs4_n19 iasi_metop-a iasi_metop-b iasi_metop-c mhs_metop-a mhs_metop-b mhs_metop-c mhs_n19 seviri_m08 seviri_m11 ssmis_f17 ssmis_f18