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.

Sign up for GitHub

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

bugfix/feature_global_det_rev4 #437

Merged
merged 3 commits into from
Feb 7, 2024
Merged

bugfix/feature_global_det_rev4 #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ee6067
Move defining of output paths
malloryprow Feb 6, 2024
59d8597
Merge branch 'develop' into bugfix/feature_global_det_rev4
malloryprow Feb 6, 2024
f5f8db4
Merge branch 'develop' into bugfix/feature_global_det_rev4
malloryprow Feb 7, 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
26 changes: 13 additions & 13 deletions ush/global_det/global_det_atmos_stats_grid2grid_create_anomaly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@
input_file = gda_util.format_filler(
file_format, valid_date_dt, init_date_dt, str(fhr), {}
)
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
output_COMOUT_file = os.path.join(
COMOUT, RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
if gda_util.check_file_exists_size(input_file):
input_file_data = netcdf.Dataset(input_file)
input_file_data_var_list = list(input_file_data.variables.keys())
Expand All @@ -80,19 +93,6 @@
if 'CLIMO_MEAN_'+var_level in input_var:
climo_var_level = input_var
if climo_var_level in input_file_data_var_list:
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
output_COMOUT_file = os.path.join(
COMOUT, RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
if os.path.exists(output_COMOUT_file):
gda_util.copy_file(output_COMOUT_file, output_DATA_file)
make_anomaly_output_file = False
Expand Down
27 changes: 14 additions & 13 deletions ush/global_det/global_det_atmos_stats_grid2grid_create_wind_shear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,25 @@
input_file = gda_util.format_filler(
file_format, valid_date_dt, init_date_dt, str(fhr), {}
)
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'), MODEL,
VERIF_CASE, 'wind_shear_'+VERIF_TYPE+'_'+job_name
+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
output_COMOUT_file = os.path.join(
COMOUT, RUN+'.'+valid_date_dt.strftime('%Y%m%d'), MODEL,
VERIF_CASE, 'wind_shear_'+VERIF_TYPE+'_'+job_name
+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)

if gda_util.check_file_exists_size(input_file):
input_file_data = netcdf.Dataset(input_file)
input_file_data_var_list = list(input_file_data.variables.keys())
if all(v in input_file_data_var_list \
for v in req_var_level_list):
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'), MODEL,
VERIF_CASE, 'wind_shear_'+VERIF_TYPE+'_'+job_name
+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
output_COMOUT_file = os.path.join(
COMOUT, RUN+'.'+valid_date_dt.strftime('%Y%m%d'), MODEL,
VERIF_CASE, 'wind_shear_'+VERIF_TYPE+'_'+job_name
+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.nc'
)
if os.path.exists(output_COMOUT_file):
gda_util.copy_file(output_COMOUT_file, output_DATA_file)
make_wind_shear_output_file = False
Expand Down
28 changes: 14 additions & 14 deletions ush/global_det/global_det_atmos_stats_grid2obs_create_anomaly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@
input_file = gda_util.format_filler(
file_format, valid_date_dt, init_date_dt, str(fhr), {}
)
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.stat'
)
output_COMOUT_file = os.path.join(
COMOUT,
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.stat'
)
if gda_util.check_file_exists_size(input_file):
output_DATA_file = os.path.join(
DATA, VERIF_CASE+'_'+STEP, 'METplus_output',
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.stat'
)
output_COMOUT_file = os.path.join(
COMOUT,
RUN+'.'+valid_date_dt.strftime('%Y%m%d'),
MODEL, VERIF_CASE, 'anomaly_'+VERIF_TYPE+'_'
+job_name+'_init'+init_date_dt.strftime('%Y%m%d%H')+'_'
+'fhr'+str(fhr).zfill(3)+'.stat'
)
if os.path.exists(output_COMOUT_file):
make_anomaly_output_file = False
gda_util.copy_file(output_COMOUT_file, output_DATA_file)
Expand Down