Updating analyses/firewx based on Wei's comments (NOAA-EMC#388)

* Updating items based on Wei's comments * Returning to production setup * Removing config line from ecf script * Updating parm config files for analyses * Changing J-job from ksh to bash so sourcing config file works * Removing export config from ecf files * Updating gather comments * Adding NET=evs to ecf script
LoganDawson-NOAA · Dec 19, 2023 · 71e97b5 · 71e97b5
1 parent a0d17bc
commit 71e97b5
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 32 deletions.
diff --git a/dev/drivers/scripts/plots/analyses/jevs_analyses_grid2obs_plots.sh b/dev/drivers/scripts/plots/analyses/jevs_analyses_grid2obs_plots.sh
@@ -58,9 +58,6 @@ echo $vhr
 
 export MAILTO="perry.shafran@noaa.gov,alicia.bentley@noaa.gov"
 
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
-
 # CALL executable job script here
 $HOMEevs/jobs/JEVS_ANALYSES_PLOTS
 

diff --git a/dev/drivers/scripts/plots/cam/jevs_cam_nam_firewxnest_grid2obs_plots.sh b/dev/drivers/scripts/plots/cam/jevs_cam_nam_firewxnest_grid2obs_plots.sh
@@ -47,9 +47,6 @@ evs_ver_2d=$(echo $evs_ver | cut -d'.' -f1-2)
 export job=${PBS_JOBNAME:-jevs_${MODELNAME}_${VERIF_CASE}_${STEP}}
 export jobid=$job.${PBS_JOBID:-$$}
 
-export config=$HOMEevs/parm/evs_config/cam/config.evs.cam_nam_firewxnest.prod
-source $config
-
 export COMIN=/lfs/h2/emc/vpppg/noscrub/$USER/$NET/$evs_ver_2d
 export COMOUT=/lfs/h2/emc/ptmp/$USER/$NET/$evs_ver_2d/$STEP/$COMPONENT
 

diff --git a/dev/drivers/scripts/stats/analyses/jevs_analyses_rtma_grid2obs_stats.sh b/dev/drivers/scripts/stats/analyses/jevs_analyses_rtma_grid2obs_stats.sh
@@ -60,9 +60,6 @@ export MODELNAME=rtma
 
 export MAILTO="perry.shafran@noaa.gov,alicia.bentley@noaa.gov"
 
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
-
 # CALL executable job script here
 $HOMEevs/jobs/JEVS_ANALYSES_STATS
 

diff --git a/dev/drivers/scripts/stats/analyses/jevs_analyses_rtma_ru_grid2obs_stats.sh b/dev/drivers/scripts/stats/analyses/jevs_analyses_rtma_ru_grid2obs_stats.sh
@@ -60,9 +60,6 @@ export MODELNAME=rtma_ru
 
 export MAILTO="perry.shafran@noaa.gov,alicia.bentley@noaa.gov"
 
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
-
 # CALL executable job script here
 $HOMEevs/jobs/JEVS_ANALYSES_STATS
 

diff --git a/dev/drivers/scripts/stats/analyses/jevs_analyses_urma_grid2obs_stats.sh b/dev/drivers/scripts/stats/analyses/jevs_analyses_urma_grid2obs_stats.sh
@@ -61,9 +61,6 @@ export mod_ver=${urma_ver}
 
 export MAILTO="perry.shafran@noaa.gov,alicia.bentley@noaa.gov"
 
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.urma.prod
-source $config
-
 # CALL executable job script here
 $HOMEevs/jobs/JEVS_ANALYSES_STATS
 

diff --git a/dev/drivers/scripts/stats/cam/jevs_cam_nam_firewxnest_grid2obs_stats.sh b/dev/drivers/scripts/stats/cam/jevs_cam_nam_firewxnest_grid2obs_stats.sh
@@ -49,9 +49,6 @@ export COMOUT=/lfs/h2/emc/vpppg/noscrub/$USER/$NET/$evs_ver_2d/$STEP/$COMPONENT
 
 export MAILTO=${MAILTO:-'perry.shafran@noaa.gov,alicia.bentley@noaa.gov'}
 
