Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/subseasonal METplus rc1 changes #621

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b52559b
Change run.ver
Dec 10, 2024
eb74bea
Make changes to MPR columns
Dec 10, 2024
30a6412
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 12, 2024
4369a18
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 13, 2024
b8679a8
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 13, 2024
fa82d74
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 16, 2024
fa0df3b
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 16, 2024
07eb9d1
Replace Alicia's email with Lydia's in MAILTO
ShannonShields-NOAA Dec 18, 2024
5d0bd2f
Replace Alicia's email with Lydia's in MAILTO
ShannonShields-NOAA Dec 18, 2024
9414802
Replace Alicia's email with Lydia's in MAILTO
ShannonShields-NOAA Dec 18, 2024
49e3ccb
Change anom to temp and adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
9b1bdab
Change anom to temp and adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
694ed30
Adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
78cf127
Adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
823431b
Remove shared from #PBS place
ShannonShields-NOAA Dec 18, 2024
3fcda18
Remove shared from #PBS place
ShannonShields-NOAA Dec 18, 2024
a52c015
Remove shared from #PBS place
ShannonShields-NOAA Dec 18, 2024
e7ecdc5
Remove shared from #PBS place
ShannonShields-NOAA Dec 18, 2024
104e4bb
Adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
8543716
Adjust ncpus to match drivers
ShannonShields-NOAA Dec 18, 2024
998ab1b
Fix task names to match ecf scripts
ShannonShields-NOAA Dec 19, 2024
8b42ebd
Merge branch 'NOAA-EMC:develop' into feature/subseasonal_METplus_rc1_…
ShannonShields-NOAA Dec 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export SITE=$(cat /etc/cluster_name)
export KEEPDATA=YES
export SENDMAIL=YES

export MAILTO='alicia.bentley@noaa.gov,shannon.shields@noaa.gov'
export MAILTO='lydia.b.stefanova@noaa.gov,shannon.shields@noaa.gov'

export USER=$USER
export ACCOUNT=VERF-DEV
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export SITE=$(cat /etc/cluster_name)
export KEEPDATA=YES
export SENDMAIL=YES

export MAILTO='alicia.bentley@noaa.gov,shannon.shields@noaa.gov'
export MAILTO='lydia.b.stefanova@noaa.gov,shannon.shields@noaa.gov'

export USER=$USER
export ACCOUNT=VERF-DEV
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export SITE=$(cat /etc/cluster_name)
export KEEPDATA=YES
export SENDMAIL=YES

export MAILTO='alicia.bentley@noaa.gov,shannon.shields@noaa.gov'
export MAILTO='lydia.b.stefanova@noaa.gov,shannon.shields@noaa.gov'

