Skip to content

Commit b354fbe

Browse files
authored
Merge pull request #1091 from PCMDI/feature/1084_lee1043_MJO-xcdat
MJO xcdat conversion
2 parents d2d7f4e + e9e3be0 commit b354fbe

File tree

10 files changed

+328
-262
lines changed

10 files changed

+328
-262
lines changed

pcmdi_metrics/mjo/lib/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
from .debug_chk_plot import debug_chk_plot # noqa
33
from .dict_merge import dict_merge # noqa
44
from .lib_mjo import ( # noqa
5-
Remove_dailySeasonalCycle,
65
calculate_ewr,
7-
decorate_2d_array_axes,
86
generate_axes_and_decorate,
97
get_daily_ano_segment,
108
interp2commonGrid,
@@ -13,7 +11,6 @@
1311
space_time_spectrum,
1412
subSliceSegment,
1513
taper,
16-
unit_conversion,
1714
write_netcdf_output,
1815
)
1916
from .mjo_metric_calc import mjo_metric_ewr_calculation # noqa

pcmdi_metrics/mjo/lib/debug_chk_plot.py

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,15 @@
44
import matplotlib.pyplot as plt
55
from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
66

7+
from pcmdi_metrics.io import get_latitude, get_longitude
8+
79

810
def debug_chk_plot(d_seg_x_ano, Power, OEE, segment_year, daSeaCyc, segment_ano_year):
911
os.makedirs("debug", exist_ok=True)
1012

11-
""" FIX ME ---
12-
x = vcs.init()
13-
x.plot(d_seg_x_ano)
14-
x.png('debug/d_seg_x_ano.png')
15-
16-
x.clear()
17-
x.plot(Power)
18-
x.png('debug/power.png')
19-
20-
x.clear()
21-
x.plot(OEE)
22-
x.png('debug/OEE.png')
23-
"""
24-
2513
print("type(segment_year)", type(segment_year))
2614
print("segment_year.shape:", segment_year.shape)
27-
print(segment_year.getAxis(0))
28-
print(segment_year.getAxis(1))
29-
print(segment_year.getAxis(2))
15+
3016
plot_map(segment_year[0], "debug/segment.png")
3117

3218
print("type(daSeaCyc)", type(daSeaCyc))
@@ -35,16 +21,14 @@ def debug_chk_plot(d_seg_x_ano, Power, OEE, segment_year, daSeaCyc, segment_ano_
3521

3622
print("type(segment_ano_year)", type(segment_ano_year))
3723
print("segment_ano_year.shape:", segment_ano_year.shape)
38-
print(segment_ano_year.getAxis(0))
39-
print(segment_ano_year.getAxis(1))
40-
print(segment_ano_year.getAxis(2))
24+
4125
plot_map(segment_ano_year[0], "debug/segment_ano.png")
4226

4327

4428
def plot_map(data, filename):
4529
fig = plt.figure(figsize=(10, 6))
46-
lons = data.getLongitude()
47-
lats = data.getLatitude()
30+
lons = get_longitude(data)
31+
lats = get_latitude(data)
4832
ax = plt.axes(projection=ccrs.PlateCarree(central_longitude=180))
4933
im = ax.contourf(lons, lats, data, transform=ccrs.PlateCarree(), cmap="viridis")
5034
ax.coastlines()

0 commit comments

Comments
 (0)