ensemble perturbations ok

Author: floriankrb

ecml_tools/create/functions/ensemble_perturbations.py

@@ -8,9 +8,10 @@
 #
 
 import warnings
-import climetlab as cml
+
 import numpy as np
 import tqdm
+from climetlab import load_source
 from climetlab.core.temporary import temp_file
 from climetlab.readers.grib.output import new_grib_output
 
@@ -44,11 +45,11 @@ def ensembles_perturbations(ensembles, center, mean, remapping={}, patches={}):
     n_ensembles = len(normalise_number(ensembles["number"]))
 
     print(f"Retrieving ensemble data with {ensembles}")
-    ensembles = cml.load_source(**ensembles)
+    ensembles = load_source(**ensembles)
     print(f"Retrieving center data with {center}")
-    center = cml.load_source(**center)
+    center = load_source(**center)
     print(f"Retrieving mean data with {mean}")
-    mean = cml.load_source(**mean)
+    mean = load_source(**mean)
 
     assert len(mean) * n_ensembles == len(ensembles), (
         len(mean),
@@ -82,7 +83,11 @@ def ensembles_perturbations(ensembles, center, mean, remapping={}, patches={}):
             center_coords[k],
             ensembles_coords[k],
         )
-        assert set(center_coords[k]) == set(mean_coords[k]), (k, center_coords[k], mean_coords[k])
+        assert set(center_coords[k]) == set(mean_coords[k]), (
+            k,
+            center_coords[k],
+            mean_coords[k],
+        )
 
     for field in tqdm.tqdm(center):
         param = field.metadata("param")
@@ -105,7 +110,10 @@ def ensembles_perturbations(ensembles, center, mean, remapping={}, patches={}):
 
         for number in ensembles_coords["number"]:
             ensembles_field = get_unique_field(ensembles.sel(number=number), selection)
-            assert ensembles_field.metadata("grid") == grid, (ensembles_field.metadata("grid"), grid)
+            assert ensembles_field.metadata("grid") == grid, (
+                ensembles_field.metadata("grid"),
+                grid,
+            )
 
             e = ensembles_field.to_numpy()
             assert c.shape == e.shape, (c.shape, e.shape)
@@ -122,7 +130,7 @@ def ensembles_perturbations(ensembles, center, mean, remapping={}, patches={}):
 
     out.close()
 
-    ds = cml.load_source("file", path)
+    ds = load_source("file", path)
     assert len(ds) == len(ensembles), (len(ds), len(ensembles))
     ds._tmp = tmp
 

ecml_tools/create/input.py

@@ -6,10 +6,10 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 #
-import os
-from importlib import import_module
 import datetime
+import importlib
 import logging
+import os
 import time
 from collections import defaultdict
 from copy import deepcopy
@@ -339,6 +339,7 @@ def __getitem__(self, key):
 class FunctionResult(Result):
     def __init__(self, context, dates, action, previous_sibling=None):
         super().__init__(context, dates)
+        assert isinstance(action, Action), type(action)
         self.action = action
 
         _args = self.action.args
@@ -429,16 +430,14 @@ def __init__(self, context, name, **kwargs):
 
     @property
     def function(self):
-        from .functions import ensemble_perturbations
-
-        return ensemble_perturbations.execute
-        import os
-
-        here = os.path.dirname(os.path.dirname(__file__))
-        name = self.action.kwargs["name"]
-        proc = import_module(f".functions.{name}", package=__name__).execute
-
-        return proc
+        here = os.path.dirname(__file__)
+        path = os.path.join(here, "functions", f"{self.name}.py")
+        spec = importlib.util.spec_from_file_location(self.name, path)
+        module = spec.loader.load_module()
+        # TODO: this fails here, fix this.
+        #   getattr(module, self.name)
+        #   self.action.kwargs
+        return module.execute
 
 
 class ConcatResult(Result):