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

Small fixes #313

Merged
merged 7 commits into from
Jul 15, 2024
Merged

Small fixes #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a706b85
Add check for empty cases scenario
justin-richling Jun 24, 2024
e2e2896
Update example case info and scratch locations
justin-richling Jun 24, 2024
d273377
Update tape_recorder.py
justin-richling Jun 24, 2024
f683eeb
Update location of history string arguments
justin-richling Jul 9, 2024
6a2f815
Merge branch 'main' into adf-fixes
justin-richling Jul 9, 2024
d8cc1ac
Merge branch 'main' into adf-fixes
justin-richling Jul 12, 2024
fd97248
Update suggested cvdp location
justin-richling Jul 15, 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
40 changes: 20 additions & 20 deletions config_amwg_default_plots.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ diag_basic_info:
obs_data_loc: /glade/campaign/cgd/amp/amwg/ADF_obs

#Location where re-gridded and interpolated CAM climatology files are stored:
cam_regrid_loc: /glade/scratch/${user}/ADF/regrid
cam_regrid_loc: /glade/derecho/scratch/${user}/ADF/regrid

#Overwrite CAM re-gridded files?
#If false, or missing, then regridding will be skipped for regridded variables
#that already exist in "cam_regrid_loc":
cam_overwrite_regrid: false

#Location where diagnostic plots are stored:
cam_diag_plot_loc: /glade/scratch/${user}/ADF/plots
cam_diag_plot_loc: /glade/derecho/scratch/${user}/ADF/plots

#Location of ADF variable plotting defaults YAML file:
#If left blank or missing, ADF/lib/adf_variable_defaults.yaml will be used
Expand Down Expand Up @@ -139,7 +139,7 @@ diag_cam_climo:
cam_overwrite_climo: false

#Name of CAM case (or CAM run name):
cam_case_name: b.e20.BHIST.f09_g17.20thC.297_05
cam_case_name: b.e23_alpha17f.BLT1850.ne30_t232.098

#Case nickname
#NOTE: if nickname starts with '0' - nickname must be in quotes!
Expand All @@ -149,20 +149,20 @@ diag_cam_climo:

#Location of CAM history (h0) files:
#Example test files
cam_hist_loc: /glade/p/cesm/ADF/${diag_cam_climo.cam_case_name}
cam_hist_loc: /glade/campaign/cgd/amp/amwg/ADF_test_cases/${diag_cam_climo.cam_case_name}

#Location of CAM climatologies (to be created and then used by this script)
cam_climo_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/climo
cam_climo_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/climo

#model year when time series files should start:
#Note: Leaving this entry blank will make time series
# start at earliest available year.
start_year: 1990
start_year: 10

#model year when time series files should end:
#Note: Leaving this entry blank will make time series
# end at latest available year.
end_year: 1999
end_year: 14

#Do time series files exist?
#If True, then diagnostics assumes that model files are already time series.
Expand All @@ -180,7 +180,7 @@ diag_cam_climo:
cam_overwrite_ts: false

#Location where time series files are (or will be) stored:
cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts
cam_ts_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts

#TEM diagnostics
#---------------
Expand All @@ -190,7 +190,7 @@ diag_cam_climo:

#Location where TEM files are stored:
#NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
cam_tem_loc: /glade/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/
cam_tem_loc: /glade/derecho/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/

#Overwrite TEM files, if found?
#If set to false, then TEM creation will be skipped if files are found:
Expand All @@ -207,8 +207,8 @@ diag_cam_baseline_climo:
# Only affects timeseries as everything else uses the created timeseries
# Default:
hist_str: cam.h0
#Calculate cam baseline climatologies?

#Calculate cam baseline climatologies?
#If false, the climatology files will not be created:
calc_cam_climo: true

Expand All @@ -217,7 +217,7 @@ diag_cam_baseline_climo:
cam_overwrite_climo: false

#Name of CAM baseline case:
cam_case_name: b.e20.BHIST.f09_g16.20thC.125.02
cam_case_name: b.e23_alpha17f.BLT1850.ne30_t232.093

#Baseline case nickname
#NOTE: if nickname starts with '0' - nickname must be in quotes!
Expand All @@ -227,20 +227,20 @@ diag_cam_baseline_climo:

#Location of CAM baseline history (h0) files:
#Example test files
cam_hist_loc: /glade/p/cesm/ADF/${diag_cam_baseline_climo.cam_case_name}
cam_hist_loc: /glade/campaign/cgd/amp/amwg/ADF_test_cases/${diag_cam_baseline_climo.cam_case_name}

#Location of baseline CAM climatologies:
cam_climo_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/climo
cam_climo_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/climo

