Merge pull request #106 from ecmwf/feature/performance_optimisation

Feature/performance optimisation

Author: mathleur

performance/fdb_performance_3D.py

@@ -20,6 +20,7 @@ def setup_method(self, method):
             "date": {"transformation": {"merge": {"with": "time", "linkers": [" ", "00"]}}},
             "step": {"transformation": {"type_change": "int"}},
             "levelist": {"transformation": {"type_change": "int"}},
+            "longitude": {"transformation": {"cyclic": [0, 360]}},
         }
         self.config = {"class": "od", "expver": "0001", "levtype": "sfc"}
         self.fdbdatacube = FDBDatacube(self.config, axis_options=self.options)

polytope/datacube/datacube_axis.py

@@ -131,6 +131,7 @@ def __init__(self):
         self.name = None
         self.tol = 1e-12
         self.range = None
+        # TODO: Maybe here, store transformations as a dico instead
         self.transformations = []
         self.type = 0
 

polytope/datacube/transformations/datacube_transformations.py

@@ -50,7 +50,6 @@ def change_val_type(self, axis_name, values):
     "merge": "DatacubeAxisMerger",
     "reverse": "DatacubeAxisReverse",
     "type_change": "DatacubeAxisTypeChange",
-    "null": "DatacubeNullTransformation",
 }
 
 _type_to_transformation_file_lookup = {
@@ -59,7 +58,6 @@ def change_val_type(self, axis_name, values):
     "merge": "merger",
     "reverse": "reverse",
     "type_change": "type_change",
-    "null": "null_transformation",
 }
 
 has_transform = {
@@ -68,5 +66,4 @@ def change_val_type(self, axis_name, values):
     "merge": "has_merger",
     "reverse": "reorder",
     "type_change": "type_change",
-    "null": "null",
 }

polytope/utility/geometry.py

@@ -2,8 +2,7 @@
 
 
 def lerp(a, b, value):
-    direction = [a - b for a, b in zip(a, b)]
-    intersect = [b + value * d for b, d in zip(b, direction)]
+    intersect = [b + (a - b) * value for a, b in zip(a, b)]
     return intersect