export USER=$USER
export ACCOUNT=VERF-DEV
Expand Down
8 changes: 4 additions & 4 deletions ecf/defs/evs-nco.def
Original file line number Diff line number Diff line change
Expand Up @@ -2194,9 +2194,9 @@ suite evs_nco
family plots
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts/plots'
family subseasonal
task jevs_subseasonal_grid2obs_PrepBufr_plots_90days
task jevs_subseasonal_grid2obs_prepbufr_plots_90days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2obs_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2obs_stats == complete
task jevs_subseasonal_grid2obs_PrepBufr_plots_31days
task jevs_subseasonal_grid2obs_prepbufr_plots_31days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2obs_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2obs_stats == complete
task jevs_subseasonal_grid2grid_sst_plots_90days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2grid_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2grid_stats == complete
Expand All @@ -2210,9 +2210,9 @@ suite evs_nco
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2grid_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2grid_stats == complete
task jevs_subseasonal_grid2grid_pres_lvls_plots_31days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2grid_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2grid_stats == complete
task jevs_subseasonal_grid2grid_anom_plots_90days
task jevs_subseasonal_grid2grid_temp_plots_90days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2grid_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2grid_stats == complete
task jevs_subseasonal_grid2grid_anom_plots_31days
task jevs_subseasonal_grid2grid_temp_plots_31days
trigger :TIME >= 1900 and ../../../../12/evs/stats/subseasonal/jevs_cfs_subseasonal_grid2grid_stats == complete and ../../../../12/evs/stats/subseasonal/jevs_gefs_subseasonal_grid2grid_stats == complete
endfamily
family mesoscale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=48:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=120:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,7 +46,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=48
export nproc=120
export USE_CFP=YES
export NET=evs
export RUN=atmos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=48:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=120:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,7 +46,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=48
export nproc=120
export USE_CFP=YES
export NET=evs
export RUN=atmos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=34:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=34:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=34:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=34:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=30:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=30:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=30:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=30:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#PBS -N evs_subseasonal_grid2grid_anom_plots_31days
#PBS -N evs_subseasonal_grid2grid_temp_plots_31days
#PBS -j oe
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=32:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=80:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,13 +46,13 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=32
export nproc=80
export USE_CFP=YES
export NET=evs
export RUN=atmos
export MODELNAME="gefs cfs"
export VERIF_CASE=grid2grid
export VERIF_TYPE=anom
export VERIF_TYPE=temp
export NDAYS=31
export DAYS=32
export config=$HOMEevs/parm/evs_config/${COMPONENT}/config.${model}.${COMPONENT}.${VERIF_CASE}.${STEP}.${VERIF_TYPE}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#PBS -N evs_subseasonal_grid2grid_anom_plots_90days
#PBS -N evs_subseasonal_grid2grid_temp_plots_90days
#PBS -j oe
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=32:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=80:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,13 +46,13 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=32
export nproc=80
export USE_CFP=YES
export NET=evs
export RUN=atmos
export MODELNAME="gefs cfs"
export VERIF_CASE=grid2grid
export VERIF_TYPE=anom
export VERIF_TYPE=temp
export NDAYS=90
export DAYS=91
export config=$HOMEevs/parm/evs_config/${COMPONENT}/config.${model}.${COMPONENT}.${VERIF_CASE}.${STEP}.${VERIF_TYPE}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=32:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=80:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,7 +46,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=32
export nproc=80
export USE_CFP=YES
export NET=evs
export RUN=atmos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l place=vscatter:shared,select=1:ncpus=32:ompthreads=1:mem=35GB
#PBS -l place=vscatter,select=1:ncpus=80:ompthreads=1:mem=35GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -46,7 +46,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=32
export nproc=80
export USE_CFP=YES
export NET=evs
export RUN=atmos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
'VX_MASK', 'INTERP_MTHD', 'INTERP_PNTS', 'FCST_THRESH', 'OBS_THRESH',
'COV_THRESH', 'ALPHA', 'LINE_TYPE', 'TOTAL', 'INDEX', 'OBS_SID',
'OBS_LAT', 'OBS_LON', 'OBS_LVL', 'OBS_ELV', 'FCST', 'OBS', 'OBS_QC',
'CLIMO_MEAN', 'CLIMO_STDEV', 'CLIMO_CDF'
'OBS_CLIMO_MEAN', 'OBS_CLIMO_STDEV', 'OBS_CLIMO_CDF',
'FCST_CLIMO_MEAN', 'FCST_CLIMO_STDEV'
]

