Ref NOAA-EMC#310

Roll back oznmon changes which were in master before
aborting a PR.

util/Ozone_Monitor/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8)
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # I am top-level project.
     if( NOT DEFINED ENV{CC} )
@@ -84,8 +84,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     find_package( W3NCO )
 
     set(BUILD_NCDIAG ON)
-    set(NCDIAG_INCS "${PROJECT_BINARY_DIR}/src/ncdiag")
-    add_subdirectory(${PROJECT_SOURCE_DIR}/../../src/ncdiag ${PROJECT_BINARY_DIR}/src/ncdiag)
+    set(NCDIAG_INCS "${PROJECT_BINARY_DIR}/src/ncdiag/include")
+    add_subdirectory(src/ncdiag)
     set(NCDIAG_LIBRARIES ncdiag )
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 endif()

util/Ozone_Monitor/OznMon_install.pl

@@ -5,19 +5,18 @@
 #
 #  This script makes sets all necessary configuration definitions
 #  and calls the makeall.sh script to build all the necessary
-#  executables.  This script works for hera, wcoss_c, wcoss_d,
-#  and wcoss2 machines.
+#  executables.  This script works for hera, wcoss_c, and
+#  wcoss_d machines.
 #
 #-------------------------------------------------------------------
 
    use IO::File;
    use File::Copy qw(move);
 
-   my $machine = `./get_machine.sh`;
-   $machine =~ s/^\s+|\s+$//g;    # strip any whitespace in $machine
+   my $machine = `/usr/bin/perl get_hostname.pl`;
    my $my_machine="export MY_MACHINE=$machine";
 
