Merge branch 'feature/dev-wcoss2-resources' of https://github.com/Kat…

…eFriedman-NOAA/global-workflow into feature/dev-wcoss2-resources * 'feature/dev-wcoss2-resources' of https://github.com/KateFriedman-NOAA/global-workflow: Updates from R&D testing WCOSS2 updates from testing in config.resources Resources updates in config.fv3 from WCOSS2 testing Modify default file location for monitor data when using rocoto (NOAA-EMC#1065)
KateFriedman-NOAA · Oct 13, 2022 · df866ad · df866ad
2 parents 835a19a + 1049e50
commit df866ad
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 39 deletions.
diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh
@@ -45,6 +45,10 @@ export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
+CDATEm1c=$($NDATE -06 $CDATE)
+PDYm1c=$(echo $CDATEm1c | cut -c1-8)
+pcyc=$(echo ${CDATEm1c} | cut -c9-10)
+
 export pid=${pid:-$$}
 export jobid=${job}.${pid}
 export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
@@ -107,80 +111,80 @@ fi
 ###############################################################
 echo
 echo "=============== START TO RUN RADMON DATA EXTRACTION ==============="
-if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then
+if [ $VRFYRAD = "YES" -a "${CDUMP}" = "${CDFNL}" -a "${CDATE}" != "${SDATE}" ]; then
 
-    export EXP=$PSLOT
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY"
-    export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
-    export MY_MACHINE=$machine
+    export EXP=${PSLOT}
+    export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
+    export TANKverf_rad="${TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}"
+    export TANKverf_radM1="${TANKverf}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}"
+    export MY_MACHINE=${machine}
 
-    $VRFYRADSH
+    ${VRFYRADSH}
 
 fi
 
 
 ###############################################################
 echo
 echo "=============== START TO RUN OZMON DATA EXTRACTION ==============="
-if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then
+if [ "${VRFYOZN}" = "YES" -a "${CDUMP}" = "${CDFNL}" -a "${CDATE}" != "${SDATE}" ]; then
 
-    export EXP=$PSLOT
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY"
-    export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1"
-    export MY_MACHINE=$machine
+    export EXP=${PSLOT}
+    export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
+    export TANKverf_ozn="${TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}"
+    export TANKverf_oznM1="${TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}"
+    export MY_MACHINE=${machine}
 
-    $VRFYOZNSH
+    ${VRFYOZNSH}
 
 fi
 
 
 ###############################################################
 echo
 echo "=============== START TO RUN MINMON ==============="
-if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then
+if [ "${VRFYMINMON}" = "YES" -a "${CDATE}" != "${SDATE}" ]; then
 
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY"
-    export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
-    export MY_MACHINE=$machine
+    export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
+    export M_TANKverfM0="${M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}"
+    export M_TANKverfM1="${M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}"
+    export MY_MACHINE=${machine}
 
-    $VRFYMINSH
+    ${VRFYMINSH}
 
 fi
 
 
 ################################################################################
 echo
 echo "=============== START TO RUN CYCLONE TRACK VERIFICATION ==============="
-if [ $VRFYTRAK = "YES" ]; then
+if [ ${VRFYTRAK} = "YES" ]; then
 
     export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}
 
-    $TRACKERSH  
+    ${TRACKERSH}
 fi
 
 
 ################################################################################
 echo
 echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION ==============="
-if [ $VRFYGENESIS = "YES" -a $CDUMP = "gfs" ]; then
-    $GENESISSH
+if [ ${VRFYGENESIS} = "YES" -a "${CDUMP}" = "gfs" ]; then
+    ${GENESISSH}
 fi
 
 
 ################################################################################
 echo
 echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION (FSU) ==============="
-if [ $VRFYFSU = "YES" -a $CDUMP = "gfs" ]; then
-    $GENESISFSU
+if [ ${VRFYFSU} = "YES" -a "${CDUMP}" = "gfs" ]; then
+    ${GENESISFSU}
 fi
 
 
 ###############################################################
 # Force Exit out cleanly
-if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi
+if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf "${DATAROOT}" ; fi
 
 
 exit 0
diff --git a/parm/config/config.fv3 b/parm/config/config.fv3
@@ -85,7 +85,7 @@ case $case_in in
         export layout_y=6
         export layout_x_gfs=4
         export layout_y_gfs=6
-        export nth_fv3=2
+        export nth_fv3=1
         export nth_fv3_gfs=2
         export cdmbgwd="0.23,1.5,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
@@ -105,7 +105,7 @@ case $case_in in
         export nth_fv3=2
         export nth_fv3_gfs=${nth_fv3_gfs_s2sw:-2}
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
-        export WRITE_GROUP=1
+        export WRITE_GROUP=2
         export WRTTASK_PER_GROUP=64
 	if [[ "$WRTTASK_PER_GROUP" -gt "$npe_node_max" ]]; then export WRTTASK_PER_GROUP=$npe_node_max ; fi
         export WRITE_GROUP_GFS=${WRITE_GROUP_GFS_s2sw:-2}
