From 62aba90ecc56462734bd301c175cd1cca1e7d5e3 Mon Sep 17 00:00:00 2001 From: SamiraArdani-NOAA Date: Tue, 3 Mar 2026 20:19:32 +0000 Subject: [PATCH 1/3] Moved $STEP in script names and contents. --- ...e_grid2obs_plots.sh => jevs_plots_glwu_wave_grid2obs.sh} | 6 +++--- ...ave_grid2obs_prep.sh => jevs_prep_glwu_wave_grid2obs.sh} | 6 +++--- ...e_grid2obs_stats.sh => jevs_stats_glwu_wave_grid2obs.sh} | 6 +++--- ...grid2obs_plots.ecf => jevs_plots_glwu_wave_grid2obs.ecf} | 4 ++-- ...e_grid2obs_prep.ecf => jevs_prep_glwu_wave_grid2obs.ecf} | 4 ++-- ...grid2obs_stats.ecf => jevs_stats_glwu_wave_grid2obs.ecf} | 4 ++-- jobs/{JEVS_GLWU_PLOTS => JEVS_PLOTS_GLWU} | 2 +- jobs/{JEVS_GLWU_PREP => JEVS_PREP_GLWU} | 2 +- jobs/{JEVS_GLWU_STATS => JEVS_STATS_GLWU} | 2 +- ..._grid2obs_plots.sh => exevs_plots_glwu_wave_grid2obs.sh} | 2 +- ...ve_grid2obs_prep.sh => exevs_prep_glwu_wave_grid2obs.sh} | 2 +- ..._grid2obs_stats.sh => exevs_stats_glwu_wave_grid2obs.sh} | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) rename dev/drivers/scripts/plots/glwu/{jevs_glwu_wave_grid2obs_plots.sh => jevs_plots_glwu_wave_grid2obs.sh} (94%) rename dev/drivers/scripts/prep/glwu/{jevs_glwu_wave_grid2obs_prep.sh => jevs_prep_glwu_wave_grid2obs.sh} (94%) rename dev/drivers/scripts/stats/glwu/{jevs_glwu_wave_grid2obs_stats.sh => jevs_stats_glwu_wave_grid2obs.sh} (94%) rename ecf/scripts/plots/glwu/{jevs_glwu_wave_grid2obs_plots.ecf => jevs_plots_glwu_wave_grid2obs.ecf} (95%) rename ecf/scripts/prep/glwu/{jevs_glwu_wave_grid2obs_prep.ecf => jevs_prep_glwu_wave_grid2obs.ecf} (95%) rename ecf/scripts/stats/glwu/{jevs_glwu_wave_grid2obs_stats.ecf => jevs_stats_glwu_wave_grid2obs.ecf} (95%) rename jobs/{JEVS_GLWU_PLOTS => JEVS_PLOTS_GLWU} (96%) rename jobs/{JEVS_GLWU_PREP => JEVS_PREP_GLWU} (96%) rename jobs/{JEVS_GLWU_STATS => JEVS_STATS_GLWU} (96%) rename scripts/plots/glwu/{exevs_glwu_wave_grid2obs_plots.sh => exevs_plots_glwu_wave_grid2obs.sh} (99%) rename scripts/prep/glwu/{exevs_glwu_wave_grid2obs_prep.sh => exevs_prep_glwu_wave_grid2obs.sh} (98%) rename scripts/stats/glwu/{exevs_glwu_wave_grid2obs_stats.sh => exevs_stats_glwu_wave_grid2obs.sh} (99%) diff --git a/dev/drivers/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.sh b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh similarity index 94% rename from dev/drivers/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.sh rename to dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh index ccb7dba744..182dbff745 100755 --- a/dev/drivers/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.sh +++ b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh @@ -1,4 +1,4 @@ -#PBS -N jevs_glwu_wave_grid2obs_plots +#PBS -N jevs_plots_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q dev @@ -53,7 +53,7 @@ export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d} export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_glwu_wave_grid2obs_plots} +export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) @@ -61,7 +61,7 @@ export SITE=$(cat /etc/cluster_name) ############################################################ # CALL executable job script here ############################################################ -${HOMEevs}/jobs/JEVS_GLWU_PLOTS +${HOMEevs}/jobs/JEVS_PLOTS_GLWU ######################################################################### # Purpose: This job creates the plots for the NFCENS wave model diff --git a/dev/drivers/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.sh b/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh similarity index 94% rename from dev/drivers/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.sh rename to dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh index bc940e12a0..319b6604d9 100644 --- a/dev/drivers/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.sh +++ b/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh @@ -1,4 +1,4 @@ -#PBS -N jevs_glwu_wave_grid2obs_prep +#PBS -N jevs_prep_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q dev @@ -57,7 +57,7 @@ export OUTPUTROOT=/lfs/h2/emc/vpppg/noscrub/$USER export COMIN=/lfs/h2/emc/vpppg/noscrub/${USER}/${NET}/${evs_ver_2d} export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d}/${STEP}/${COMPONENT}/${RUN} -export job=${PBS_JOBNAME:-jevs_glwu_wave_grid2obs_prep} +export job=${PBS_JOBNAME:-jevs_prep_glwu_wave_grid2obs} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) @@ -65,7 +65,7 @@ export SITE=$(cat /etc/cluster_name) ############################################################ # CALL executable job script here ############################################################# -$HOMEevs/jobs/JEVS_GLWU_PREP +$HOMEevs/jobs/JEVS_PREP_GLWU ####################################################################### # Purpose: This does the prep work for the GLWU wave model diff --git a/dev/drivers/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.sh b/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh similarity index 94% rename from dev/drivers/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.sh rename to dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh index 20504582d9..c25c2a0af7 100644 --- a/dev/drivers/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.sh +++ b/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh @@ -1,4 +1,4 @@ -#PBS -N jevs_glwu_wave_grid2obs_stats +#PBS -N jevs_stats_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q dev @@ -57,7 +57,7 @@ export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d}/${STEP}/${COMPONENT} export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_glwu_wave_grid2obs_stats} +export job=${PBS_JOBNAME:-jevs_stats_glwu_wave_grid2obs} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) @@ -66,7 +66,7 @@ export SITE=$(cat /etc/cluster_name) ## CALL executable job script here ############################################################# -$HOMEevs/jobs/JEVS_GLWU_STATS +$HOMEevs/jobs/JEVS_STATS_GLWU ###################################################################### # Purpose: The job and task scripts work together to create stat diff --git a/ecf/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.ecf b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf similarity index 95% rename from ecf/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.ecf rename to ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf index 1ecf92bb79..0ccf7e13e4 100644 --- a/ecf/scripts/plots/glwu/jevs_glwu_wave_grid2obs_plots.ecf +++ b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf @@ -1,4 +1,4 @@ -#PBS -N evs_glwu_wave_grid2obs_plots +#PBS -N evs_plots_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q %QUEUE% @@ -50,7 +50,7 @@ export gather='yes' ############################################################ # Execute j-job ############################################################ -$HOMEevs/jobs/JEVS_GLWU_PLOTS +$HOMEevs/jobs/JEVS_PLOTS_GLWU if [ $? -ne 0 ]; then ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" ecflow_client --abort diff --git a/ecf/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.ecf b/ecf/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.ecf similarity index 95% rename from ecf/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.ecf rename to ecf/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.ecf index bbfe3a9d16..1c724639a0 100644 --- a/ecf/scripts/prep/glwu/jevs_glwu_wave_grid2obs_prep.ecf +++ b/ecf/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.ecf @@ -1,4 +1,4 @@ -#PBS -N evs_glwu_wave_grid2obs_prep +#PBS -N evs_prep_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q %QUEUE% @@ -46,7 +46,7 @@ export MODELNAME=glwu ############################################################ # Execute j-job ############################################################ -$HOMEevs/jobs/JEVS_GLWU_PREP +$HOMEevs/jobs/JEVS_PREP_GLWU if [ $? -ne 0 ]; then ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" ecflow_client --abort diff --git a/ecf/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.ecf b/ecf/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.ecf similarity index 95% rename from ecf/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.ecf rename to ecf/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.ecf index 01bc425caa..ec20a7304a 100644 --- a/ecf/scripts/stats/glwu/jevs_glwu_wave_grid2obs_stats.ecf +++ b/ecf/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.ecf @@ -1,4 +1,4 @@ -#PBS -N evs_glwu_wave_grid2obs_stats +#PBS -N evs_stats_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q %QUEUE% @@ -51,7 +51,7 @@ export OMP_NUM_THREADS=1 ############################################################ # Execute j-job ############################################################ -$HOMEevs/jobs/JEVS_GLWU_STATS +$HOMEevs/jobs/JEVS_STATS_GLWU if [ $? -ne 0 ]; then ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" ecflow_client --abort diff --git a/jobs/JEVS_GLWU_PLOTS b/jobs/JEVS_PLOTS_GLWU similarity index 96% rename from jobs/JEVS_GLWU_PLOTS rename to jobs/JEVS_PLOTS_GLWU index 030f09c74b..9fa5c72b0c 100755 --- a/jobs/JEVS_GLWU_PLOTS +++ b/jobs/JEVS_PLOTS_GLWU @@ -68,7 +68,7 @@ mkdir -p ${COMOUTplots} #################################### # Execute the script #################################### -$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${COMPONENT}_${RUN}_${VERIF_CASE}_${STEP}.sh +$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}.sh export err=$?; err_chk msg="JOB $job HAS COMPLETED NORMALLY." diff --git a/jobs/JEVS_GLWU_PREP b/jobs/JEVS_PREP_GLWU similarity index 96% rename from jobs/JEVS_GLWU_PREP rename to jobs/JEVS_PREP_GLWU index ccb41cd09b..3caaf03f99 100755 --- a/jobs/JEVS_GLWU_PREP +++ b/jobs/JEVS_PREP_GLWU @@ -71,7 +71,7 @@ mkdir -p ${COMOUT}.${INITDATE}/${MODELNAME}/${VERIF_CASE} #################################### # Execute the script #################################### -$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${COMPONENT}_${RUN}_${VERIF_CASE}_${STEP}.sh +$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}.sh export err=$?; err_chk msg="JOB $job HAS COMPLETED NORMALLY." diff --git a/jobs/JEVS_GLWU_STATS b/jobs/JEVS_STATS_GLWU similarity index 96% rename from jobs/JEVS_GLWU_STATS rename to jobs/JEVS_STATS_GLWU index cfe0ee4d28..1dd1bb09b4 100755 --- a/jobs/JEVS_GLWU_STATS +++ b/jobs/JEVS_STATS_GLWU @@ -71,7 +71,7 @@ mkdir -p ${COMOUT} ${COMOUTsmall} ${COMOUTfinal} #################################### # Execute the script #################################### -$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${COMPONENT}_${RUN}_${VERIF_CASE}_${STEP}.sh +$HOMEevs/scripts/${STEP}/${COMPONENT}/exevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}.sh export err=$?; err_chk msg="JOB $job HAS COMPLETED NORMALLY." diff --git a/scripts/plots/glwu/exevs_glwu_wave_grid2obs_plots.sh b/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh similarity index 99% rename from scripts/plots/glwu/exevs_glwu_wave_grid2obs_plots.sh rename to scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh index 8f1b7c0f6e..dedb671301 100755 --- a/scripts/plots/glwu/exevs_glwu_wave_grid2obs_plots.sh +++ b/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh @@ -1,6 +1,6 @@ #!/bin/bash ################################################################################## -# Name of Script: exevs_glwu_wave_grid2obs_plots.sh +# Name of Script: exevs_plots_glwu_wave_grid2obs.sh # Samira Ardani / samira.ardani@noaa.gov # Purpose of Script: Run the grid2obs plots for GLWU wave model # diff --git a/scripts/prep/glwu/exevs_glwu_wave_grid2obs_prep.sh b/scripts/prep/glwu/exevs_prep_glwu_wave_grid2obs.sh similarity index 98% rename from scripts/prep/glwu/exevs_glwu_wave_grid2obs_prep.sh rename to scripts/prep/glwu/exevs_prep_glwu_wave_grid2obs.sh index f9278166a8..dd88837c80 100755 --- a/scripts/prep/glwu/exevs_glwu_wave_grid2obs_prep.sh +++ b/scripts/prep/glwu/exevs_prep_glwu_wave_grid2obs.sh @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################### -# Name of Script: exevs_glwu_wave_grid2obs_prep.sh +# Name of Script: exevs_prep_glwu_wave_grid2obs.sh # Purpose of Script: To pre-process glwu forecast data into the same spatial # and temporal scales as validation data. # Author: Samira Ardani (samira.ardani@noaa.gov) diff --git a/scripts/stats/glwu/exevs_glwu_wave_grid2obs_stats.sh b/scripts/stats/glwu/exevs_stats_glwu_wave_grid2obs.sh similarity index 99% rename from scripts/stats/glwu/exevs_glwu_wave_grid2obs_stats.sh rename to scripts/stats/glwu/exevs_stats_glwu_wave_grid2obs.sh index 0cd0f8b1a7..da363df109 100755 --- a/scripts/stats/glwu/exevs_glwu_wave_grid2obs_stats.sh +++ b/scripts/stats/glwu/exevs_stats_glwu_wave_grid2obs.sh @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################### -# Name of Script: exevs_glwu_stats.sh +# Name of Script: exevs_stats_glwu_wave_grid2obs.sh # Purpose of Script: To create stat files for GLWU forecasts verified with # NDBC buoy data using MET/METplus. # Developer: Samira Ardani (samira.ardani@noaa.gov) From 49415b6b9cc134fd994e52af7a32732c74bc0d92 Mon Sep 17 00:00:00 2001 From: SamiraArdani-NOAA Date: Tue, 3 Mar 2026 21:14:42 +0000 Subject: [PATCH 2/3] Separated last31days and last90days plots. --- ...vs_plots_glwu_wave_grid2obs_last31days.sh} | 5 +- ...evs_plots_glwu_wave_grid2obs_last90days.sh | 70 +++++++++++++++++++ ...s_plots_glwu_wave_grid2obs_last31days.ecf} | 3 +- ...vs_plots_glwu_wave_grid2obs_last90days.ecf | 63 +++++++++++++++++ .../glwu/exevs_plots_glwu_wave_grid2obs.sh | 2 +- ush/glwu/evs_wave_leadaverages.sh | 3 +- ush/glwu/evs_wave_timeseries.sh | 3 +- 7 files changed, 141 insertions(+), 8 deletions(-) rename dev/drivers/scripts/plots/glwu/{jevs_plots_glwu_wave_grid2obs.sh => jevs_plots_glwu_wave_grid2obs_last31days.sh} (93%) create mode 100755 dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh rename ecf/scripts/plots/glwu/{jevs_plots_glwu_wave_grid2obs.ecf => jevs_plots_glwu_wave_grid2obs_last31days.ecf} (94%) create mode 100644 ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.ecf diff --git a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh similarity index 93% rename from dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh rename to dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh index 182dbff745..1a54419de1 100755 --- a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.sh +++ b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh @@ -1,4 +1,4 @@ -#PBS -N jevs_plots_glwu_wave_grid2obs +#PBS -N jevs_plots_glwu_wave_grid2obs_last31days #PBS -j oe #PBS -S /bin/bash #PBS -q dev @@ -49,11 +49,12 @@ export DATAROOT=/lfs/h2/emc/stmp/${USER}/evs_test/$envir/tmp export OUTPUTROOT=/lfs/h2/emc/ptmp/$USER export COMIN=/lfs/h2/emc/vpppg/noscrub/${USER}/${NET}/${evs_ver_2d} export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d} +export EVAL_PERIOD="last31days" export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs} +export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs_last31days} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) diff --git a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh new file mode 100755 index 0000000000..d6ff26c419 --- /dev/null +++ b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh @@ -0,0 +1,70 @@ +#PBS -N jevs_plots_glwu_wave_grid2obs_last90days +#PBS -j oe +#PBS -S /bin/bash +#PBS -q dev +#PBS -A VERF-DEV +#PBS -l walltime=00:15:00 +#PBS -l place=vscatter,select=1:ncpus=128:mem=500G +#PBS -l debug=true + +set -x + +export HOMEevs=/lfs/h2/emc/vpppg/noscrub/$USER/EVS + +export MODELNAME=glwu +export OBTYPE=NDBC_STANDARD +export NET=evs +export COMPONENT=glwu +export STEP=plots +export RUN=wave +export VERIF_CASE=grid2obs + +############################################################ +# read version file and set model_ver +############################################################ +versionfile=$HOMEevs/versions/run.ver +. $versionfile +export model_ver=$glwu_ver + +############################################################ +# Load modules +############################################################ +module reset +module load prod_envir/${prod_envir_ver} +source $HOMEevs/dev/modulefiles/${COMPONENT}/${COMPONENT}_${STEP}.sh + +evs_ver_2d=$(echo $evs_ver | cut -d'.' -f1-2) + +############################################################ +# set some variables +############################################################ +export envir=prod +export SENDCOM=${SENDCOM:-YES} +export SENDECF=${SENDECF:-YES} +export SENDDBN=${SENDDBN:-NO} +export KEEPDATA=${KEEPDATA:-NO} + +## developers directories +export DATAROOT=/lfs/h2/emc/stmp/${USER}/evs_test/$envir/tmp +export OUTPUTROOT=/lfs/h2/emc/ptmp/$USER +export COMIN=/lfs/h2/emc/vpppg/noscrub/${USER}/${NET}/${evs_ver_2d} +export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d} +export EVAL_PERIOD="last90days" + +export run_mpi='yes' +export gather='yes' + +export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs_last90days} +export jobid=$job.${PBS_JOBID:-$$} +export TMPDIR=$DATAROOT +export SITE=$(cat /etc/cluster_name) + +############################################################ +# CALL executable job script here +############################################################ +${HOMEevs}/jobs/JEVS_PLOTS_GLWU + +######################################################################### +# Purpose: This job creates the plots for the GLWU wave model +# Author: Samira ardani (samira.ardani@noaa.gov) +######################################################################### diff --git a/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.ecf similarity index 94% rename from ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf rename to ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.ecf index 0ccf7e13e4..70c5b849a9 100644 --- a/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs.ecf +++ b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.ecf @@ -1,4 +1,4 @@ -#PBS -N evs_plots_glwu_wave_grid2obs +#PBS -N evs_plots_glwu_wave_grid2obs_last31days #PBS -j oe #PBS -S /bin/bash #PBS -q %QUEUE% @@ -46,6 +46,7 @@ export MODELNAME=glwu export OBTYPE=NDBC_STANDARD export run_mpi='yes' export gather='yes' +export EVAL_PERIOD="last31days" ############################################################ # Execute j-job diff --git a/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.ecf b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.ecf new file mode 100644 index 0000000000..9971b680ac --- /dev/null +++ b/ecf/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.ecf @@ -0,0 +1,63 @@ +#PBS -N evs_plots_glwu_wave_grid2obs_last90days +#PBS -j oe +#PBS -S /bin/bash +#PBS -q %QUEUE% +#PBS -A %PROJ%-%PROJENVIR% +#PBS -l walltime=00:15:00 +#PBS -l place=vscatter:exclhost,select=1:ncpus=128:mem=500G +#PBS -l debug=true + +export model=evs +%include +%include + +############################################################ +# Load modules +############################################################ +set -x +export COMPONENT=glwu +export STEP=plots + +module load PrgEnv-intel/${PrgEnvintel_ver} +module load intel/${intel_ver} +module load ve/evs/${ve_evs_ver} +module load gsl/${gsl_ver} +module load libjpeg/${libjpeg_ver} +module load grib_util/${grib_util_ver} +module load wgrib2/${wgrib2_ver} +module load cray-pals/${craypals_ver} +module load cfp/${cfp_ver} +module load met/${met_ver} +module load metplus/${metplus_ver} +module list + +############################################################ +# Specify environment variables +############################################################ +if [ -n "%VHR:%" ]; then + export vhr=${vhr:-%VHR:%} +else + export vhr=00 +fi +export NET=evs +export RUN=wave +export VERIF_CASE=grid2obs +export MODELNAME=glwu +export OBTYPE=NDBC_STANDARD +export run_mpi='yes' +export gather='yes' +export EVAL_PERIOD="last90days" + +############################################################ +# Execute j-job +############################################################ +$HOMEevs/jobs/JEVS_PLOTS_GLWU +if [ $? -ne 0 ]; then + ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" + ecflow_client --abort + exit +fi + +%include +%manual +%end diff --git a/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh b/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh index dedb671301..947c9a3cab 100755 --- a/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh +++ b/scripts/plots/glwu/exevs_plots_glwu_wave_grid2obs.sh @@ -131,8 +131,8 @@ export err=$?; err_chk ##################### # Gather all the files ####################### +periods=$(echo "$EVAL_PERIOD" | tr '[:lower:]' '[:upper:]') -periods='LAST31DAYS LAST90DAYS' if [ $gather = yes ] ; then echo "copying all images into one directory" nc=$(ls ${DATA}/images/*.png | wc -l | awk '{print $1}') diff --git a/ush/glwu/evs_wave_leadaverages.sh b/ush/glwu/evs_wave_leadaverages.sh index 2559504170..7a4ebc4c22 100755 --- a/ush/glwu/evs_wave_leadaverages.sh +++ b/ush/glwu/evs_wave_leadaverages.sh @@ -12,8 +12,7 @@ # set up plot variables -periods='LAST31DAYS LAST90DAYS' - +periods=$(echo "$EVAL_PERIOD" | tr '[:lower:]' '[:upper:]') inithours='01 07 13 19' fhrs='000,024,048,072,096,120,144' # fhr is hardcoded below! diff --git a/ush/glwu/evs_wave_timeseries.sh b/ush/glwu/evs_wave_timeseries.sh index 4881a8f800..76df02aa93 100755 --- a/ush/glwu/evs_wave_timeseries.sh +++ b/ush/glwu/evs_wave_timeseries.sh @@ -12,8 +12,7 @@ # set up plot variables -periods='LAST31DAYS LAST90DAYS' - +periods=$(echo "$EVAL_PERIOD" | tr '[:lower:]' '[:upper:]') inithours='01 07 13 19' fhrs='000 024 048 072 096 120 144' wave_vars='HTSGW WIND' From cade17e0dbabef036a247aad1cd7038e60ddfb0c Mon Sep 17 00:00:00 2001 From: Samira Ardani Date: Fri, 6 Mar 2026 16:57:34 +0000 Subject: [PATCH 3/3] Defined jobnames with variables, fixed a name. --- .../plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh | 2 +- .../plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh | 2 +- dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh | 4 ++-- .../scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh index 1a54419de1..a4f8716f4b 100755 --- a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh +++ b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last31days.sh @@ -54,7 +54,7 @@ export EVAL_PERIOD="last31days" export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs_last31days} +export job=${PBS_JOBNAME:-jevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}_${EVAL_PERIOD}} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) diff --git a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh index d6ff26c419..d2b529d9d8 100755 --- a/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh +++ b/dev/drivers/scripts/plots/glwu/jevs_plots_glwu_wave_grid2obs_last90days.sh @@ -54,7 +54,7 @@ export EVAL_PERIOD="last90days" export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_plots_glwu_wave_grid2obs_last90days} +export job=${PBS_JOBNAME:-jevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}_${EVAL_PERIOD}} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) diff --git a/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh b/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh index 319b6604d9..6c57c62e12 100644 --- a/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh +++ b/dev/drivers/scripts/prep/glwu/jevs_prep_glwu_wave_grid2obs.sh @@ -1,4 +1,4 @@ -#PBS -N jevs_prep_wave_grid2obs +#PBS -N jevs_prep_glwu_wave_grid2obs #PBS -j oe #PBS -S /bin/bash #PBS -q dev @@ -57,7 +57,7 @@ export OUTPUTROOT=/lfs/h2/emc/vpppg/noscrub/$USER export COMIN=/lfs/h2/emc/vpppg/noscrub/${USER}/${NET}/${evs_ver_2d} export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d}/${STEP}/${COMPONENT}/${RUN} -export job=${PBS_JOBNAME:-jevs_prep_glwu_wave_grid2obs} +export job=${PBS_JOBNAME:-jevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name) diff --git a/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh b/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh index c25c2a0af7..f314d0aa4f 100644 --- a/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh +++ b/dev/drivers/scripts/stats/glwu/jevs_stats_glwu_wave_grid2obs.sh @@ -57,7 +57,7 @@ export COMOUT=${OUTPUTROOT}/${NET}/${evs_ver_2d}/${STEP}/${COMPONENT} export run_mpi='yes' export gather='yes' -export job=${PBS_JOBNAME:-jevs_stats_glwu_wave_grid2obs} +export job=${PBS_JOBNAME:-jevs_${STEP}_${COMPONENT}_${RUN}_${VERIF_CASE}} export jobid=$job.${PBS_JOBID:-$$} export TMPDIR=$DATAROOT export SITE=$(cat /etc/cluster_name)