diff --git a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_cfs_prep.sh b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_cfs_prep.sh index dc338bb7eb..a41b186a2c 100755 --- a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_cfs_prep.sh +++ b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_cfs_prep.sh @@ -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 diff --git a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_gefs_prep.sh b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_gefs_prep.sh index 9bf5b76f30..5957e0dd4e 100755 --- a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_gefs_prep.sh +++ b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_gefs_prep.sh @@ -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 diff --git a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_obs_prep.sh b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_obs_prep.sh index 0356d22380..42d4061775 100755 --- a/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_obs_prep.sh +++ b/dev/drivers/scripts/prep/subseasonal/jevs_subseasonal_obs_prep.sh @@ -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 diff --git a/ecf/defs/evs-nco.def b/ecf/defs/evs-nco.def index 0868002997..ade47e1178 100644 --- a/ecf/defs/evs-nco.def +++ b/ecf/defs/evs-nco.def @@ -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 @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_31days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_31days.ecf index 4cca55de69..414b135a3c 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_31days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_31days.ecf @@ -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 @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_90days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_90days.ecf index 4cd567542e..0465fa15e1 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_90days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_pres_lvls_plots_90days.ecf @@ -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 @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_31days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_31days.ecf index 395fcc0096..5dc0db630d 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_31days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_31days.ecf @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_90days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_90days.ecf index fe9dda2c22..c353f7a324 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_90days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sea_ice_plots_90days.ecf @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_31days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_31days.ecf index 4e195ccacc..298473e2ca 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_31days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_31days.ecf @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_90days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_90days.ecf index e5f3b3f1c0..bbc412bff7 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_90days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_sst_plots_90days.ecf @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_31days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_31days.ecf similarity index 91% rename from ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_31days.ecf rename to ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_31days.ecf index 97671386c2..6e99aa4066 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_31days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_31days.ecf @@ -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 @@ -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} diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_90days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_90days.ecf similarity index 91% rename from ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_90days.ecf rename to ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_90days.ecf index 00304549c4..247d0ce053 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_anom_plots_90days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2grid_temp_plots_90days.ecf @@ -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 @@ -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} diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_31days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_31days.ecf index 612bf4b9ca..4eed4473ee 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_31days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_31days.ecf @@ -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 @@ -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 diff --git a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_90days.ecf b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_90days.ecf index 535801501f..18f53ac300 100755 --- a/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_90days.ecf +++ b/ecf/scripts/plots/subseasonal/jevs_subseasonal_grid2obs_prepbufr_plots_90days.ecf @@ -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 @@ -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 diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_anomaly.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_anomaly.py index 57b5bd0c06..ad59baf9ae 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_anomaly.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_anomaly.py @@ -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 @@ -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" diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_avg.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_avg.py index bf219df275..4335b35d66 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_avg.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_days6_10_avg.py @@ -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 @@ -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() ) @@ -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 ) diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_anomaly.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_anomaly.py index 8b9ed57d45..cdd261bc02 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_anomaly.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_anomaly.py @@ -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 @@ -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" diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_avg.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_avg.py index e27ab151d5..5990cb0ecc 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_avg.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_weekly_avg.py @@ -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 @@ -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() ) @@ -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 ) diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_anomaly.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_anomaly.py index 0a526b3229..2b9e1657e5 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_anomaly.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_anomaly.py @@ -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 @@ -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" diff --git a/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_avg.py b/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_avg.py index 03f14cfc80..a6c1889171 100644 --- a/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_avg.py +++ b/ush/subseasonal/subseasonal_stats_grid2obs_create_weeks3_4_avg.py @@ -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 Weeks 3-4 average files @@ -207,7 +208,13 @@ if job_name == 'Weeks3_4Avg_Temp2m': all_weeks_avg_obtype_sid_vx_mask_climo_mean = ( np.array( - all_weeks_avg_obtype_sid_vx_mask_df['CLIMO_MEAN']\ + all_weeks_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN']\ + .values, dtype=float + ).mean() + ) + all_weeks_avg_obtype_sid_vx_mask_fclimo_mean = ( + np.array( + all_weeks_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN']\ .values, dtype=float ).mean() ) @@ -245,9 +252,12 @@ all_weeks_avg_obtype_sid_vx_mask_obs_mean ) if job_name == 'Weeks3_4Avg_Temp2m': - weeks_avg_obtype_sid_vx_mask_df['CLIMO_MEAN'] = str( + weeks_avg_obtype_sid_vx_mask_df['OBS_CLIMO_MEAN'] = str( all_weeks_avg_obtype_sid_vx_mask_climo_mean ) + weeks_avg_obtype_sid_vx_mask_df['FCST_CLIMO_MEAN'] = str( + all_weeks_avg_obtype_sid_vx_mask_fclimo_mean + ) weeks_avg_df_list.append( weeks_avg_obtype_sid_vx_mask_df ) diff --git a/versions/run.ver b/versions/run.ver index 6f5df084a5..900c6288e7 100644 --- a/versions/run.ver +++ b/versions/run.ver @@ -20,11 +20,11 @@ export jasper_ver=2.0.25 export libfabric_ver=1.11.0.0. export libjpeg_ver=9c export libpng_ver=1.6.37 -export met_ver=12.0.0-beta5 -export metcalcpy_ver=3.0.0-beta5 -export metdataio_ver=3.0.0-beta5 -export metplotpy_ver=3.0.0-beta5 -export metplus_ver=6.0.0-beta5 +export met_ver=12.0.0-rc1 +export metcalcpy_ver=3.0.0-rc1 +export metdataio_ver=3.0.0-rc1 +export metplotpy_ver=3.0.0-rc1 +export metplus_ver=6.0.0-rc1 export nco_ver=5.0.6 export netcdf_ver=4.7.4 export PrgEnvintel_ver=8.3.3