# Create fcst and obs anomaly data
Expand Down Expand Up @@ -144,13 +145,14 @@
input_file_var_level_df['OBS'].values, dtype=float
)
climo_mean_var_level = np.array(
input_file_var_level_df['CLIMO_MEAN'].values, dtype=float
input_file_var_level_df['OBS_CLIMO_MEAN'].values, dtype=float
)
fcst_anom_var_level = fcst_var_level - climo_mean_var_level
obs_anom_var_level = obs_var_level - climo_mean_var_level
output_file_df = pd.DataFrame.copy(input_file_var_level_df,
deep=True)
output_file_df['CLIMO_MEAN'] = 'NA'
output_file_df['OBS_CLIMO_MEAN'] = 'NA'
output_file_df['FCST_CLIMO_MEAN'] = 'NA'
output_file_df['FCST'] = fcst_anom_var_level
output_file_df['OBS'] = obs_anom_var_level
output_file_df['FCST_VAR'] = f"{var1_obs_name}_ANOM"
Expand Down
16 changes: 13 additions & 3 deletions ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_avg.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
'VX_MASK', 'INTERP_MTHD', 'INTERP_PNTS', 'FCST_THRESH', 'OBS_THRESH',
'COV_THRESH', 'ALPHA', 'LINE_TYPE', 'TOTAL', 'INDEX', 'OBS_SID',
'OBS_LAT', 'OBS_LON', 'OBS_LVL', 'OBS_ELV', 'FCST', 'OBS', 'OBS_QC',
'CLIMO_MEAN', 'CLIMO_STDEV', 'CLIMO_CDF'
'OBS_CLIMO_MEAN', 'OBS_CLIMO_STDEV', 'OBS_CLIMO_CDF',
'FCST_CLIMO_MEAN', 'FCST_CLIMO_STDEV'
]

# Create Days 6-10 average files
Expand Down Expand Up @@ -207,7 +208,13 @@
if job_name == 'Days6_10Avg_Temp2m':
all_days_avg_obtype_sid_vx_mask_climo_mean = (
np.array(
all_days_avg_obtype_sid_vx_mask_df['CLIMO_MEAN']\
all_days_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN']\
.values, dtype=float
).mean()
)
all_days_avg_obtype_sid_vx_mask_fclimo_mean = (
np.array(
all_days_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN']\
.values, dtype=float
).mean()
)
Expand Down Expand Up @@ -245,9 +252,12 @@
all_days_avg_obtype_sid_vx_mask_obs_mean
)
if job_name == 'Days6_10Avg_Temp2m':
days_avg_obtype_sid_vx_mask_df['CLIMO_MEAN'] = str(
days_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN'] = str(
all_days_avg_obtype_sid_vx_mask_climo_mean
)
days_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN'] = str(
all_days_avg_obtype_sid_vx_mask_fclimo_mean
)
days_avg_df_list.append(
days_avg_obtype_sid_vx_mask_df
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
'VX_MASK', 'INTERP_MTHD', 'INTERP_PNTS', 'FCST_THRESH', 'OBS_THRESH',
'COV_THRESH', 'ALPHA', 'LINE_TYPE', 'TOTAL', 'INDEX', 'OBS_SID',
'OBS_LAT', 'OBS_LON', 'OBS_LVL', 'OBS_ELV', 'FCST', 'OBS', 'OBS_QC',
'CLIMO_MEAN', 'CLIMO_STDEV', 'CLIMO_CDF'
'OBS_CLIMO_MEAN', 'OBS_CLIMO_STDEV', 'OBS_CLIMO_CDF',
'FCST_CLIMO_MEAN', 'FCST_CLIMO_STDEV'
]

