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

Jump to bottom

Stats function moved to be better shared across metrics #1014

Merged
merged 20 commits into from
Jan 10, 2024
Merged

Stats function moved to be better shared across metrics #1014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
909505a
initial commit
lee1043 Dec 23, 2023
c63cd9e
clean up
lee1043 Dec 23, 2023
d315690
add warning message for deprecation and pointer to newer place
lee1043 Dec 23, 2023
233c41f
bug fix
lee1043 Dec 23, 2023
071279b
clean up
lee1043 Dec 24, 2023
bb0a602
Merge branch 'main' into feature/1012_lee1043_stats
lee1043 Jan 3, 2024
db4793c
Merge branch 'main' into feature/1012_lee1043_stats
lee1043 Jan 4, 2024
ea6d3d7
select_subset function added
lee1043 Jan 4, 2024
82ec3f6
add select_subset function
lee1043 Jan 4, 2024
8b44ec4
update
lee1043 Jan 4, 2024
fe4c6ca
select_subset function moved to xarray_dataset_io
lee1043 Jan 4, 2024
e5eaecd
update
lee1043 Jan 4, 2024
fc41001
Merge pull request #1018 from PCMDI/feature/1012_lee1043_stats-MoV-xCDAT
lee1043 Jan 4, 2024
20be92e
update
lee1043 Jan 4, 2024
83cf9c4
Merge pull request #1019 from PCMDI/feature/1012_lee1043_stats-MoV-xCDAT
lee1043 Jan 4, 2024
427d954
edit function names to be more consistent
lee1043 Jan 4, 2024
932b33d
typo fix
lee1043 Jan 4, 2024
e25b49e
update
lee1043 Jan 4, 2024
71365b1
update
lee1043 Jan 4, 2024
d0c98dc
update
lee1043 Jan 4, 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
Prev Previous commit
Next Next commit
edit function names to be more consistent
  • Loading branch information
@lee1043
lee1043 committed Jan 4, 2024
commit 427d95409cba1ccf4cf4a424936c079c9471192e
10 changes: 5 additions & 5 deletions pcmdi_metrics/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
from .default_regions_define import region_subset # noqa
from .xcdat_xarray_dataset_io import ( # noqa
get_axis_list,
get_lat_bounds_key,
get_lat_key,
get_latitude_bounds_key,
get_latitude_key,
get_latitude,
get_latitude_bounds,
get_lon_bounds_key,
get_lon_key,
get_longitude_bounds_key,
get_longitude_key,
get_longitude,
get_longitude_bounds,
get_time,
get_time_bound,
get_time_bounds,
get_time_bounds_key,
get_time_key,
select_subset,
Expand Down
24 changes: 12 additions & 12 deletions pcmdi_metrics/io/xcdat_xarray_dataset_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def get_time_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
return time_key


def get_lat_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
def get_latitude_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
try:
lat_key = xc.get_dim_keys(ds, "Y")
except Exception:
Expand All @@ -29,7 +29,7 @@ def get_lat_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
return lat_key


def get_lon_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
def get_longitude_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
try:
lon_key = xc.get_dim_keys(ds, "X")
except Exception:
Expand All @@ -46,13 +46,13 @@ def get_time_bounds_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
return ds[lat_key].attrs["bounds"]


def get_lat_bounds_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
lat_key = get_lat_key(ds)
def get_latitude_bounds_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
lat_key = get_latitude_key(ds)
return ds[lat_key].attrs["bounds"]


def get_lon_bounds_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
lon_key = get_lon_key(ds)
def get_longitude_bounds_key(ds: Union[xr.Dataset, xr.DataArray]) -> str:
lon_key = get_longitude_key(ds)
return ds[lon_key].attrs["bounds"]


Expand All @@ -66,13 +66,13 @@ def get_time(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:


def get_longitude(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:
lon_key = get_lon_key(ds)
lon_key = get_longitude_key(ds)
lon = ds[lon_key]
return lon


def get_latitude(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:
lat_key = get_lat_key(ds)
lat_key = get_latitude_key(ds)
lat = ds[lat_key]
return lat

Expand All @@ -87,13 +87,13 @@ def get_time_bounds(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:


def get_longitude_bounds(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:
lon_bounds_key = get_lon_bounds_key(ds)
lon_bounds_key = get_longitude_bounds_key(ds)
lon_bounds = ds[lon_bounds_key]
return lon_bounds


def get_latitude_bounds(ds: Union[xr.Dataset, xr.DataArray]) -> xr.DataArray:
lat_bounds_key = get_lat_bounds_key(ds)
lat_bounds_key = get_latitude_bounds_key(ds)
lat_bounds = ds[lat_bounds_key]
return lat_bounds

Expand Down Expand Up @@ -135,10 +135,10 @@ def select_subset(
"""
sel_keys = {}
if lat is not None:
lat_key = get_lat_key(ds)
lat_key = get_latitude_key(ds)
sel_keys[lat_key] = slice(*lat)
if lon is not None:
lon_key = get_lon_key(ds)
lon_key = get_longitude_key(ds)
sel_keys[lon_key] = slice(*lon)
if time is not None:
time_key = get_time_key(ds)
Expand Down
Loading