-export config=$HOMEevs/parm/evs_config/cam/config.evs.cam_nam_firewxnest.prod
-source $config
-
 # CALL executable job script here
 $HOMEevs/jobs/JEVS_CAM_STATS
 

diff --git a/ecf/scripts/plots/analyses/jevs_analyses_grid2obs_plots.ecf b/ecf/scripts/plots/analyses/jevs_analyses_grid2obs_plots.ecf
@@ -49,8 +49,6 @@ export outid=${outid:-"LL$job"}
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 export COMIN=${COMevs}
 export COMOUT=${COMevs}
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
 export SENDMAIL=YES
 
 ############################################################

diff --git a/ecf/scripts/stats/analyses/jevs_analyses_rtma_grid2obs_stats_vhr_master.ecf b/ecf/scripts/stats/analyses/jevs_analyses_rtma_grid2obs_stats_vhr_master.ecf
@@ -47,8 +47,6 @@ export COMIN=${COMevs}
 export COMOUT=${COMevs}
 export modsys=rtma
 export MODELNAME=rtma
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
 export SENDMAIL=YES
 
 ############################################################

diff --git a/ecf/scripts/stats/analyses/jevs_analyses_rtma_ru_grid2obs_stats_vhr_master.ecf b/ecf/scripts/stats/analyses/jevs_analyses_rtma_ru_grid2obs_stats_vhr_master.ecf
@@ -46,8 +46,6 @@ export COMIN=${COMevs}
 export COMOUT=${COMevs}
 export modsys=rtma
 export MODELNAME=rtma_ru
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.rtma.prod
-source $config
 export SENDMAIL=YES
 
 ############################################################

diff --git a/ecf/scripts/stats/analyses/jevs_analyses_urma_grid2obs_stats_vhr_master.ecf b/ecf/scripts/stats/analyses/jevs_analyses_urma_grid2obs_stats_vhr_master.ecf
@@ -46,8 +46,6 @@ export modsys=urma
 export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
-export config=$HOMEevs/parm/evs_config/analyses/config.evs.urma.prod
-source $config
 export SENDMAIL=YES
 
 ############################################################

diff --git a/ecf/scripts/stats/cam/jevs_cam_nam_firewxnest_grid2obs_stats_vhr_master.ecf b/ecf/scripts/stats/cam/jevs_cam_nam_firewxnest_grid2obs_stats_vhr_master.ecf
@@ -59,8 +59,6 @@ export COMOUT=${COMevs}/${STEP}/${COMPONENT}
 export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
-export config=$HOMEevs/parm/evs_config/${COMPONENT}/config.evs.${COMPONENT}_${MODELNAME}.${envir}
-source $config
 
 ############################################################
 # Execute j-job

diff --git a/ecf/scripts/stats/mesoscale/jevs_mesoscale_sref_precip_stats.ecf b/ecf/scripts/stats/mesoscale/jevs_mesoscale_sref_precip_stats.ecf
@@ -50,6 +50,7 @@ else
 fi
 export OMP_NUM_THREADS=1
 export RUN=atmos
+export NET=evs
 export VERIF_CASE=precip
 export MODELNAME=sref
 export COMIN=${COMevs}

diff --git a/jobs/JEVS_ANALYSES_STATS b/jobs/JEVS_ANALYSES_STATS
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/bash
 
 ########################################
 # Preliminary data setup step

diff --git a/scripts/plots/analyses/exevs_analyses_grid2obs_plots.sh b/scripts/plots/analyses/exevs_analyses_grid2obs_plots.sh
@@ -11,6 +11,9 @@ set -x
 
 # Set up initial directories and initialize variables
 
+export config=$PARMevs/evs_config/$COMPONENT/config.evs.rtma.prod
+source $config
+
 mkdir -p $DATA/plots/logs
 export LOGDIR=$DATA/plots/logs
 export STATDIR=$DATA/stats

