diff --git a/ush/global_det/global_det_atmos_stats_grid2grid_create_anomaly.py b/ush/global_det/global_det_atmos_stats_grid2grid_create_anomaly.py index 62a4fce55c..d27bad95fe 100644 --- a/ush/global_det/global_det_atmos_stats_grid2grid_create_anomaly.py +++ b/ush/global_det/global_det_atmos_stats_grid2grid_create_anomaly.py @@ -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()) @@ -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 diff --git a/ush/global_det/global_det_atmos_stats_grid2grid_create_wind_shear.py b/ush/global_det/global_det_atmos_stats_grid2grid_create_wind_shear.py index d5d050e2e7..9c666dea75 100644 --- a/ush/global_det/global_det_atmos_stats_grid2grid_create_wind_shear.py +++ b/ush/global_det/global_det_atmos_stats_grid2grid_create_wind_shear.py @@ -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 diff --git a/ush/global_det/global_det_atmos_stats_grid2obs_create_anomaly.py b/ush/global_det/global_det_atmos_stats_grid2obs_create_anomaly.py index ec89a68e2f..4872c828d7 100644 --- a/ush/global_det/global_det_atmos_stats_grid2obs_create_anomaly.py +++ b/ush/global_det/global_det_atmos_stats_grid2obs_create_anomaly.py @@ -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)