@@ -176,11 +176,11 @@ export kchunk3d=1
 
 # Determine whether to use parallel NetCDF based on resolution
 case ${case_in} in
-  "C48" | "C96" | "C192")
+  "C48" | "C96" | "C192" | "C384")
     export OUTPUT_FILETYPE_ATM="netcdf"
     export OUTPUT_FILETYPE_SFC="netcdf"
     ;;
-  "C384" | "C768" | "C1152" | "C3072")
+  "C768" | "C1152" | "C3072")
     export OUTPUT_FILETYPE_ATM="netcdf_parallel"
     export OUTPUT_FILETYPE_SFC="netcdf_parallel"
     ;;

diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -294,7 +294,7 @@ elif [ ${step} = "analdiag" ]; then
     export wtime_analdiag="00:10:00"
     export npe_analdiag=96             # Should be at least twice npe_ediag
     export nth_analdiag=1
-    export npe_node_analdiag=${npe_node_max}
+    export npe_node_analdiag=${npe_analdiag}
     if [[ "${npe_node_analdiag}" -gt "${npe_node_max}" ]]; then export npe_node_analdiag=${npe_node_max} ; fi
     export memory_analdiag="48GB"
 
@@ -518,7 +518,9 @@ elif [ ${step} = "echgres" ]; then
     export npe_echgres=3
     export nth_echgres=${npe_node_max}
     export npe_node_echgres=1
-    export memory_echgres="200GB"
+    if [[ "$machine" = "WCOSS2" ]]; then
+      export memory_echgres="200GB"
+    fi
 
 elif [ ${step} = "init" ]; then
 
@@ -634,7 +636,10 @@ elif [ ${step} = "eupd" ]; then
     elif [ ${CASE} = "C384" ]; then
       export npe_eupd=270
       export nth_eupd=2
-      if [[ "$machine" = "HERA" ]]; then
+      if [[ "$machine" = "WCOSS2" ]]; then
+        export npe_eupd=315
+        export nth_eupd=14
+      elif [[ "$machine" = "HERA" ]]; then
         export nth_eupd=8
       fi
       if [[ ${machine} = "S4" ]]; then
@@ -660,6 +665,7 @@ elif [ ${step} = "ecen" ]; then
     if [[ ${CASE} = "C384" || ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then export nth_ecen=2; fi
     export npe_node_ecen=$(echo "${npe_node_max} / ${nth_ecen}" | bc)
     export nth_cycle=${nth_ecen}
+    export npe_node_cycle=$(echo "${npe_node_max} / ${nth_cycle}" | bc)
     export is_exclusive=True
 
 elif [ ${step} = "esfc" ]; then
@@ -689,6 +695,9 @@ elif [ ${step} = "epos" ]; then
     export wtime_epos="00:15:00"
     export npe_epos=80
     export nth_epos=4
+    if [[ "$machine" == "HERA" ]]; then
+      export nth_epos=6
+    fi
     export npe_node_epos=$(echo "${npe_node_max} / ${nth_epos}" | bc)
     export is_exclusive=True
 

diff --git a/ush/minmon_xtrct_costs.pl b/ush/minmon_xtrct_costs.pl
@@ -208,7 +208,7 @@
       #--------------------------
       #  move files to $M_TANKverf
       #--------------------------
-      my $tankdir = $ENV{"M_TANKverf"};
+      my $tankdir = $ENV{"M_TANKverfM0"};
       if(! -d $tankdir) {
          system( "mkdir -p $tankdir" );
       } 

diff --git a/ush/minmon_xtrct_gnorms.pl b/ush/minmon_xtrct_gnorms.pl
@@ -414,10 +414,8 @@ sub updateGnormData {
       #--------------------------
       #  move files to $M_TANKverf
       #--------------------------
-      my $tankdir = $ENV{"M_TANKverf"};
-      print "M_TANKverf = $tankdir \n";
+      my $tankdir = $ENV{"M_TANKverfM0"};
       if(! -d $tankdir) {
-         print "making $tankdir\n";
          system( "mkdir -p $tankdir" );
       }
 

diff --git a/ush/minmon_xtrct_reduct.pl b/ush/minmon_xtrct_reduct.pl
@@ -72,7 +72,7 @@
    #----------------------------
    #  copy outfile to $M_TANKverf
    #----------------------------
-   my $tankdir = $ENV{"M_TANKverf"};
+   my $tankdir = $ENV{"M_TANKverfM0"};
    if(! -d $tankdir) {
       system( "mkdir -p $tankdir" );
    }