diff --git a/scripts/plots/cam/exevs_cam_nam_firewxnest_grid2obs_plots.sh b/scripts/plots/cam/exevs_cam_nam_firewxnest_grid2obs_plots.sh
@@ -2,6 +2,9 @@
 
 set -x
 
+export config=$HOMEevs/parm/evs_config/cam/config.evs.cam_nam_firewxnest.prod
+source $config
+
 export machine=${machine:-"WCOSS2"}
 mkdir -p $DATA/plots
 mkdir -p $DATA/logs

diff --git a/scripts/stats/analyses/exevs_analyses_rtma_grid2obs_stats.sh b/scripts/stats/analyses/exevs_analyses_rtma_grid2obs_stats.sh
@@ -11,6 +11,9 @@ set -x
 
 # Set up initial directories and initialize variables
 
+export config=$PARMevs/evs_config/$COMPONENT/config.evs.rtma.prod
+source $config
+
 mkdir -p $DATA/logs
 mkdir -p $DATA/stat
 export finalstat=$DATA/final
@@ -360,7 +363,7 @@ then
          cpreq -v $finalstat/evs.stats.${regionnest}${typtag}.${RUN}.${VERIF_CASE}.v${VDATE}.stat $COMOUTfinal
        fi
 else    
-       echo "WARNING: NO RTMA OR OBS DATA, or not gather time yet, METplus gather job will not run"
+       echo "Not gather time yet, METplus gather job will not run"
 fi
 
 

diff --git a/scripts/stats/analyses/exevs_analyses_rtma_ru_grid2obs_stats.sh b/scripts/stats/analyses/exevs_analyses_rtma_ru_grid2obs_stats.sh
@@ -12,6 +12,9 @@ set -x
 
 # Set up initial directories and initialize variables
 
+export config=$PARMevs/evs_config/$COMPONENT/config.evs.rtma.prod
+source $config
+
 mkdir -p $DATA/logs
 mkdir -p $DATA/stat
 export finalstat=$DATA/final
@@ -132,7 +135,7 @@ then
        fi
 
 else
-       echo "WARNING: NO RTMA-RU OR OBS DATA, or not gather time yet, METplus gather job will not run"
+       echo "Not gather time yet, METplus gather job will not run"
 fi
 
 log_dir="$DATA/logs/${MODELNAME}${typtag}"

diff --git a/scripts/stats/analyses/exevs_analyses_urma_grid2obs_stats.sh b/scripts/stats/analyses/exevs_analyses_urma_grid2obs_stats.sh
@@ -11,6 +11,9 @@ set -x
 
 # Set up initial directories and initialize variables
 
+export config=$PARMevs/evs_config/$COMPONENT/config.evs.urma.prod
+source $config
+
 mkdir -p $DATA/logs
 mkdir -p $DATA/stat
 export finalstat=$DATA/final
@@ -273,7 +276,7 @@ then
 	 cpreq -v $finalstat/evs.stats.${regionnest}${typtag}.${RUN}.${VERIF_CASE}.v${VDATE}.stat $COMOUTfinal
        fi
 else    
-       echo "WARNING: NO URMA OR OBS DATA, or not gather time yet, METplus gather job will not run"
+       echo "Not gather time yet, METplus gather job will not run"
 fi
 
 log_dir="$DATA/logs/${MODELNAME}${typtag}"

diff --git a/scripts/stats/cam/exevs_cam_nam_firewxnest_grid2obs_stats.sh b/scripts/stats/cam/exevs_cam_nam_firewxnest_grid2obs_stats.sh
@@ -2,6 +2,9 @@
 
 set -x
 
+export config=$HOMEevs/parm/evs_config/cam/config.evs.cam_nam_firewxnest.prod
+source $config
+
 mkdir -p $DATA/logs
 mkdir -p $DATA/stat
 mkdir -p $DATA/statanalysis