mlde-utils 0.2.2__tar.gz → 0.2.4__tar.gz

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mlde_utils
-Version: 0.2.2
+Version: 0.2.4
 Summary: A package for shared code between ML downscaling repos
 Author-email: Henry Addison <henry.addison@bristol.ac.uk>
 Project-URL: Homepage, https://github.com/henryaddison/mlde_utils
@@ -11,5 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # Util code for ML downscaling emulator

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mlde_utils"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
   { name="Henry Addison", email="henry.addison@bristol.ac.uk" },
 ]

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/src/mlde_utils/__init__.py

@@ -37,7 +37,8 @@ class VariableMetadata:
         domain,
         resolution,
         ensemble_member,
-        scenario="rcp85",
+        scenario,
+        collection,
     ):
         self.base_dir = base_dir
         self.variable = variable
@@ -46,11 +47,7 @@ class VariableMetadata:
         self.domain = domain
         self.scenario = scenario
         self.ensemble_member = ensemble_member
-
-        if self.resolution.startswith("2.2km"):
-            self.collection = "land-cpm"
-        elif self.resolution.startswith("60km"):
-            self.collection = "land-gcm"
+        self.collection = collection
 
     def __str__(self):
         return "VariableMetadata: " + str(self.__dict__)

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/src/mlde_utils/data/regrid.py

@@ -1,5 +1,6 @@
 import iris
 import iris.analysis
