Skip to content

Commit 7692014

Browse files
Add U10 and CERES EBAF TOA v4.1 to polar maps (#967)
* add U10 and CERES EBAF TOA v4.1 * fix pre-comit error * fix build workflow
1 parent 25febc3 commit 7692014

File tree

7 files changed

+135
-6
lines changed

7 files changed

+135
-6
lines changed

.github/workflows/build_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
7979
name: Set up Conda Environment
80-
uses: conda-incubator/setup-miniconda@v2
80+
uses: conda-incubator/setup-miniconda@v3
8181
with:
8282
activate-environment: "e3sm_diags_ci"
8383
miniforge-variant: Miniforge3

e3sm_diags/driver/default_diags/polar_model_vs_obs.cfg

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,135 @@ regions = ["polar_S", "polar_N"]
117117
contour_levels = [-1, 0, 1, 3, 5, 7, 9, 11, 13, 15]
118118
diff_levels = [-5, -4, -3, -2, -1, -0.5, -0.2, 0.2, 0.5, 1, 2, 3, 4, 5]
119119

120+
[#]
121+
sets = ["polar"]
122+
case_id = "ERA5"
123+
variables = ["U10"]
124+
ref_name = "ERA5_ext"
125+
reference_name = "ERA5 Reanalysis"
126+
regions = ["polar_S", "polar_N"]
127+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
128+
contour_levels = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
129+
diff_levels = [-8, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 8]
130+
131+
[#]
132+
sets = ["polar"]
133+
case_id = "CERES-EBAF-TOA-v4.1"
134+
variables = ["SOLIN"]
135+
ref_name = "ceres_ebaf_toa_v4.1"
136+
reference_name = "CERES-EBAF v4.1"
137+
regions = ["polar_S", "polar_N"]
138+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
139+
contour_levels = [0, 50, 100, 150, 200, 250, 300, 350, 400, 450]
140+
diff_levels = [-5, -4, -3, -2, -1, -0.5, 0.5, 1, 2, 3, 4, 5]
141+
142+
143+
144+
[#]
145+
sets = ["polar"]
146+
case_id = "CERES-EBAF-TOA-v4.1"
147+
variables = ["ALBEDO"]
148+
ref_name = "ceres_ebaf_toa_v4.1"
149+
reference_name = "CERES-EBAF v4.1"
150+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
151+
regions = ["polar_S", "polar_N"]
152+
contour_levels = [0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95]
153+
diff_levels = [-0.25, -0.2, -0.15, -0.1, -0.07, -0.05, -0.02, 0.02, 0.05, 0.07, 0.1, 0.15, 0.2, 0.25]
154+
155+
156+
[#]
157+
sets = ["polar"]
158+
case_id = "CERES-EBAF-TOA-v4.1"
159+
variables = ["ALBEDOC"]
160+
ref_name = "ceres_ebaf_toa_v4.1"
161+
reference_name = "CERES-EBAF v4.1"
162+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
163+
regions = ["polar_S", "polar_N"]
164+
contour_levels = [0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95]
165+
diff_levels = [-0.25, -0.2, -0.15, -0.1, -0.07, -0.05, -0.02, 0.02, 0.05, 0.07, 0.1, 0.15, 0.2, 0.25]
166+
167+
[#]
168+
sets = ["polar"]
169+
case_id = "CERES-EBAF-TOA-v4.1"
170+
variables = ["FLUT"]
171+
ref_name = "ceres_ebaf_toa_v4.1"
172+
reference_name = "CERES-EBAF v4.1"
173+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
174+
regions = ["polar_S", "polar_N"]
175+
contour_levels = [145, 160, 175, 190, 205, 220, 235, 250, 265]
176+
diff_levels = [-60, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 60]
177+
178+
179+
[#]
180+
sets = ["polar"]
181+
case_id = "CERES-EBAF-TOA-v4.1"
182+
variables = ["FLUTC"]
183+
ref_name = "ceres_ebaf_toa_v4.1"
184+
reference_name = "CERES-EBAF v4.1"
185+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
186+
regions = ["polar_S", "polar_N"]
187+
contour_levels = [145, 160, 175, 190, 205, 220, 235, 250, 265]
188+
diff_levels = [-60, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 60]
189+
190+
191+
[#]
192+
sets = ["polar"]
193+
case_id = "CERES-EBAF-TOA-v4.1"
194+
variables = ["FSNTOA"]
195+
ref_name = "ceres_ebaf_toa_v4.1"
196+
reference_name = "CERES-EBAF v4.1"
197+
regions = ["polar_S", "polar_N"]
198+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
199+
contour_levels = [0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300]
200+
diff_levels = [-75, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 75]
201+
202+
203+
[#]
204+
sets = ["polar"]
205+
case_id = "CERES-EBAF-TOA-v4.1"
206+
variables = ["FSNTOAC"]
207+
ref_name = "ceres_ebaf_toa_v4.1"
208+
reference_name = "CERES-EBAF v4.1"
209+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
210+
regions = ["polar_S", "polar_N"]
211+
contour_levels = [0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300]
212+
diff_levels = [-75, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 75]
213+
214+
215+
[#]
216+
sets = ["polar"]
217+
case_id = "CERES-EBAF-TOA-v4.1"
218+
variables = ["SWCF"]
219+
ref_name = "ceres_ebaf_toa_v4.1"
220+
reference_name = "CERES-EBAF v4.1"
221+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
222+
regions = ["polar_S", "polar_N"]
223+
contour_levels = [-170, -150, -135, -120, -105, -90, -75, -60, -45, -30, -15, 0, 15, 30, 45]
224+
diff_levels = [-75, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 75]
225+
226+
227+
[#]
228+
sets = ["polar"]
229+
case_id = "CERES-EBAF-TOA-v4.1"
230+
variables = ["LWCF"]
231+
ref_name = "ceres_ebaf_toa_v4.1"
232+
reference_name = "CERES-EBAF v4.1"
233+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
234+
regions = ["polar_S", "polar_N"]
235+
contour_levels = [0, 10, 20, 30, 40, 50, 60, 70, 80]
236+
diff_levels = [-35, -30, -25, -20, -15, -10, -5, -2, 2, 5, 10, 15, 20, 25, 30, 35]
237+
238+
239+
[#]
240+
sets = ["polar"]
241+
case_id = "CERES-EBAF-TOA-v4.1"
242+
variables = ["RESTOM"]
243+
ref_name = "ceres_ebaf_toa_v4.1"
244+
reference_name = "CERES-EBAF v4.1"
245+
regions = ["polar_S", "polar_N"]
246+
seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
247+
contour_levels = [-175, -150, -125, -100, -75, -50, -25, 0, 25, 50, 75, 100, 125]
248+
diff_levels = [-75, -50, -40, -30, -20, -10, -5, -2, 2, 5, 10, 20, 30, 40, 50, 75]
120249

121250

122251
[#]

e3sm_diags/driver/meridional_mean_2d_driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def run_diag(parameter: MeridionalMean2dParameter) -> MeridionalMean2dParameter:
8282
)
8383
elif is_vars_3d:
8484
if not parameter._is_plevs_set():
85-
parameter.plevs = DEFAULT_PLEVS # type: ignore
85+
parameter.plevs = DEFAULT_PLEVS
8686

8787
_run_diags_3d(parameter, ds_test, ds_ref, season, var_key, ref_name)
8888

e3sm_diags/parameter/meridional_mean_2d_parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def __init__(self):
1010
super(MeridionalMean2dParameter, self).__init__()
1111
# Override existing attributes
1212
# =============================
13-
self.plevs = numpy.logspace(2.0, 3.0, num=17).tolist() # type: ignore
13+
self.plevs = numpy.logspace(2.0, 3.0, num=17).tolist()
1414
self.plot_log_plevs = False
1515
self.plot_plevs = False
1616
# Granulating plevs causes duplicate plots in this case.

e3sm_diags/parameter/zonal_mean_2d_parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def __init__(self):
1414
super(ZonalMean2dParameter, self).__init__()
1515
# Override existing attributes
1616
# =============================
17-
self.plevs = copy.deepcopy(DEFAULT_PLEVS) # type: ignore
17+
self.plevs = copy.deepcopy(DEFAULT_PLEVS)
1818
self.plot_log_plevs = False
1919
self.plot_plevs = False
2020
# Granulating plevs causes duplicate plots in this case.

e3sm_diags/parameter/zonal_mean_2d_stratosphere_parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ def __init__(self):
1212
super(ZonalMean2dStratosphereParameter, self).__init__()
1313
# Override existing attributes
1414
# =============================
15-
self.plevs = copy.deepcopy(DEFAULT_PLEVS) # type: ignore
15+
self.plevs = copy.deepcopy(DEFAULT_PLEVS)
1616
self.plot_log_plevs = True

e3sm_diags/plot/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ def _get_colormap(color_map: str):
286286
raise IOError(msg.format(color_map, pth))
287287

288288
rgb_arr = np.loadtxt(color_map)
289-
rgb_arr = rgb_arr / 255.0 # type: ignore
289+
rgb_arr = rgb_arr / 255.0
290290

291291
cmap = colors.LinearSegmentedColormap.from_list(name=color_map, colors=rgb_arr)
292292
return cmap

0 commit comments

Comments
 (0)