Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 51 additions & 15 deletions lib/adf_variable_defaults.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#This file lists out variable-specific defaults
#for plotting and observations. These defaults
#are:
Expand Down Expand Up @@ -298,10 +297,10 @@ BC:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
category: "Aerosols"
derivable_from: ["bc_a1", "bc_a4"]
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
Expand All @@ -312,10 +311,10 @@ POM:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
category: "Aerosols"
derivable_from: ["pom_a1", "pom_a4"]
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
Expand All @@ -326,10 +325,10 @@ SO4:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
category: "Aerosols"
derivable_from: ["so4_a1", "so4_a2", "so4_a3"]
derivable_from_cam_chem: ["so4_a1", "so4_a2", "so4_a3", "so4_a5"]
Expand All @@ -341,10 +340,10 @@ SOA:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
category: "Aerosols"
derivable_from: ["soa_a1", "soa_a2"]
derivable_from_cam_chem: ["soa1_a1", "soa2_a1", "soa3_a1", "soa4_a1", "soa5_a1", "soa1_a2", "soa2_a2", "soa3_a2", "soa4_a2", "soa5_a2"]
Expand All @@ -358,10 +357,10 @@ DUST:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
category: "Aerosols"
derivable_from: ["dst_a1", "dst_a2", "dst_a3"]
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
Expand All @@ -374,13 +373,13 @@ SeaSalt:
diff_colormap: "BrBG"
scale_factor: 1000000000
add_offset: 0
new_unit: '$\mu$g/m3'
new_unit: '$\\mu$g/m3'
mpl:
colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
ticks: [0.05,0.2,0.4,1,2,6,24,90]
diff_colorbar:
label : '$\mu$g/m3'
label : '$\\mu$g/m3'
ticks: [-10,8,6,4,2,0,-2,-4,-6,-8,-10]
category: "Aerosols"
derivable_from: ["ncl_a1", "ncl_a2", "ncl_a3"]
Expand Down Expand Up @@ -2232,11 +2231,32 @@ CLWMODIS:
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
pct_diff_colormap: "PuOr_r"

CLMODIS:
category: "Clouds"
obs_file: 'MODIS_obs_data.nc'
obs_name: "MODIS"

CLD_MISR:
category: "Clouds"
obs_file: 'MISR_obs_data.nc'
obs_name: "MISR"

FISCCP1_COSP:
category: "COSP"
category: "Clouds"
obs_file: 'ISCCP_obs_data.nc'
obs_name: "ISCCP"
obs_var_name: "n_pctaudist"
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
pct_diff_colormap: "PuOr_r"

ISCCP_emd_centers:
category: "Clouds"
obs_file: 'ISCCP_emd-means_n_init5_centers_1.npy'

ISCCP_euclidean_centers:
category: "Clouds"
obs_file: 'CS_qualitative_clusters.npy'

ICE_ICLD_VISTAU:
category: "COSP"
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
Expand Down Expand Up @@ -2282,6 +2302,22 @@ MEANTBCLR_ISCCP:
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
pct_diff_colormap: "PuOr_r"

MISR_euclidean_centers:
category: "Clouds"
obs_file: 'MISR_6C_weather_state_centers.npy'

MISR_emd_centers:
category: "Clouds"
obs_file: 'MISR_emd-means_n_init5_centers_1.npy'

MODIS_euclidean_centers:
category: "Clouds"
obs_file: 'MODIS_6C_weather_state_centers.npy'

MODIS_emd_centers:
category: "Clouds"
obs_file: 'MODIS_emd-means_n_init5_centers_1.npy'

PCTMODIS:
category: "COSP"
pct_diff_contour_levels: [-100,-75,-50,-40,-30,-20,-10,-8,-6,-4,-2,0,2,4,6,8,10,20,30,40,50,75,100]
Expand Down
2 changes: 1 addition & 1 deletion scripts/plotting/adf_histogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def make_histograms(data, land, vres):
bins = np.arange(*vres['contour_levels_range'])
else:
print("WARNING: no sensible defaults found -- histogram will use 25 bins (bins may differ across cases)")
bins = np.linspace(data.min(), data.max(), 26)
bins = np.linspace(data.min().values, data.max().values, 26)

# extend bins to catch all values
hbins = np.insert(bins, 0, np.finfo(float).min)
Expand Down
Loading