#model year when time series files should start:
#Note: Leaving this entry blank will make time series
# start at earliest available year.
start_year: 1990
start_year: 10

#model year when time series files should end:
#Note: Leaving this entry blank will make time series
# end at latest available year.
end_year: 1999
end_year: 14

#Do time series files need to be generated?
#If True, then diagnostics assumes that model files are already time series.
Expand All @@ -257,7 +257,7 @@ diag_cam_baseline_climo:
cam_overwrite_ts: false

#Location where time series files are (or will be) stored:
cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts
cam_ts_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts

#TEM diagnostics
#---------------
Expand All @@ -267,7 +267,7 @@ diag_cam_baseline_climo:

#Location where TEM files are stored:
#NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
cam_tem_loc: /glade/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/
cam_tem_loc: /glade/derecho/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/

#Overwrite TEM files, if found?
#If set to false, then TEM creation will be skipped if files are found:
Expand All @@ -291,7 +291,7 @@ diag_cvdp_info:
cvdp_codebase_loc: /glade/u/home/asphilli/CESM-diagnostics/CVDP/Release/v5.2.0/

# Location where cvdp codebase will be copied to and diagnostic plots will be stored
cvdp_loc: /glade/scratch/asphilli/ADF-Sandbox/cvdp/ #MUST EDIT!
cvdp_loc: /glade/derecho/scratch/${user}/ADF/cvdp/

# tar up CVDP results?
cvdp_tar: false
Expand Down Expand Up @@ -468,4 +468,4 @@ diag_var_list:
# region_season: <NULL means use annual mean>
# region_variables: <list of variables to try to use; allows for a subset of the total diag variables>

#END OF FILE
#END OF FILE
56 changes: 28 additions & 28 deletions config_cam_baseline_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ diag_basic_info:
obs_data_loc: /glade/campaign/cgd/amp/amwg/ADF_obs

#Location where re-gridded and interpolated CAM climatology files are stored:
cam_regrid_loc: /glade/scratch/${user}/ADF/regrid
cam_regrid_loc: /glade/derecho/scratch/${user}/ADF/regrid

#Overwrite CAM re-gridded files?
#If false, or missing, then regridding will be skipped for regridded variables
#that already exist in "cam_regrid_loc":
cam_overwrite_regrid: false

#Location where diagnostic plots are stored:
cam_diag_plot_loc: /glade/scratch/${user}/ADF/plots
cam_diag_plot_loc: /glade/derecho/scratch/${user}/ADF/plots

#Location of ADF variable plotting defaults YAML file:
#If left blank or missing, ADF/lib/adf_variable_defaults.yaml will be used
Expand Down Expand Up @@ -139,7 +139,7 @@ diag_cam_climo:
cam_overwrite_climo: false

#Name of CAM case (or CAM run name):
cam_case_name: b.e20.BHIST.f09_g17.20thC.297_05
cam_case_name: b.e23_alpha17f.BLT1850.ne30_t232.098

#Case nickname
#NOTE: if nickname starts with '0' - nickname must be in quotes!
Expand All @@ -149,20 +149,20 @@ diag_cam_climo:

#Location of CAM history (h0) files:
#Example test files
cam_hist_loc: /glade/p/cesm/ADF/${diag_cam_climo.cam_case_name}
cam_hist_loc: /glade/campaign/cgd/amp/amwg/ADF_test_cases/${diag_cam_climo.cam_case_name}

#Location of CAM climatologies (to be created and then used by this script)
cam_climo_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/climo
cam_climo_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/climo

#model year when time series files should start:
#Note: Leaving this entry blank will make time series
# start at earliest available year.
start_year: 1990
start_year: 10

#model year when time series files should end:
#Note: Leaving this entry blank will make time series
# end at latest available year.
end_year: 1999
end_year: 14

#Do time series files exist?
#If True, then diagnostics assumes that model files are already time series.
Expand All @@ -180,7 +180,7 @@ diag_cam_climo:
cam_overwrite_ts: false

#Location where time series files are (or will be) stored:
cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts
cam_ts_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts

#TEM diagnostics
#---------------
Expand All @@ -190,7 +190,7 @@ diag_cam_climo:

#Location where TEM files are stored:
#NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
cam_tem_loc: /glade/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/
cam_tem_loc: /glade/derecho/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/

#Overwrite TEM files, if found?
#If set to false, then TEM creation will be skipped if files are found:
Expand All @@ -208,8 +208,8 @@ diag_cam_climo:
#Also please note that config keywords cannot currently be used in list mode.

#cam_case_name:
# - b.e20.BHIST.f09_g17.20thC.297_05
# - b1850.f19_g17.validation_mct.004
# - b.e23_alpha17f.BLT1850.ne30_t232.098
# - b.e23_alpha17f.BLT1850.ne30_t232.095

