Merge branch 'develop' into para

NOAA-EMC · Feb 21, 2024 · da92efc · da92efc
2 parents 8cad503 + 86d2de2
commit da92efc
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/dev/drivers/scripts/prep/global_ens/jevs_global_ens_atmos_prep.sh b/dev/drivers/scripts/prep/global_ens/jevs_global_ens_atmos_prep.sh
@@ -4,7 +4,7 @@
 #PBS -q dev
 #PBS -A EVS-DEV
 #PBS -l walltime=06:00:00
-#PBS -l place=vscatter,select=1:ncpus=83:mem=350GB
+#PBS -l place=vscatter:exclhost,select=2:ncpus=42:mem=500GB
 #PBS -l debug=true
 
 set -x

diff --git a/ecf/scripts/prep/global_ens/jevs_global_ens_atmos_prep.ecf b/ecf/scripts/prep/global_ens/jevs_global_ens_atmos_prep.ecf
@@ -4,7 +4,7 @@
 #PBS -q %QUEUE%
 #PBS -A %PROJ%-%PROJENVIR%
 #PBS -l walltime=06:25:00
-#PBS -l place=vscatter:exclhost,select=2:ncpus=84:mem=500GB
+#PBS -l place=vscatter:exclhost,select=2:ncpus=42:mem=500GB
 #PBS -l debug=true
 
 export model=evs

diff --git a/scripts/stats/cam/exevs_href_precip_stats.sh b/scripts/stats/cam/exevs_href_precip_stats.sh
@@ -21,7 +21,6 @@ export run_mpi=${run_mpi:-'yes'}
 export verif_precip=${verif_precip:-'yes'}
 export verif_snowfall=${verif_snowfall:-'yes'}
 if [ "$verif_precip" = "no" ] && [ "$verif_snowfall" = "no" ] ; then
-    export gather='no'
     export prepare='no'
 fi
 export prepare=${prepare:-'yes'}
@@ -65,7 +64,7 @@ fi
 
 # Build sub-jobs for snowfall
 if [ $verif_snowfall = yes ] ; then
- $USHevs/cam/evs_href_snowfall.sh
+ source $USHevs/cam/evs_href_snowfall.sh
  export err=$?; err_chk
  cat ${DATA}/run_all_href_snowfall_poe.sh >> run_all_precip_poe.sh
 fi
@@ -90,6 +89,9 @@ fi
 #******************************************************************
 # Run gather job to combine the small stats to form a big stat file
 #******************************************************************
+if [ "$verif_precip" = "no" ] && [ "$verif_snowfall" = "no" ] ; then
+    export gather='no'
+fi
 if [ $gather = yes ] ; then
   $USHevs/cam/evs_href_gather.sh precip
   export err=$?; err_chk

diff --git a/ush/cam/cam_prep_precip_create_job_script.py b/ush/cam/cam_prep_precip_create_job_script.py
@@ -91,7 +91,7 @@
                             for infile in glob.glob(infiles):
                                 job_cmd_list.append(
                                     f"if [ -f \"{infile}\" ]; then cp \"{infile}\""
-                                    + f" \"{COMOUTobs}/.\"; else echo \"Input {OBSNAME}"
+                                    + f" \"{COMOUTobs}/.\"; else echo \"WARNING: Input {OBSNAME}"
                                     + f" file does not exist: {infile} ..."
                                     + f" Continuing to the next valid datetime.\"; fi"
                                 )
@@ -179,7 +179,7 @@
                                 + f" else echo \"Output {OBSNAME} file already"
                                 + f" exists: {COMOUTobs}/{outfilename} ..."
                                 + f" Continuing to the next valid datetime.\"; fi"
-                                + f" else echo \"Input {OBSNAME}"
+                                + f" else echo \"WARNING: Input {OBSNAME}"
                                 + f" file does not exist: {infilepath} ..."
                                 + f" Continuing to the next valid datetime.\"; fi"
                             )

diff --git a/ush/cam/evs_href_gather.sh b/ush/cam/evs_href_gather.sh
@@ -12,7 +12,13 @@ modnam=href
 verify=$1
 
 if [ $verify = precip ] ; then
