diff --git a/.zenodo.json b/.zenodo.json index 89428d38..793d000f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -70,9 +70,12 @@ "orcid": "https://orcid.org/0009-0001-4486-0120", "affiliation": "Independent researcher, Vietnam", "name": "Bogacheva, Jenya" + }, + { + "orcid": "https://orcid.org/0009-0004-9553-8387", + "affiliation": "Independent researcher, Australia", + "name": "James, Matthew" } - - ], "license": "Apache-2.0", "title": "PyEarthTools: Machine learning for Earth system science", diff --git a/notebooks/data/CustomDataIndex.ipynb b/notebooks/data/CustomDataIndex.ipynb index 2f7802ab..d9769f71 100644 --- a/notebooks/data/CustomDataIndex.ipynb +++ b/notebooks/data/CustomDataIndex.ipynb @@ -100,7 +100,7 @@ " \n", " ##Initialise Parent Class, passing in base_transforms and data resolution\n", " ## Setup transform to cut data to specified variable\n", - " base_transforms = pyearthtools.data.transform.variables.variable_trim(variables) + transforms\n", + " base_transforms = pyearthtools.data.transform.variables.Trim(variables) + transforms\n", " \n", " #Lets say this is hourly data\n", " super().__init__(base_transforms, (1,'H'))\n", @@ -207,7 +207,7 @@ " \n", " ##Initialise Parent Class, passing in base_transforms and data resolution\n", " ## Setup transform to cut data to specified variable\n", - " base_transforms = pyearthtools.data.transform.variables.variable_trim(variables) + transforms\n", + " base_transforms = pyearthtools.data.transform.variables.Trim(variables) + transforms\n", " \n", " #Lets say this is hourly data\n", " super().__init__(cache = cachelocation, base_transforms = base_transforms, data_resolution = (1,'H'))\n", diff --git a/packages/data/src/pyearthtools/data/download/ecmwf_opendata/opendata.py b/packages/data/src/pyearthtools/data/download/ecmwf_opendata/opendata.py index dc73878c..5a84ab86 100644 --- a/packages/data/src/pyearthtools/data/download/ecmwf_opendata/opendata.py +++ b/packages/data/src/pyearthtools/data/download/ecmwf_opendata/opendata.py @@ -165,9 +165,9 @@ def __init__( transforms = kwargs.pop("transforms", pyearthtools.data.TransformCollection()) # Rename variables to match other indexes, and trim out any not requested - self.download_transforms = pyearthtools.data.transforms.variables.rename_variables( + self.download_transforms = pyearthtools.data.transforms.attributes.Rename( **RENAME_DICT # type: ignore - ) + pyearthtools.data.transforms.variables.variable_trim( + ) + pyearthtools.data.transforms.variables.Trim( *variables ) # + pyearthtools.data.transforms.coordinates.Drop("meanSea", "valid_time", "heightAboveGround", "entireAtmosphere", ignore_missing=True) diff --git a/packages/data/src/pyearthtools/data/patterns/static.py b/packages/data/src/pyearthtools/data/patterns/static.py index bd410595..bdce932c 100644 --- a/packages/data/src/pyearthtools/data/patterns/static.py +++ b/packages/data/src/pyearthtools/data/patterns/static.py @@ -68,7 +68,7 @@ def __init__( super().__init__( root_dir="", transforms=( - pyearthtools.data.transforms.variables.variable_trim(variables) + pyearthtools.data.transforms.variables.Trim(variables) if variables else TransformCollection() + transforms ), diff --git a/packages/data/src/pyearthtools/data/transforms/variables.py b/packages/data/src/pyearthtools/data/transforms/variables.py index ff52a834..4ed6ec92 100644 --- a/packages/data/src/pyearthtools/data/transforms/variables.py +++ b/packages/data/src/pyearthtools/data/transforms/variables.py @@ -17,13 +17,8 @@ import xarray as xr -import pyearthtools.data.transforms.attributes as attr from pyearthtools.data.transforms.transform import Transform -# Backwards compatability -rename_variables = attr.Rename -replace_name_deviation = rename_variables - __all__ = ["Trim", "Drop"] diff --git a/packages/met_office_site_archive/src/site_archive_met_office/ERA5lowres.py b/packages/met_office_site_archive/src/site_archive_met_office/ERA5lowres.py index 76e136bd..b43974ed 100644 --- a/packages/met_office_site_archive/src/site_archive_met_office/ERA5lowres.py +++ b/packages/met_office_site_archive/src/site_archive_met_office/ERA5lowres.py @@ -113,7 +113,7 @@ def __init__( base_transform = TransformCollection() # base_transform += pyearthtools.data.transforms.attributes.Rename(ERA5_RENAME) - # base_transform += pyearthtools.data.transforms.variables.variable_trim(variables) + # base_transform += pyearthtools.data.transforms.variables.Trim(variables) self.level_value = level_value diff --git a/packages/nci_site_archive/src/site_archive_nci/AGCD.py b/packages/nci_site_archive/src/site_archive_nci/AGCD.py index 5d68a2be..2ae4cf26 100644 --- a/packages/nci_site_archive/src/site_archive_nci/AGCD.py +++ b/packages/nci_site_archive/src/site_archive_nci/AGCD.py @@ -101,8 +101,8 @@ def __init__( self.variables = variables base_transform = TransformCollection() - base_transform += pyearthtools.data.transforms.variables.rename_variables(AGCD_RENAME) - base_transform += pyearthtools.data.transforms.variables.variable_trim(variables) + base_transform += pyearthtools.data.transforms.attributes.Rename(AGCD_RENAME) + base_transform += pyearthtools.data.transforms.variables.Trim(variables) super().__init__( transforms=base_transform + (transforms or TransformCollection()), diff --git a/packages/nci_site_archive/src/site_archive_nci/ERA5.py b/packages/nci_site_archive/src/site_archive_nci/ERA5.py index 4f762e6a..80363598 100644 --- a/packages/nci_site_archive/src/site_archive_nci/ERA5.py +++ b/packages/nci_site_archive/src/site_archive_nci/ERA5.py @@ -97,7 +97,7 @@ def __init__( base_transform = TransformCollection() base_transform += pyearthtools.data.transforms.attributes.Rename(ERA5_RENAME) - # base_transform += pyearthtools.data.transforms.variables.variable_trim(variables) + # base_transform += pyearthtools.data.transforms.variables.Trim(variables) self.level_value = level_value diff --git a/packages/nci_site_archive/src/site_archive_nci/_Rainfields3.py b/packages/nci_site_archive/src/site_archive_nci/_Rainfields3.py index 2c946d27..18352450 100644 --- a/packages/nci_site_archive/src/site_archive_nci/_Rainfields3.py +++ b/packages/nci_site_archive/src/site_archive_nci/_Rainfields3.py @@ -903,7 +903,7 @@ def __init__( check_project(project_code="rq0") self.variables = [variables] if isinstance(variables, str) else variables - base_transform = pyearthtools.data.transforms.variables.variable_trim(variables) + base_transform = pyearthtools.data.transforms.variables.Trim(variables) self.walk_cache = {} # Caches filesystem walks for efficiency diff --git a/packages/tutorial/src/pyearthtools/tutorial/ERA5DataClass.py b/packages/tutorial/src/pyearthtools/tutorial/ERA5DataClass.py index 4ac6325b..af72434d 100644 --- a/packages/tutorial/src/pyearthtools/tutorial/ERA5DataClass.py +++ b/packages/tutorial/src/pyearthtools/tutorial/ERA5DataClass.py @@ -139,7 +139,7 @@ def __init__( base_transform = TransformCollection() # base_transform += pyearthtools.data.transforms.attributes.Rename(ERA5_RENAME) - # base_transform += pyearthtools.data.transforms.variables.variable_trim(variables) + # base_transform += pyearthtools.data.transforms.variables.Trim(variables) self.level_value = level_value @@ -255,7 +255,7 @@ def __init__( base_transforms = TransformCollection() # base_transforms += pyearthtools.data.transforms.attributes.Rename(ERA5DEMO_RENAME) - base_transforms += pyearthtools.data.transforms.variables.variable_trim(variables) + base_transforms += pyearthtools.data.transforms.variables.Trim(variables) self.level_value = level_value