#Case nickname
#NOTE: if nickname starts with '0' - nickname must be in quotes!
Expand All @@ -228,20 +228,20 @@ diag_cam_climo:
# - false

#cam_hist_loc:
# - /glade/p/cesm/ADF/b.e20.BHIST.f09_g17.20thC.297_05
# - /glade/p/cesm/ADF/b1850.f19_g17.validation_mct.004
# - /glade/campaign/cgd/amp/amwg/ADF_test_cases/b.e23_alpha17f.BLT1850.ne30_t232.098
# - /glade/campaign/cgd/amp/amwg/ADF_test_cases/b.e23_alpha17f.BLT1850.ne30_t232.095

#cam_climo_loc:
# - /some/where/you/want/to/have/climo_files/ #MUST EDIT!
# - /the/same/or/some/other/climo/files/location

#start_year:
# - 1990
# - 90
# - 10
# - 10

#end_year:
# - 1999
# - 99
# - 14
# - 14

#cam_ts_done:
# - false
Expand Down Expand Up @@ -291,8 +291,8 @@ diag_cam_baseline_climo:
# Only affects timeseries as everything else uses the created timeseries
# Default:
hist_str: cam.h0
#Calculate cam baseline climatologies?

#Calculate cam baseline climatologies?
#If false, the climatology files will not be created:
calc_cam_climo: true

Expand All @@ -301,7 +301,7 @@ diag_cam_baseline_climo:
cam_overwrite_climo: false

#Name of CAM baseline case:
cam_case_name: b.e20.BHIST.f09_g16.20thC.125.02
cam_case_name: b.e23_alpha17f.BLT1850.ne30_t232.093

#Baseline case nickname
#NOTE: if nickname starts with '0' - nickname must be in quotes!
Expand All @@ -311,20 +311,20 @@ diag_cam_baseline_climo:

#Location of CAM baseline history (h0) files:
#Example test files
cam_hist_loc: /glade/p/cesm/ADF/${diag_cam_baseline_climo.cam_case_name}
cam_hist_loc: /glade/campaign/cgd/amp/amwg/ADF_test_cases/${diag_cam_baseline_climo.cam_case_name}

#Location of baseline CAM climatologies:
cam_climo_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/climo
cam_climo_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/climo

#model year when time series files should start:
#Note: Leaving this entry blank will make time series
# start at earliest available year.
start_year: 1990
start_year: 10

#model year when time series files should end:
#Note: Leaving this entry blank will make time series
# end at latest available year.
end_year: 1999
end_year: 14

#Do time series files need to be generated?
#If True, then diagnostics assumes that model files are already time series.
Expand All @@ -341,7 +341,7 @@ diag_cam_baseline_climo:
cam_overwrite_ts: false

#Location where time series files are (or will be) stored:
cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts
cam_ts_loc: /glade/derecho/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts

#TEM diagnostics
#---------------
Expand All @@ -351,7 +351,7 @@ diag_cam_baseline_climo:

#Location where TEM files are stored:
#NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
cam_tem_loc: /glade/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/
cam_tem_loc: /glade/derecho/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/

#Overwrite TEM files, if found?
#If set to false, then TEM creation will be skipped if files are found:
Expand All @@ -376,7 +376,7 @@ diag_cvdp_info:
cvdp_codebase_loc: /glade/u/home/asphilli/CESM-diagnostics/CVDP/Release/v5.2.0/

# Location where cvdp codebase will be copied to and diagnostic plots will be stored
cvdp_loc: /glade/scratch/asphilli/ADF-Sandbox/cvdp/ #MUST EDIT!
cvdp_loc: /glade/derecho/scratch/${user}/ADF/cvdp/

# tar up CVDP results?
cvdp_tar: false
Expand Down Expand Up @@ -531,4 +531,4 @@ diag_var_list:
# region_season: <NULL means use annual mean>
# region_variables: <list of variables to try to use; allows for a subset of the total diag variables>

#END OF FILE
#END OF FILE
3 changes: 1 addition & 2 deletions scripts/plotting/tape_recorder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def tape_recorder(adfobj):
#End tape recorder plotting script:
return

#Set up figure for plots
fig = plt.figure(figsize=(16,16))
x1, x2, y1, y2 = get5by5coords_zmplots()

Expand All @@ -204,8 +205,6 @@ def tape_recorder(adfobj):
'ERA5',x1[1],x2[1],y1[1],y2[1], cmap=cmap, paxis='pre',
taxis='month',climo_yrs="1980-2020")



#Loop over case(s) and start count at 2 to account for MLS and ERA5 plots above
count=2
for irun in np.arange(0,alldat_concat_LT.run.size,1):
Expand Down
Loading