# Create fcst and obs anomaly data
Expand Down Expand Up @@ -144,13 +145,14 @@
input_file_var_level_df['OBS'].values, dtype=float
)
climo_mean_var_level = np.array(
input_file_var_level_df['CLIMO_MEAN'].values, dtype=float
input_file_var_level_df['OBS_CLIMO_MEAN'].values, dtype=float
)
fcst_anom_var_level = fcst_var_level - climo_mean_var_level
obs_anom_var_level = obs_var_level - climo_mean_var_level
output_file_df = pd.DataFrame.copy(input_file_var_level_df,
deep=True)
output_file_df['CLIMO_MEAN'] = 'NA'
output_file_df['OBS_CLIMO_MEAN'] = 'NA'
output_file_df['FCST_CLIMO_MEAN'] = 'NA'
output_file_df['FCST'] = fcst_anom_var_level
output_file_df['OBS'] = obs_anom_var_level
output_file_df['FCST_VAR'] = f"{var1_obs_name}_ANOM"
Expand Down
16 changes: 13 additions & 3 deletions ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_avg.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
'VX_MASK', 'INTERP_MTHD', 'INTERP_PNTS', 'FCST_THRESH', 'OBS_THRESH',
'COV_THRESH', 'ALPHA', 'LINE_TYPE', 'TOTAL', 'INDEX', 'OBS_SID',
'OBS_LAT', 'OBS_LON', 'OBS_LVL', 'OBS_ELV', 'FCST', 'OBS', 'OBS_QC',
'CLIMO_MEAN', 'CLIMO_STDEV', 'CLIMO_CDF'
'OBS_CLIMO_MEAN', 'OBS_CLIMO_STDEV', 'OBS_CLIMO_CDF',
'FCST_CLIMO_MEAN', 'FCST_CLIMO_STDEV'
]

# Create weekly average files
Expand Down Expand Up @@ -207,7 +208,13 @@
if job_name == 'WeeklyAvg_Temp2m':
all_weekly_avg_obtype_sid_vx_mask_climo_mean = (
np.array(
all_weekly_avg_obtype_sid_vx_mask_df['CLIMO_MEAN']\
all_weekly_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN']\
.values, dtype=float
).mean()
)
all_weekly_avg_obtype_sid_vx_mask_fclimo_mean = (
np.array(
all_weekly_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN']\
.values, dtype=float
).mean()
)
Expand Down Expand Up @@ -245,9 +252,12 @@
all_weekly_avg_obtype_sid_vx_mask_obs_mean
)
if job_name == 'WeeklyAvg_Temp2m':
weekly_avg_obtype_sid_vx_mask_df['CLIMO_MEAN'] = str(
weekly_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN'] = str(
all_weekly_avg_obtype_sid_vx_mask_climo_mean
)
weekly_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN'] = str(
all_weekly_avg_obtype_sid_vx_mask_fclimo_mean
)
weekly_avg_df_list.append(
weekly_avg_obtype_sid_vx_mask_df
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
'VX_MASK', 'INTERP_MTHD', 'INTERP_PNTS', 'FCST_THRESH', 'OBS_THRESH',
'COV_THRESH', 'ALPHA', 'LINE_TYPE', 'TOTAL', 'INDEX', 'OBS_SID',
'OBS_LAT', 'OBS_LON', 'OBS_LVL', 'OBS_ELV', 'FCST', 'OBS', 'OBS_QC',
'CLIMO_MEAN', 'CLIMO_STDEV', 'CLIMO_CDF'
'OBS_CLIMO_MEAN', 'OBS_CLIMO_STDEV', 'OBS_CLIMO_CDF',
'FCST_CLIMO_MEAN', 'FCST_CLIMO_STDEV'
]

# Create fcst and obs anomaly data
Expand Down Expand Up @@ -144,13 +145,14 @@
input_file_var_level_df['OBS'].values, dtype=float
)
climo_mean_var_level = np.array(
input_file_var_level_df['CLIMO_MEAN'].values, dtype=float
input_file_var_level_df['OBS_CLIMO_MEAN'].values, dtype=float
)
fcst_anom_var_level = fcst_var_level - climo_mean_var_level
obs_anom_var_level = obs_var_level - climo_mean_var_level
output_file_df = pd.DataFrame.copy(input_file_var_level_df,
deep=True)
output_file_df['CLIMO_MEAN'] = 'NA'
output_file_df['OBS_CLIMO_MEAN'] = 'NA'
output_file_df['FCST_CLIMO_MEAN'] = 'NA'
output_file_df['FCST'] = fcst_anom_var_level
output_file_df['OBS'] = obs_anom_var_level
output_file_df['FCST_VAR'] = f"{var1_obs_name}_ANOM"
Expand Down
Loading