+import logging
 import xarray as xr
 
 """
@@ -43,7 +44,12 @@ class Regrid:
             src_lat_name = "grid_latitude"
             src_lon_name = "grid_longitude"
         else:
-            raise RuntimeError("Unrecognised grid system")
+            logging.warning(
+                "Unrecognised grid system. Assuming lat-lon, GeogCS(6371229.0)"
+            )
+            src_coord_sys = iris.coord_systems.GeogCS(6371229.0)
+            src_lat_name = "latitude"
+            src_lon_name = "longitude"
 
         if "latitude_longitude" in self.target_ds.variables:
             target_grid_mapping = "latitude_longitude"
@@ -111,7 +117,11 @@ class Regrid:
                     ["time", "bnds"],
                     ds[key].values,
                     ds[key].attrs,
-                    {"units": "hours since 1970-01-01 00:00:00", "calendar": "360_day"},
+                    {
+                        k: ds["time"].encoding[k]
+                        for k in ["units", "calendar"]
+                        if k in ds["time"].encoding
+                    },
                 )
                 for key in ["time_bnds"]
             }

mlde_utils-0.2.4/src/mlde_utils/data/select_domain.py

@@ -0,0 +1,100 @@
+import logging
+import math
+
+import numpy as np
+
+from mlde_utils import cp_model_rotated_pole, platecarree
+
+logger = logging.getLogger(__name__)
+
+
+class SelectDomain:
+
+    DOMAIN_CENTRES_LON_LAT = {
+        "london": (-0.118092, 51.509865),
+        "birmingham": (-1.898575, 52.489471),
+        "glasgow": (-4.25763000, 55.86515000),
+        "aberdeen": (-2.09814000, 57.14369000),
+        "scotland": (-4.20264580, 56.49067120),
+        "dublin": (-6.267494, 53.344105),
+    }
+
+    DOMAIN_CENTRES_RP_LONG_LAT = {
+        domain_name: cp_model_rotated_pole.transform_point(
+            *lon_lat, src_crs=platecarree
+        )
+        for domain_name, lon_lat in DOMAIN_CENTRES_LON_LAT.items()
+    }
+
+    def __init__(self, subdomain, grid="cpm", size=64) -> None:
+        self.subdomain = subdomain
+        self.grid = grid
+        self.size = size
+
+    def run(self, ds):
+        logger.info(f"Selecting subdomain {self.subdomain}")
+        if self.grid == "cpm":
+            centre_xy = self.DOMAIN_CENTRES_RP_LONG_LAT[self.subdomain]
+            query = dict(
+                grid_longitude=360.0 + centre_xy[0],
+                grid_latitude=centre_xy[1],
+            )
+        elif self.grid == "gcm":
+            centre_xy = self.DOMAIN_CENTRES_LON_LAT[self.subdomain]
+            query = dict(
+                longitude=centre_xy[0],
+                latitude=centre_xy[1],
+            )
+        else:
+            raise ValueError(f"Unknown grid type: {self.grid}")
+
+        centre_ds = ds.sel(query, method="nearest")
+        if self.grid == "cpm":
+            centre_long_idx = np.where(
+                ds.grid_longitude.values == centre_ds.grid_longitude.values
+            )[0].item()
+            centre_lat_idx = np.where(
+                ds.grid_latitude.values == centre_ds.grid_latitude.values
+            )[0].item()
+        elif self.grid == "gcm":
+            centre_long_idx = np.where(
+                ds.longitude.values == centre_ds.longitude.values
+            )[0].item()
+            centre_lat_idx = np.where(ds.latitude.values == centre_ds.latitude.values)[
+                0
+            ].item()
+        else:
+            raise ValueError(f"Unknown grid type: {self.grid}")
+
+        radius = self.size - 1
+        left_length = math.floor(radius / 2.0)
+        right_length = math.ceil(radius / 2.0)
+        down_length = math.floor(radius / 2.0)
+        up_length = math.ceil(radius / 2.0)
+
+        if self.grid == "cpm":
+            ds = ds.sel(
+                grid_longitude=slice(
+                    ds.grid_longitude[centre_long_idx - left_length].values,
+                    ds.grid_longitude[centre_long_idx + right_length].values,
+                ),
+                grid_latitude=slice(
+                    ds.grid_latitude[centre_lat_idx - down_length].values,
+                    ds.grid_latitude[centre_lat_idx + up_length].values,
+                ),
+            )
+        elif self.grid == "gcm":
+            ds = ds.sel(
+                longitude=slice(
+                    ds.longitude[centre_long_idx - left_length].values,
+                    ds.longitude[centre_long_idx + right_length].values,
+                ),
+                latitude=slice(
+                    ds.latitude[centre_lat_idx - down_length].values,
+                    ds.latitude[centre_lat_idx + up_length].values,
+                ),
+            )
+        else:
+            raise ValueError(f"Unknown grid type: {self.grid}")
+
+        return ds

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/src/mlde_utils/data/shift_lon_break.py

@@ -10,7 +10,9 @@ class ShiftLonBreak:
 
     def run(self, ds):
         orig_lon_attrs = ds[self.lon_name].attrs
-        ds.coords[self.lon_name] = (ds.coords[self.lon_name] + 180) % 360 - 180
+        ds = ds.assign_coords(
+            {self.lon_name: (((ds.coords[self.lon_name] + 180) % 360) - 180)}
+        )
         ds = ds.sortby(ds[self.lon_name])
         ds[self.lon_name].attrs = orig_lon_attrs
 

{mlde_utils-0.2.2 → mlde_utils-0.2.4}/src/mlde_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mlde_utils
-Version: 0.2.2
+Version: 0.2.4
 Summary: A package for shared code between ML downscaling repos
 Author-email: Henry Addison <henry.addison@bristol.ac.uk>
 Project-URL: Homepage, https://github.com/henryaddison/mlde_utils
@@ -11,5 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # Util code for ML downscaling emulator

mlde_utils-0.2.2/src/mlde_utils/data/select_domain.py

@@ -1,63 +0,0 @@
-import logging
-import math
-
-import numpy as np
-
-from mlde_utils import cp_model_rotated_pole, platecarree
-
-logger = logging.getLogger(__name__)
-
-
-class SelectDomain:
-
-    DOMAIN_CENTRES_LON_LAT = {
-        "london": (-0.118092, 51.509865),
-        "birmingham": (-1.898575, 52.489471),
-    }
-
-    DOMAIN_CENTRES_RP_LONG_LAT = {
-        domain_name: cp_model_rotated_pole.transform_point(
-            *lon_lat, src_crs=platecarree
-        )
-        for domain_name, lon_lat in DOMAIN_CENTRES_LON_LAT.items()
-    }
-
-    def __init__(self, subdomain, size=64) -> None:
-        self.subdomain = subdomain
-        self.size = size
-
-    def run(self, ds):
-        logger.info(f"Selecting subdomain {self.subdomain}")
-
-        centre_rp_lon_lat = self.DOMAIN_CENTRES_RP_LONG_LAT[self.subdomain]
-        centre_ds = ds.sel(
-            grid_longitude=360.0 + centre_rp_lon_lat[0],
-            grid_latitude=centre_rp_lon_lat[1],
-            method="nearest",
-        )
-
-        centre_long_idx = np.where(
-            ds.grid_longitude.values == centre_ds.grid_longitude.values
-        )[0].item()
-        centre_lat_idx = np.where(
-            ds.grid_latitude.values == centre_ds.grid_latitude.values
-        )[0].item()
-
-        radius = self.size - 1
-        left_length = math.floor(radius / 2.0)
-        right_length = math.ceil(radius / 2.0)
-        down_length = math.floor(radius / 2.0)
-        up_length = math.ceil(radius / 2.0)
-
-        ds = ds.sel(
-            grid_longitude=slice(
-                ds.grid_longitude[centre_long_idx - left_length].values,
-                ds.grid_longitude[centre_long_idx + right_length].values,
-            ),
-            grid_latitude=slice(
-                ds.grid_latitude[centre_lat_idx - down_length].values,
-                ds.grid_latitude[centre_lat_idx + up_length].values,
-            ),
-        )
-
-        return ds