Ref NOAA-EMC#71

Begin case clean-up and rm unused files.

parm/Mon_config

@@ -10,17 +10,17 @@
 #---------------------------------------------------
 # Get the root of the cloned GSI-monitor directory
 #
-readonly DIR_ROOT=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )/.." && pwd -P)
-export MY_GSI_MONITOR=$DIR_ROOT
+readonly mon_dir_root=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )/.." && pwd -P)
+export MY_GSI_MONITOR=${mon_dir_root}
 
 
 #---------------------------------------------------
 # Determine machine name
 #
-COMPILER=${COMPILER:-intel}
-source $DIR_ROOT/ush/detect_machine.sh
+export COMPILER=${COMPILER:-intel}
+source ${MY_GSI_MONITOR}/ush/detect_machine.sh
 machine_id=`echo "${MACHINE_ID%%.*}"`
-export MY_MACHINE=$machine_id
+export MY_MACHINE=${machine_id}
 
 #---------------------------------------------------
 #  Load modules from stack
@@ -30,9 +30,10 @@ export MY_MACHINE=$machine_id
 #         run-time modules.  If the run-time mod idea passes muster
 #         then I'll open an issue for the change to those machines.
 #
-if [[ $MY_MACHINE = "wcoss2" || $MY_MACHINE = "hera" || $MY_MACHINE = "orion" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
-   source $DIR_ROOT/ush/module-setup.sh
-   module use $DIR_ROOT/modulefiles
+if [[ ${MY_MACHINE} = "wcoss2" || ${MY_MACHINE} = "hera" || \
+      ${MY_MACHINE} = "orion"  || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "jet" ]]; then
+   source ${MY_GSI_MONITOR}/ush/module-setup.sh
+   module use ${MY_GSI_MONITOR}/modulefiles
    module load ${MACHINE_ID}-run
    module list
 fi
@@ -41,9 +42,9 @@ case $MY_MACHINE in
    s4)
       export SUB=/usr/bin/sbatch
       export SERVICE_PARTITION="serial"
-      tankdir="/data/users/$USER/monitor"
-      ptmp="/scratch/users/$USER"
-      stmp="/scratch/users/$USER"
+      tankdir="/data/users/${USER}/monitor"
+      ptmp="/scratch/users/${USER}"
+      stmp="/scratch/users/${USER}"
       queue=""
       project=""
       account="star"
@@ -57,9 +58,9 @@ case $MY_MACHINE in
       export SERVICE_PARTITION="service"
       account="nesdis-rdo2"
 
-      tankdir="/lfs1/NESDIS/nesdis-rdo2/$USER/monitor"
-      ptmp="/lfs1/NESDIS/nesdis-rdo2/$USER/para/ptmp"
-      stmp="/lfs1/NESDIS/nesdis-rdo2/$USER/para/stmp"
+      tankdir="/lfs1/NESDIS/nesdis-rdo2/${USER}/monitor"
+      ptmp="/lfs1/NESDIS/nesdis-rdo2/${USER}/para/ptmp"
+      stmp="/lfs1/NESDIS/nesdis-rdo2/${USER}/para/stmp"
       export BATCH_PARTITION="xjet"
 
       export PARTITION_OZNMON=${PARTITION_OZNMON:-${BATCH_PARTITION}}
@@ -73,9 +74,9 @@ case $MY_MACHINE in
       export SUB=/apps/slurm/default/bin/sbatch
       export SERVICE_PARTITION="service"
 
-      tankdir="/scratch1/NCEPDEV/da/$USER/save/nbns"
-      ptmp="/scratch2/NCEPDEV/stmp3/$USER"
-      stmp="/scratch2/NCEPDEV/stmp1/$USER"
+      tankdir="/scratch1/NCEPDEV/da/${USER}/save/nbns"
+      ptmp="/scratch2/NCEPDEV/stmp3/${USER}"
+      stmp="/scratch2/NCEPDEV/stmp1/${USER}"
       queue=""
       project=""
       account="da-cpu"
@@ -84,9 +85,9 @@ case $MY_MACHINE in
    wcoss2)
       export SUB="qsub"
 
-      tankdir="/lfs/h2/emc/da/noscrub/$USER/nbns"
-      ptmp="/lfs/h2/emc/ptmp/$USER"
-      stmp="/lfs/h2/emc/stmp/$USER"
+      tankdir="/lfs/h2/emc/da/noscrub/${USER}/nbns"
+      ptmp="/lfs/h2/emc/ptmp/${USER}"
+      stmp="/lfs/h2/emc/stmp/${USER}"
       queue="dev"
       project="GDAS-DEV"
       account="GFS-DEV"
@@ -96,24 +97,24 @@ case $MY_MACHINE in
       export SUB="sbatch" #/opt/slurm/bin/sbatch
       export SERVICE_PARTITION="orion"
 
-      tankdir="/work/noaa/da/$USER/nbns"
-      ptmp="/work2/noaa/stmp/$USER"
-      stmp="/work/noaa/stmp/$USER"
+      tankdir="/work/noaa/da/${USER}/nbns"
+      ptmp="/work2/noaa/stmp/${USER}"
+      stmp="/work/noaa/stmp/${USER}"
       queue=""
       project=""
       account="da-cpu"
 esac
 
 
-export ACCOUNT=${ACCOUNT:-$account}
-export PROJECT=${PROJECT:-$project}
-export JOB_QUEUE=${JOB_QUEUE:-$queue}
+export ACCOUNT=${ACCOUNT:-${account}}
+export PROJECT=${PROJECT:-${project}}
+export JOB_QUEUE=${JOB_QUEUE:-${queue}}
 
-export MON_PTMP=${MON_PTMP:-$ptmp}
-export MON_STMP=${MON_STMP:-$stmp}
-export MON_LOGDIR=${MON_LOGDIR:-$ptmp/logs}
+export MON_PTMP=${MON_PTMP:-${ptmp}}
+export MON_STMP=${MON_STMP:-${stmp}}
+export MON_LOGDIR=${MON_LOGDIR:-${ptmp}/logs}
 export MON_USH=${MON_USH:-${MY_GSI_MONITOR}/ush}
-export TANKDIR=${TANKDIR:-$tankdir}
+export TANKDIR=${TANKDIR:-${tankdir}}
 
 export WEBUSER=${WEBUSER:-esafford}
 export WEBSVR=${WEBSVR:-emcrzdm}
@@ -128,5 +129,5 @@ export STNMAP=`which stnmap`
 export WGRIB2=`which wgrib2`
 export RSYNC=`which rsync`
 
-export GSI_MON_BIN=$MY_GSI_MONITOR/install/bin
+export GSI_MON_BIN=${MY_GSI_MONITOR}/install/bin