Merge pull request NOAA-EMC#255 from EdwardSafford-NOAA/master

GSI GitHub Issue NOAA-EMC#228. Port ConMon to wcoss2.
ScottSieron-NOAA · Nov 17, 2021 · f442020 · f442020
2 parents c8447e4 + 2ce7875
commit f442020
Show file tree

Hide file tree

Showing 10 changed files with 199 additions and 60 deletions.
diff --git a/util/Conventional_Monitor/ConMon_install.pl b/util/Conventional_Monitor/ConMon_install.pl
@@ -18,8 +18,8 @@
    my $machine = `/usr/bin/perl ./get_hostname.pl`;
    my $my_machine="export MY_MACHINE=$machine";
 
-   if( $machine ne "hera" && $machine ne "wcoss" && 
-       $machine ne "wcoss_c" && $machine ne "wcoss_d" ) {
+   if( $machine ne "hera" && $machine ne "wcoss" && $machine ne "wcoss_c" 
+       && $machine ne "wcoss_d" && $machine ne "wcoss2" ) {
       die( "ERROR --- Unrecognized machine hostname, $machine.  Exiting now...\n" );
    }
    else {
@@ -76,6 +76,9 @@
    elsif( $machine eq "wcoss_d" ) {
       $tankdir = "/gpfs/dell2/emc/modeling/noscrub/$user_name/nbns";
    }
+   elsif( $machine eq "wcoss2" ){
+      $tankdir = "/lfs/h2/emc/da/noscrub/$user_name/nbns";
+   }
 
    print "Please specify TANKDIR location for storage of data and image files.\n";
    print "  Return to accept default location or enter new location now.\n";
@@ -177,6 +180,10 @@
       $my_ptmp="export C_PTMP=\${C_PTMP:-/gpfs/dell2/ptmp}";
       $my_stmp="export C_STMP=\${C_STMP:-/gpfs/dell2/stmp}";
    }
+   elsif( $machine eq "wcoss2" ){
+      $my_ptmp="export MY_PTMP=\${MY_PTMP:-/lfs/h2/emc/ptmp}";
+      $my_stmp="export MY_STMP=\${MY_STMP:-/lfs/h2/emc/stmp}";
+   }
 
    #---------------------------------------
    #
@@ -235,11 +242,26 @@
    print "\n";
 
 
-   my $account = "export ACCOUNT=\${ACCOUNT:-fv3-cpu}";
-   if( $machine ne "hera" ) {
-      $account = "export ACCOUNT=\${ACCOUNT:-}";
+   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 $project = "export PROJECT=\${PROJECT:-GDAS-T2O}";
+   if( $machine eq "wcoss2" ){
+      $project = "export PROJECT=\${PROJECT:-GDAS-DEV}";
+   } elsif( $machine ne "wcoss" && $machine ne "cray" && $machine ne "wcoss_d" ) {
+      $project="export PROJECT=";
    }
 
+   my $job_queue="export JOB_QUEUE=";
+   if( $machine eq "cray" || $machine eq "wcoss2" ) {
+      $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}";
+   }
 
    #------------------------------------------------------------
    #
@@ -256,6 +278,12 @@
       elsif( $_ =~ "ACCOUNT=" ) {
          print $out "$account\n";
       }
+      elsif( $_ =~ "PROJECT=" ) {
+         print $out "$project\n";
+      }
+      elsif( $_ =~ "JOB_QUEUE=" ) {
+         print $out "$job_queue\n";
+      }
       elsif( $_ =~ "CONMON_TANKDIR=" ) {
          print $out "$my_tankdir\n";
       }

diff --git a/util/Conventional_Monitor/build_ConMon_cmake.sh b/util/Conventional_Monitor/build_ConMon_cmake.sh
@@ -39,6 +39,9 @@ elif [[ -d /scratch1 ]] ; then
 elif [[ -d /work ]]; then
     . $MODULESHOME/init/sh
     target=orion
+elif [[ -d /lfs && -d /dfs ]]; then
+    . $MODULESHOME/init/bash
+    target=wcoss2
 else
     echo "unknown target = $target"
     exit 9
@@ -66,33 +69,31 @@ fi
 #  Verify this is a supported machine
 #---------------------------------------------------           
 
-if [[ ${target} = "hera"  || ${target} = "wcoss_c"  \
-      || ${target} = "wcoss_d" || ${target} = "orion" ]]; then
-   echo Building nwprod executables on ${target}
-   echo
-
-
-   #-------------------------------------
-   #  load modules 
-   #-------------------------------------
-   if [ $target = wcoss_d ]; then
-      module purge
-      module use -a $dir_modules
-      module load modulefile.ProdGSI.$target
-   elif [ $target = wcoss -o $target = gaea ]; then
-      module purge
-      module load $dir_modules/modulefile.ProdGSI.$target
-   elif [ $target = hera -o $target = orion ]; then
-      module purge
-      module use $dir_modules
-      module load modulefile.ProdGSI.$target
-   elif [ $target = cheyenne ]; then
-      module purge
-      source $dir_modules/modulefile.ProdGSI.$target
-   elif [ $target = wcoss_c ]; then
-      module purge
-      module load $dir_modules/modulefile.ProdGSI.$target
-   fi
+echo Building nwprod executables on ${target}
+echo
+
+
+#-------------------------------------
+#  load modules 
+#-------------------------------------
+if [ $target = wcoss_d -o $target = wcoss2 ]; then
+   module purge
+   module use -a $dir_modules
+   module load modulefile.ProdGSI.$target
+elif [ $target = wcoss -o $target = gaea ]; then
+   module purge
+   module load $dir_modules/modulefile.ProdGSI.$target
+elif [ $target = hera -o $target = orion ]; then
+   module purge
+   module use $dir_modules
+   module load modulefile.ProdGSI.$target
+elif [ $target = cheyenne ]; then
+   module purge
+   source $dir_modules/modulefile.ProdGSI.$target
+elif [ $target = wcoss_c ]; then
+   module purge
+   module load $dir_modules/modulefile.ProdGSI.$target
+fi
 
 
    #-------------------------------------
@@ -129,10 +130,6 @@ if [[ ${target} = "hera"  || ${target} = "wcoss_c"  \
       cp $file $C_IG_EXEC/.
    done
 
-else
-   echo ${machine} is not supported 
-fi
-
 
 set +x
 

diff --git a/util/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/util/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
@@ -237,6 +237,10 @@ if [ -s $cnvstat  -a -s $pgrbf00 -a -s $pgrbf06 ]; then
          $SUB -A $ACCOUNT --ntasks=1 --time=00:30:00 \
 		-p service -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
 		${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
+
+      elif [[ $MY_MACHINE = "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
+		-l select=1:mem=5000M ${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
       fi
 
    else

diff --git a/util/Conventional_Monitor/get_hostname.pl b/util/Conventional_Monitor/get_hostname.pl
@@ -26,7 +26,9 @@
    elsif( -d "/scratch1" ) {
       $machine = "hera";
    }
-
+   elsif( -d "/lfs/h2" ) {
+      $machine = "wcoss2";
+   }
 
    print "$machine";
 

diff --git a/util/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh b/util/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh
@@ -57,6 +57,10 @@ set -ax
    elif [[ $MY_MACHINE = "hera" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
 		-p service -J ${jobname} -o ${logfile} ${plot_hist}
+
+   elif [[ $MY_MACHINE = "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
+                -l select=1:mem=500M ${plot_hist}
    fi
 
 
@@ -78,6 +82,10 @@ set -ax
    elif [[ $MY_MACHINE = "hera" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
 		-p service -J ${jobname} -o ${logfile} ${plot_horz}
+
+   elif [[ $MY_MACHINE = "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
+                -l select=1:mem=500M ${plot_horz}
    fi
 
 
@@ -99,6 +107,10 @@ set -ax
    elif [[ $MY_MACHINE = "hera" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
 	     -p service -J ${jobname} -o ${logfile} ${plot_horz_uv}
+
+   elif [[ $MY_MACHINE = "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
+                -l select=1:mem=500M ${plot_horz_uv}
    fi
 
 

diff --git a/util/Conventional_Monitor/image_gen/ush/mk_time_vert.sh b/util/Conventional_Monitor/image_gen/ush/mk_time_vert.sh
@@ -37,6 +37,10 @@ echo "--> mk_time_vert.sh"
    elif [[ $MY_MACHINE == "hera" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:15:00 \
                 -p service -J ${jobname} -o ${logfile} ${pltfile}
+
+   elif [[ $MY_MACHINE = "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 -N ${jobname} \
+                -l select=1:mem=200M ${pltfile}
    fi
 
    #--------------------------------------------
@@ -72,7 +76,18 @@ echo "--> mk_time_vert.sh"
          ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \
                 -p service -J ${jobname} -o ${logfile} ${pltfile}
 
+      elif [[ $MY_MACHINE = "wcoss2" ]]; then
+
+         if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
+            walltime="01:30:00"
+         else
+            walltime="50:00"
+         fi
+
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=${walltime}\
+	       	-N ${jobname} -l select=1:mem=200M ${pltfile}
       fi
+
    done
 
 
@@ -102,6 +117,10 @@ echo "--> mk_time_vert.sh"
 
          ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \
                 -p service -J ${jobname} -o ${logfile} ${pltfile}
+
+      elif [[ $MY_MACHINE == "wcoss2" ]]; then
+        $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 \
+	       	-N ${jobname} -l select=1:mem=500M ${pltfile}
 
       fi
    done

diff --git a/util/Conventional_Monitor/image_gen/ush/plot_horz.sh b/util/Conventional_Monitor/image_gen/ush/plot_horz.sh
@@ -13,8 +13,6 @@
 
 
    rc=0
-   pdy=`echo $PDATE|cut -c1-8`
-   cyc=`echo $PDATE|cut -c9-10`
    hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist
 
    export xsize=x800
@@ -184,20 +182,16 @@
 
          $GRADS -blc "run plothorz_${dtype}.gs" 
 
-         mkdir -p ${C_IMGNDIR}/pngs/horz/${CYC}
+	 outdir=${C_IMGNDIR}/pngs/horz
+         mkdir -p ${outdir}
 
          img_files=`ls *.png`
          for imgf in $img_files; do
             newf=`echo $imgf | sed -e "s/\./.${PDATE}./g"`
             cp $imgf $newf
-            mv $newf ${C_IMGNDIR}/pngs/horz/.
+            mv $newf ${outdir}/.
          done
 
-#         if [[ $CONMON_SUFFIX != "v16rt2" ]]; then
-#            mv -f *.png ${C_IMGNDIR}/pngs/horz/${CYC}/.
-#         fi
-
-
       done      ### dtype loop 
 
    done      ### type loop

diff --git a/util/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh b/util/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh
@@ -10,8 +10,6 @@ set -ax
    echo "--> plot_horz_uv.sh"
 
    rc=0
-   pdy=`echo $PDATE|cut -c1-8`
-   cyc=`echo $PDATE|cut -c9-10`
    hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist
    export savedir=${hh_tankdir}
 
@@ -175,21 +173,15 @@ set -ax
          ${GRADS} -blc "run plothorz_${dtype}.gs"
 
 
-         outdir=${C_IMGNDIR}/pngs/horz/${CYC}
+         outdir=${C_IMGNDIR}/pngs/horz
          mkdir -p ${outdir}
 
          img_files=`ls *.png`
          for imgf in $img_files; do
             newf=`echo $imgf | sed -e "s/\./.${PDATE}./g"`
-            cp $imgf $newf
-            mv $newf ${C_IMGNDIR}/pngs/horz/.
+	    cp $imgf ${C_IMGNDIR}/pngs/horz/${newf}
          done
 
-         if [[ $CONMON_SUFFIX != "v16rt2" ]]; then
-            mv -f  *.png ${outdir}/.
-         fi
-
-
       done      ### dtype loop 
    done      ### type loop