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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mlde_utils
-Version: 0.2.2
+Version: 0.2.3
 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

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

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

{mlde_utils-0.2.2 → mlde_utils-0.2.3}/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.3}/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.2 → mlde_utils-0.2.3}/src/mlde_utils/data/select_domain.py

@@ -13,6 +13,10 @@ 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 = {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mlde_utils
-Version: 0.2.2
+Version: 0.2.3
 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