- MODELS='HREF HREF_MEAN HREF_PMMN HREF_LPMM HREF_AVRG  HREF_PROB HREF_EAS HREF_SNOW'
+ if [ "$verif_precip" = "no" ] ; then
+  MODELS='HREF_SNOW'
+ elif [ "$verif_snowfall" = "no" ] ; then
+  MODELS='HREF HREF_MEAN HREF_PMMN HREF_LPMM HREF_AVRG  HREF_PROB HREF_EAS'
+ else
+  MODELS='HREF HREF_MEAN HREF_PMMN HREF_LPMM HREF_AVRG  HREF_PROB HREF_EAS HREF_SNOW'
+ fi
 elif [ $verify = grid2obs ] ; then
  MODELS='HREF HREF_MEAN HREF_PROB'
 elif [ $verify = spcoutlook ] ; then

diff --git a/ush/cam/evs_href_snowfall.sh b/ush/cam/evs_href_snowfall.sh
@@ -25,6 +25,7 @@ if [ ! -s $COMSNOW/${VDATE}/wgrbbul/nohrsc_snowfall/sfav2_CONUS_24h_${VDATE}12_g
   fi
   echo "WARNING:  No NOHRSC data $COMSNOW/${VDATE}/wgrbbul/nohrsc_snowfall/sfav2_CONUS_24h_${VDATE}12_grid184.grb2 available for ${VDATE}! Terminate snowfall verification"
   export write_job_cards=no
+  export verif_snowfall=no
 fi
 
 if [ "$write_job_cards" = "yes" ] ; then

diff --git a/ush/global_ens/evs_global_ens_atmos_prep.sh b/ush/global_ens/evs_global_ens_atmos_prep.sh
@@ -266,7 +266,7 @@ if [ $run_mpi = yes ] ; then
 
  if [ -s run_get_all_gens_atmos_poe.sh ] ; then
    chmod +x run_get_all_gens_atmos_poe.sh 
-   mpiexec  -n 83 -ppn 83 --cpu-bind verbose,core cfp ${DATA}/run_get_all_gens_atmos_poe.sh
+   mpiexec  -n 84 -ppn 42 --cpu-bind verbose,core cfp ${DATA}/run_get_all_gens_atmos_poe.sh
    export err=$?; err_chk
  fi
 

diff --git a/ush/mesoscale/evs_check_sref_files.sh b/ush/mesoscale/evs_check_sref_files.sh
@@ -16,7 +16,7 @@ missing=0
 for vhr in 00 06 12 18 ; do
   if [ ! -s $COMINobsproc/gfs.${vday}/${vhr}/atmos/gfs.t${vhr}z.prepbufr ] ; then
     missing=$((missing + 1 ))
-    echo $COMINobsproc/gfs.${vday}/${vhr}/atmos/gfs.t${vhr}z.prepbufr is missing
+    echo "WARNING: $COMINobsproc/gfs.${vday}/${vhr}/atmos/gfs.t${vhr}z.prepbufr is missing"
   fi
 done
 
@@ -61,7 +61,7 @@ for vhr in 00 03 06 09 12 15 18 21 ; do
 
   if [ ! -s $ccpa ] ; then
       missing=$((missing + 1 ))
-      echo $ccpa is missing
+      echo "WARNING: $ccpa is missing"
   fi
 done
 
@@ -107,7 +107,7 @@ for vhr in  00 06 12 18 ; do #SREF grid2obs validation is by gfs prepbufr
 	if [ -s $sref ] ; then
            sref_mbrs=$((sref_mbrs+1))
         else
-	   echo $sref is missing
+	   echo "WARNING: $sref is missing"
         fi	    
       done
     done

diff --git a/ush/narre/check_files_existing.sh b/ush/narre/check_files_existing.sh
@@ -16,7 +16,7 @@ missing=0
 while [ $vhr -le 23 ] ; do 
   if [ ! -s $COMINobsproc/rap.${vday}/rap.t${vhr}z.prepbufr.tm00.nr ] ; then
     missing=$((missing + 1 ))
-    echo $COMINobsproc/rap.${vday}/rap.t${vhr}z.prepbufr.tm00.nr is missing 
+    echo "WARNING: $COMINobsproc/rap.${vday}/rap.t${vhr}z.prepbufr.tm00.nr is missing" 
   fi
   vhr=$((vhr+1))
 done
@@ -54,7 +54,7 @@ for grid in 130 242 ; do
     if [ -s $narre_mean ] ; then
        has_narre=$((has_narre+1))
     else
-       echo $narre_mean is missing 	    
+       echo "WARNING: $narre_mean is missing"
     fi	      
   done