Ref NOAA-EMC#160

Update fix files, correct copy script.
EdwardSafford-NOAA · May 18, 2021 · 187be9d · 187be9d
1 parent c47937c
commit 187be9d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/util/Radiance_Monitor/data_extract/ush/RadMon_CP_glb.sh b/util/Radiance_Monitor/data_extract/ush/RadMon_CP_glb.sh
@@ -69,7 +69,7 @@ do
          shift # past argument
       ;;
       -f|--radf)
-         radmon_file_loc="$2"
+         radstat_loc="$2"
          shift # past argument
       ;;
       -d|--dataf)
@@ -88,7 +88,7 @@ done
 echo "RADMON_SUFFIX    = $RADMON_SUFFIX"
 echo "run              = $run"
 echo "pdate            = $pdate"
-echo "radmon_file_loc  = ${radmon_file_loc}"
+echo "radstat_loc      = ${radstat_loc}"
 echo "data_file_loc    = ${data_file_loc}"
 
 export RUN=${RUN:-${run}}
@@ -120,11 +120,6 @@ fi
 
 export USHradmon=${USHradmon:-$HOMEradmon/ush}
 
-if [[ ${radmon_file_loc} = "" ]]; then
-   echo "setting default radmon_file_loc"
-   radmon_file_loc=${RADSTAT_LOCATION}
-fi
-
 
 #---------------------------------------------------------------
 # Create any missing directories.
@@ -154,14 +149,19 @@ export CYC=`echo $PDATE|cut -c9-10`
 #---------------------------------------------------------------
 #  Set data and radstat locations     
 #---------------------------------------------------------------
-if [[ -n ${radmon_file_loc} && -n ${data_file_loc} ]]; then
+if [[ -n ${radstat_loc} ]]; then 
+   export RADSTAT_LOCATION=${radstat_loc}
+fi
+export RADSTAT_LOCATION=${RADSTAT_LOCATION}/${RUN}.${PDY}/${CYC}/atmos
+
+
+if [[ -n ${data_file_loc} ]]; then
    export DATA_LOCATION=${data_file_loc}/${RUN}.${PDY}
-   export RADSTAT_LOCATION=${radmon_file_loc}/${RUN}.${PDY}/${CYC}/atmos
 else  
    export DATA_LOCATION=${RADSTAT_LOCATION}/radmon
-   export RADSTAT_LOCATION=${radmon_file_loc}/${RUN}.${PDY}/${CYC}/atmos
 fi
 
+
 if [[  -d ${DATA_LOCATION} ]]; then
    job=${DE_SCRIPTS}/radmon_copy.sh
    jobname=RadMon_CP_${RADMON_SUFFIX}

diff --git a/util/Radiance_Monitor/data_extract/ush/radmon_copy.sh b/util/Radiance_Monitor/data_extract/ush/radmon_copy.sh
@@ -175,8 +175,8 @@ if [[ $exit_value == 0 ]]; then
          echo "satype_file is good to go:  ${satype_file}"
       fi
 
-      if [[ ! -e ${radstat_file} ]]; then
-         echo "MISSING radstat_file: ${radstat_file}"
+      if [[ ! -e ${radstat} ]]; then
+         echo "MISSING radstat_file: ${radstat}"
       else
          echo "radstat is good to go: ${radstat}"
       fi

diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_base.tar b/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_base.tar
diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_satype.txt b/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_metop-b 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 mhs_metop-a mhs_metop-b mhs_metop-c mhs_n19 saphir_meghat seviri_m08 seviri_m11 ssmis_f17 ssmis_f18