-   if( $machine ne "wcoss_c" && $machine ne "hera" && $machine ne "wcoss_d" && $machine ne "wcoss2" ) {
+   if( $machine ne "wcoss_c" && $machine ne "hera" && $machine ne "wcoss_d" ) {
       die( "ERROR --- Unrecognized machine hostname, $machine.  Exiting now...\n" );
    }
    else {
@@ -63,9 +62,6 @@
    elsif( $machine eq "wcoss_c" ){
       $tankdir = "/gpfs/hps/emc/da/noscrub/$user_name/nbns";
    }
-   elsif( $machine eq "wcoss2" ){
-      $tankdir = "/lfs/h2/emc/da/noscrub/$user_name/nbns";
-   }
    else {
       $tankdir = "/global/save/$user_name/nbns";
    }
@@ -213,10 +209,6 @@
       $my_ptmp="export OZN_PTMP=\${OZN_PTMP:-/gpfs/hps2/ptmp}";
       $my_stmp="export OZN_STMP=\${OZN_STMP:-/gpfs/hps2/stmp}";
    }
-   elsif( $machine eq "wcoss2" ) {
-      $my_ptmp="export OZN_PTMP=\${OZN_PTMP:-/lfs/h2/emc/ptmp}";
-      $my_stmp="export OZN_STMP=\${OZN_STMP:-/lfs/h2/emc/stmp}";
-   }
    elsif( $machine eq "hera" ){
       $ptmp = "/scratch2/NCEPDEV/stmp3";
 
@@ -333,21 +325,18 @@
    print "\n";
    print "Updating parm/OznMon_user_settings\n";
 
-   my $account = "export ACCOUNT=\${ACCOUNT:-}";
-   if( $machine eq "hera" ) {
-      $account = "export ACCOUNT=\${ACCOUNT:-fv3-cpu}";
-   }
-   elsif( $machine eq "wcoss2" ){
-      $account = "export ACCOUNT=\${ACCOUNT:-GFS-DEV}";
+   my $account = "export ACCOUNT=\${ACCOUNT:-fv3-cpu}";
+   if( $machine ne "theia" && $machine ne "hera" ) {
+      $account = "export ACCOUNT=\${ACCOUNT:-}";
    }
 
    my $project = "export PROJECT=\${PROJECT:-GFS-DEV}";
-   if( $machine ne "wcoss_c" && $machine ne "wcoss_d" && $machine ne "wcoss2" ) {
+   if( $machine ne "wcoss_c" && $machine ne "wcoss_d" ) {
       $project="export PROJECT=";
    } 
 
    my $job_queue="export JOB_QUEUE=";
-   if( $machine eq "wcoss_c" || $machine eq "wcoss2" ) {
+   if( $machine eq "wcoss_c" ) {
       $job_queue="export JOB_QUEUE=\${JOB_QUEUE:-dev}";
    } elsif( $machine eq "wcoss" || $machine eq "wcoss_d" ){
       $job_queue = "export JOB_QUEUE=\${JOB_QUEUE:-dev_shared}";

util/Ozone_Monitor/build_OznMon_cmake.sh

@@ -22,23 +22,36 @@ echo "top_level = ${top_level}"
 export MY_OZNMON=${MY_OZNMON:-$top_level}
 echo "MY_OZNMON = ${MY_OZNMON}"
 
-target=`./get_machine.sh`
-echo "target = $target"
-
-if [[ $target = "wcoss_c" || $target = "wcoss_d" ||
-      $target = "orion"   || $target = "wcoss2"  ||
-      $target = "s4" ]] ; then
-   . $MODULESHOME/init/sh
-elif [[ $target = "hera" ]] ; then
-   . /apps/lmod/lmod/init/sh
-elif [[ $target = "jet" ]] ; then
-   . /apps/lmod/lmod/init/sh
+#module purge
+
+if [[ -d /dcom && -d /hwrf ]] ; then
+    . /usrx/local/Modules/3.2.10/init/sh
+    target=wcoss
+    . $MODULESHOME/init/sh
+elif [[ -d /cm ]] ; then
+#    MODULESHOME=/opt/modules/3.2.10.3
+    . $MODULESHOME/init/sh
+    target=wcoss_c
+elif [[ -d /ioddev_dell ]]; then
+    . $MODULESHOME/init/sh
+    target=wcoss_d
+elif [[ -d /scratch1 ]] ; then
+    . /apps/lmod/lmod/init/sh
+    target=hera
+elif [[ -d /work ]]; then
+    . $MODULESHOME/init/sh
+    target=orion
+elif [[ -d /data/prod ]]; then
+    . $MODULESHOME/init/sh
+    target=s4
+elif [[ -d /jetmon ]]; then
+    . /apps/lmod/lmod/init/sh
+    target=jet
 else
-   echo "unknown target = $target"
-   exit 9
+    echo "unknown target = $target"
+    exit 9
 fi
 
-
 GSI_Pkg=${top_level}/../..
 echo "GSI_Pkg = ${GSI_Pkg}"
 
@@ -58,8 +71,7 @@ fi
 
 if [[ ${target} = "hera"    || ${target} = "wcoss_c"  \
    || ${target} = "wcoss_d" || ${target} = "orion" \
-   || ${target} = "jet"     || ${target} = "s4" \
-   || ${target} = "wcoss2" ]]; then
+   || ${target} = "jet" || ${target} = "s4" ]]; then
    echo Building nwprod executables on ${target}
    echo
 
@@ -85,10 +97,6 @@ if [[ ${target} = "hera"    || ${target} = "wcoss_c"  \
       module purge
       module use -a $dir_modules
       module load $dir_modules/modulefile.ProdGSI.$target
-   elif [ $target = wcoss2 ]; then
-      module purge
-      module use -a $dir_modules
-      module load modulefile.ProdGSI.$target.lua
    fi
 
 
@@ -109,6 +117,7 @@ if [[ ${target} = "hera"    || ${target} = "wcoss_c"  \
    #------------------------------
    #  source OznMon_config
    #------------------------------
+   . ${top_level}/parm/OznMon.ver
    . ${top_level}/parm/OznMon_config
 
    #-------------------------------------------------------

util/Ozone_Monitor/data_xtrct/ush/OznMon_CP.sh

@@ -39,7 +39,7 @@ echo start OznMon_CP.sh
 exit_value=0
 
 nargs=$#
-if [[ $nargs -le 0 || $nargs -gt 9 ]]; then
+if [[ $nargs -le 0 || $nargs -gt 7 ]]; then
    usage
    exit 1
 fi
@@ -193,10 +193,6 @@ if [[  ${nfile_src} -gt 0 ]]; then
    elif [[ $MY_MACHINE = "hera" ]]; then
       $SUB --account=${ACCOUNT} --time=10 -J ${jobname} -D . \
         -o ${logfile} --ntasks=1 --mem=5g ${job}
-
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-      $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${OZN_LOGdir}/CP.${PDY}.${CYC}.err \
-        -V -l select=1:mem=5000M -l walltime=20:00 -N ${jobname} ${job}
    fi
 else
    echo "Unable to locate DATA_LOCATION: ${DATA_LOCATION}"

util/Ozone_Monitor/data_xtrct/ush/OznMon_DE.sh

@@ -229,11 +229,6 @@ elif [[ $MY_MACHINE = "wcoss_c" ]]; then
         -R "select[mem>100] rusage[mem=100]" \
         -M 100 -W 0:05 -J ${job} -cwd ${PWD} $jobfile
 
-elif [[ $MY_MACHINE = "wcoss2" ]]; then
-
-  $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${OZN_LOGdir}/DE.${PDY}.${cyc}.log \
-       -e ${OZN_LOGdir}/DE.${PDY}.${cyc}.err \
-       -V -l select=1:mem=5000M -l walltime=20:00 -N ${job} ${jobfile}
 fi
 
 

util/Ozone_Monitor/data_xtrct/ush/OznMon_MkBase.sh

@@ -79,6 +79,14 @@ export GLB_AREA=${GLB_AREA:-1}
 #-------------------------------------------------------------------
 top_parm=${this_dir}/../../parm
 
+oznmon_version=${oznmon_version:-${top_parm}/OznMon.ver}
+if [[ -s ${oznmon_version} ]]; then
+   . ${oznmon_version}
+else
+   echo "Unable to source ${oznmon_version} file"
+   exit 2
+fi
+
 oznmon_user_settings=${oznmon_user_settings:-${top_parm}/OznMon_user_settings}
 if [[ -s ${oznmon_user_settings} ]]; then
    . ${oznmon_user_settings}
@@ -197,7 +205,7 @@ for type in ${SATYPE}; do
       test_dir=${OZN_STATS_TANKDIR}/${RUN}.${pdy}/${cyc}/oznmon/time
 
       if [[ -d ${test_dir} ]]; then
-         test_file=${test_dir}/${type}.ges.${cdate}.ieee_d
+         test_file=${test_dir}/${type}.${cdate}.ieee_d
 
          if [[ -s $test_file ]]; then
             $NCP ${test_file} ./${type}.${cdate}.ieee_d
@@ -212,7 +220,7 @@ for type in ${SATYPE}; do
 
 
       if [[ $have_ctl -eq 0 ]]; then
-         test_file=${test_dir}/${type}.ges.ctl
+         test_file=${test_dir}/${type}.ctl
          if [[ -s ${test_file} ]]; then
             $NCP ${test_file} ./${type}.ctl
             have_ctl=1

util/Ozone_Monitor/get_hostname.pl

@@ -0,0 +1,41 @@
+#! /usr/bin/perl
+
+#-------------------------------------------------------------------
+#  get_hostname.pl
+#
+#  This script determines the hostname of the current machine.  The
+#  possiblities are wcoss_c, wcoss_d, hera, or "" if the host is not  
+#  one of those three.
+#-------------------------------------------------------------------
+
+
+   my $machine = "";
+
+   #
+   # hera login nodes are hfe1-hfeN, and hostname command only returns the node name,
+   # while wcoss_c and wcoss_d return [hostname].ncep.noaa.gov.  Keep only the
+   # actual hostname and see if it matches the node names for hera, wcoss_d, or wcoss_c.
+   #
+   my $host = "";
+   $host = ` hostname `;
+   chomp( $host );
+
+   if( $host =~ /\./ ) {
+      my @hostnames = split( '\.', $host );     
+      $host = $hostnames[0];
+   }
+
+   if( $host =~ /hfe/ ) { 
+      $machine = "hera";
+   } 
+   elsif( $host =~ /login/ ) {
+      $machine = "wcoss_c";
+   }
+   elsif( $host =~ /v/ || $host =~ /m/ ){	# wcoss_d nodes are vXXaY and mXXaY
+      $machine = "wcoss_d";
+   }
+
+   print "$machine";
+
+   exit 0;
+

util/Ozone_Monitor/image_gen/ush/OznMon_Transfer.sh

@@ -90,24 +90,20 @@ fi
 
 transfer_script=${OZN_IG_SCRIPTS}/transfer.sh
 job=${OZNMON_SUFFIX}_ozn_transfer
-job_queue="dev_transfer"
-
-echo "PROJECT = $PROJECT"
-echo "logf    = $logf"
-echo "errf    = $errf"
-echo "transfer_script = $transfer_script"
 
 if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss_c" ]]; then
 
+   job_queue="dev_transfer"
+
+   echo "PROJECT = $PROJECT"
+   echo "logf    = $logf"
+   echo "errf    = $errf"
+   echo "transfer_script = $transfer_script"
+
    $SUB -P $PROJECT -q $job_queue -o ${logf} -e ${errf} -M 50 -W 0:20 \
         -R affinity[core] -J ${job} -cwd ${OZN_IG_SCRIPTS} \
         ${transfer_script} 
-
-elif [[ $MY_MACHINE = "wcoss2" ]]; then
-
-   $SUB -q $job_queue -A $ACCOUNT -o ${logf} -e ${errf} \
-        -V -l select=1:mem=1000M -l walltime=20:00 \
-        -N ${job} ${transfer_script}	      
+
 fi
 
 exit

util/Ozone_Monitor/image_gen/ush/mk_horiz.sh

@@ -101,10 +101,7 @@ for dsrc in ${data_source}; do
            -o ${logf} -e ${errf} -W 0:05 -J ${job} -cwd ${WORKDIR} \
 	   ${WORKDIR}/${cmdfile}
 
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-      $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logf} -e ${errf} \
-           -V -l select=1:mem=5000M -l walltime=20:00 \
-	   -N ${job} ${WORKDIR}/${cmdfile}
+
    fi
 
 done

util/Ozone_Monitor/image_gen/ush/mk_summary.sh

@@ -116,11 +116,6 @@ for ptype in ${process_type}; do
            -o ${logf} -e ${errf} -W 0:05 -J ${job} \
 	   -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
 
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-      $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logf} -e ${errf} \
-           -V -l select=1:mem=5000M -l walltime=5:00 \
-           -N ${job} ${WORKDIR}/${cmdfile}
-
    fi
 
 done

util/Ozone_Monitor/image_gen/ush/mk_time.sh

@@ -93,12 +93,6 @@ for dsrc in ${data_source}; do
       $SUB -q ${JOB_QUEUE} -P ${PROJECT} -M 50 -R affinity[core] \
            -o ${logf} -e ${errf} -W 0:05 -J ${job} -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
 
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-
-      $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logf} -e ${errf} \
-	   -V -l select=1:mem=5000M -l walltime=20:00 \
-	   -N ${job} ${WORKDIR}/${cmdfile}
-
    fi
 
 

util/Ozone_Monitor/image_gen/ush/transfer.sh

@@ -13,7 +13,7 @@ echo "RSYNCH        = $RSYNC"
 
 if [[ ${OZN_IMGN_TANKDIR} != "/" ]]; then			# sanity check 
 
-   if [[ $MY_MACHINE = "wcoss_c" || $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss2" ]]; then
+   if [[ $MY_MACHINE = "wcoss_c" || $MY_MACHINE = "wcoss_d" ]]; then
 
       WEB_DIR=${WEB_DIR}/${OZNMON_SUFFIX}/${RUN}
       ssh ${WEB_USER}@${WEB_SVR}.ncep.noaa.gov "mkdir -p ${WEB_DIR}"