foxes 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

foxes/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

foxes/algorithms/downwind/downwind.py

@@ -227,7 +227,9 @@ class Downwind(Algorithm):
             for i, m in enumerate(self.farm_controller.pre_rotor_models.models):
                 print(f"    {i}) {m.name}: {m} [pre-rotor]")
             for i, m in enumerate(self.farm_controller.post_rotor_models.models):
-                print(f"    {i+len(self.farm_controller.pre_rotor_models.models)}) {m.name}: {m}")
+                print(
+                    f"    {i+len(self.farm_controller.pre_rotor_models.models)}) {m.name}: {m}"
+                )
             print(deco)
             print()
 

foxes/models/__init__.py

@@ -13,6 +13,6 @@ from . import wake_superpositions
 from . import farm_controllers
 from . import vertical_profiles
 from . import point_models
-from . import axial_induction_models
+from . import axial_induction
 
 from .model_book import ModelBook

foxes/models/model_book.py

@@ -1,7 +1,7 @@
 from math import sqrt
 import foxes.models as fm
 import foxes.variables as FV
-from foxes.utils import Dict, FDict
+from foxes.utils import FDict
 
 from foxes.core import (
     PointDataModel,
@@ -25,42 +25,42 @@ class ModelBook:
 
     Attributes
     ----------
-    point_models: foxes.utils.Dict
+    point_models: foxes.utils.FDict
         The point models. Keys: model name str,
         values: foxes.core.PointDataModel
-    rotor_models: foxes.utils.Dict
+    rotor_models: foxes.utils.FDict
         The rotor models. Keys: model name str,
         values: foxes.core.RotorModel
-    turbine_types: foxes.utils.Dict
+    turbine_types: foxes.utils.FDict
         The turbine type models. Keys: model name str,
         values: foxes.core.TurbineType
-    turbine_models: foxes.utils.Dict
+    turbine_models: foxes.utils.FDict
         The turbine models. Keys: model name str,
         values: foxes.core.TurbineModel
-    farm_models: foxes.utils.Dict
+    farm_models: foxes.utils.FDict
         The farm models. Keys: model name str,
         values: foxes.core.FarmModel
-    farm_controllers: foxes.utils.Dict
+    farm_controllers: foxes.utils.FDict
         The farm controllers. Keys: model name str,
         values: foxes.core.FarmController
-    partial_wakes: foxes.utils.Dict
+    partial_wakes: foxes.utils.FDict
         The partial wakes. Keys: model name str,
         values: foxes.core.PartialWakeModel
-    wake_frames: foxes.utils.Dict
+    wake_frames: foxes.utils.FDict
         The wake frames. Keys: model name str,
         values: foxes.core.WakeFrame
-    wake_superpositions: foxes.utils.Dict
+    wake_superpositions: foxes.utils.FDict
         The wake superposition models. Keys: model name str,
         values: foxes.core.WakeSuperposition
-    wake_models: foxes.utils.Dict
+    wake_models: foxes.utils.FDict
         The wake models. Keys: model name str,
         values: foxes.core.WakeModel
-    induction_models: foxes.utils.Dict
+    induction_models: foxes.utils.FDict
         The induction models. Keys: model name str,
         values: foxes.core.AxialInductionModel
-    sources: foxes.utils.Dict
+    sources: foxes.utils.FDict
         All sources dict
-    base_classes: foxes.utils.Dict
+    base_classes: foxes.utils.FDict
         The base classes for all model types
 
     :group: models
@@ -77,7 +77,7 @@ class ModelBook:
             Path to power/ct curve file, for creation
             of default turbine type model
         """
-        self.point_models = Dict(name="point_models")
+        self.point_models = FDict(name="point_models")
         self.point_models["tke2ti"] = fm.point_models.TKE2TI()
 
         self.rotor_models = FDict(name="rotor_models")
@@ -88,8 +88,11 @@ class ModelBook:
             n2 = float(n2)
             n = int(sqrt(n2))
             if n**2 != n2:
-                raise Exception(f"GridRotor factory: Value {n2} is not the square of an integer")
+                raise Exception(
+                    f"GridRotor factory: Value {n2} is not the square of an integer"
+                )
             return n
+
         self.rotor_models.add_factory(
             fm.rotor_models.GridRotor,
             "grid<n2>",
@@ -100,7 +103,7 @@ class ModelBook:
         )
         self.rotor_models.add_factory(
             fm.rotor_models.GridRotor,
-            "raw_grid<n2>",
+            "grid<n2>_raw",
             kwargs=dict(calc_vars=rvars, reduce=False),
             var2arg={"n2": "n"},
             n2=_n2n,
@@ -115,13 +118,13 @@ class ModelBook:
         )
         self.rotor_models.add_factory(
             fm.rotor_models.LevelRotor,
-            "raw_level<n>",
+            "level<n>_raw",
             kwargs=dict(calc_vars=rvars, reduce=False),
             n=lambda x: int(x),
             hints={"n": "(Number of vertical levels)"},
         )
 
-        self.turbine_types = Dict(name="turbine_types")
+        self.turbine_types = FDict(name="turbine_types")
         self.turbine_types["null_type"] = fm.turbine_types.NullType()
         self.turbine_types["NREL5MW"] = fm.turbine_types.PCtFile(
             "NREL-5MW-D126-H90.csv", rho=1.225
@@ -165,8 +168,10 @@ class ModelBook:
             "kTI_<kTI>_<kb>",
             kTI=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
             kb=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"kTI": "(Value, e.g. 004 for 0.04)",
-                   "kb": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "kTI": "(Value, e.g. 004 for 0.04)",
+                "kb": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.turbine_models.add_factory(
             fm.turbine_models.kTI,
@@ -174,8 +179,10 @@ class ModelBook:
             kwargs=dict(ti_var=FV.AMB_TI),
             kTI=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
             kb=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"kTI": "(Value, e.g. 004 for 0.04)",
-                   "kb": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "kTI": "(Value, e.g. 004 for 0.04)",
+                "kb": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.turbine_models["hubh_data"] = fm.turbine_models.RotorCentreCalc(
@@ -187,7 +194,7 @@ class ModelBook:
             }
         )
 
-        self.farm_models = Dict(
+        self.farm_models = FDict(
             name="farm_models",
             **{
                 f"farm_{mname}": fm.farm_models.Turbine2FarmModel(m)
@@ -195,7 +202,7 @@ class ModelBook:
             },
         )
 
-        self.farm_controllers = Dict(
+        self.farm_controllers = FDict(
             name="farm_controllers",
             basic_ctrl=fm.farm_controllers.BasicFarmController(),
         )
@@ -246,11 +253,13 @@ class ModelBook:
         )
 
         self.wake_frames["timelines"] = fm.wake_frames.Timelines()
+
         def _todt(x):
             if x[-1] == "s":
-                return float(x[:-1])/60
+                return float(x[:-1]) / 60
             elif x[-3:] == "min":
                 return float(x[:-3])
+
         self.wake_frames.add_factory(
             fm.wake_frames.Timelines,
             "timelines_<dt>",
@@ -266,7 +275,7 @@ class ModelBook:
             hints={"dt": "(Time step, e.g '10s', '1min' etc.)"},
         )
 
-        self.wake_superpositions = Dict(
+        self.wake_superpositions = FDict(
             name="wake_superpositions",
             ws_linear=fm.wake_superpositions.WSLinear(scale_amb=False),
             ws_linear_lim=fm.wake_superpositions.WSLinear(
@@ -309,11 +318,9 @@ class ModelBook:
             ti_max=fm.wake_superpositions.TIMax(superp_to_amb="quadratic"),
         )
 
-        self.axial_induction = Dict(name="induction_models")
-        self.axial_induction["Betz"] = fm.axial_induction_models.BetzAxialInduction()
-        self.axial_induction["Madsen"] = (
-            fm.axial_induction_models.MadsenAxialInduction()
-        )
+        self.axial_induction = FDict(name="induction_models")
+        self.axial_induction["Betz"] = fm.axial_induction.BetzAxialInduction()
+        self.axial_induction["Madsen"] = fm.axial_induction.MadsenAxialInduction()
 
         self.wake_models = FDict(name="wake_models")
 
@@ -328,8 +335,10 @@ class ModelBook:
             "Jensen_<superposition>_k<k>",
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -345,8 +354,10 @@ class ModelBook:
             kwargs=dict(sbeta_factor=0.2),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.wake_models.add_factory(
             fm.wake_models.wind.Bastankhah2014,
@@ -361,8 +372,10 @@ class ModelBook:
             kwargs=dict(sbeta_factor=0.2, induction="Betz"),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.wake_models.add_factory(
             fm.wake_models.wind.Bastankhah2014,
@@ -377,8 +390,10 @@ class ModelBook:
             kwargs=dict(sbeta_factor=0.25),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.wake_models.add_factory(
             fm.wake_models.wind.Bastankhah2014,
@@ -393,8 +408,10 @@ class ModelBook:
             kwargs=dict(sbeta_factor=0.25, induction="Betz"),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -408,8 +425,10 @@ class ModelBook:
             "Bastankhah2016_<superposition>_k<k>",
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.wake_models.add_factory(
             fm.wake_models.wind.Bastankhah2016,
@@ -424,8 +443,10 @@ class ModelBook:
             kwargs=dict(induction="Betz"),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -439,8 +460,10 @@ class ModelBook:
             "TurbOPark_<superposition>_k<k>",
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
         self.wake_models.add_factory(
             fm.wake_models.wind.TurbOParkWake,
@@ -455,8 +478,10 @@ class ModelBook:
             kwargs=dict(induction="Betz"),
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -464,8 +489,10 @@ class ModelBook:
             "TurbOParkIX_<superposition>_dx<dx>",
             superposition=lambda s: f"ws_{s}",
             dx=lambda x: float(x),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "dx": "(Integration step in m)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "dx": "(Integration step in m)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -474,9 +501,11 @@ class ModelBook:
             superposition=lambda s: f"ws_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
             dx=lambda x: float(x),
-            hints={"superposition": "(Superposition, e.g. linear for ws_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)",
-                   "dx": "(Integration step in m)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ws_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+                "dx": "(Integration step in m)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -493,8 +522,10 @@ class ModelBook:
             kwargs=dict(use_ambti=False),
             superposition=lambda s: f"ti_{s}",
             k=lambda x: float(f"0.{x[1:]}" if x[0] == "0" else float(x)),
-            hints={"superposition": "(Superposition, e.g. linear for ti_linear)",
-                   "k": "(Value, e.g. 004 for 0.04)"},
+            hints={
+                "superposition": "(Superposition, e.g. linear for ti_linear)",
+                "k": "(Value, e.g. 004 for 0.04)",
+            },
         )
 
         self.wake_models.add_factory(
@@ -520,7 +551,7 @@ class ModelBook:
             fm.wake_models.induction.SelfSimilar2020()
         )
 
-        self.sources = Dict(
+        self.sources = FDict(
             name="sources",
             point_models=self.point_models,
             rotor_models=self.rotor_models,
@@ -534,7 +565,7 @@ class ModelBook:
             wake_models=self.wake_models,
             axial_induction=self.axial_induction,
         )
-        self.base_classes = Dict(
+        self.base_classes = FDict(
             name="base_classes",
             point_models=PointDataModel,
             rotor_models=RotorModel,
@@ -663,7 +694,7 @@ class ModelBook:
 
         """
         for ms in self.sources.values():
-            if isinstance(ms, Dict):
+            if isinstance(ms, FDict):
                 for m in ms.values():
                     if m.initialized:
                         m.finalize(algo, verbosity)

foxes/models/wake_superpositions/ws_max.py

@@ -182,6 +182,7 @@ class WSMax(WakeSuperposition):
             w = np.minimum(w, self.lim_high - amb_results)
         return w
 
+
 class WSMaxLocal(WakeSuperposition):
     """
     Local max supersposition of wind deficit results

foxes/models/wake_superpositions/ws_pow.py

@@ -184,6 +184,7 @@ class WSPow(WakeSuperposition):
             w = np.minimum(w, self.lim_high - amb_results)
         return w
 
+
 class WSPowLocal(WakeSuperposition):
     """
     Local power supersposition of wind deficit results

foxes/models/wake_superpositions/ws_quadratic.py

@@ -179,6 +179,7 @@ class WSQuadratic(WakeSuperposition):
             w = np.minimum(w, self.lim_high - amb_results)
         return w
 
+
 class WSQuadraticLocal(WakeSuperposition):
     """
     Local quadratic supersposition of wind deficit results

foxes/utils/factory.py

@@ -1,10 +1,13 @@
+import numpy as np
+
 from .dict import Dict
 
+
 class Factory:
     """
-    Constructs objects from a choice of allowed 
+    Constructs objects from a choice of allowed
     constructor parameters
-    
+
     Attributes
     ----------
     base: class
@@ -22,25 +25,26 @@ class Factory:
         Hints for print_toc, only for variables for which the
         options are functions or missing
     options: dict
-        For each variable, e.g. A, B or C, the list or dict 
+        For each variable, e.g. A, B or C, the list or dict
         or function that maps a str to the actual value
 
     :group: utils
-    
+
     """
+
     def __init__(
-            self,
-            base,
-            name_template,
-            args=(),
-            kwargs={},
-            var2arg={},
-            hints={},
-            **options,
-        ):
+        self,
+        base,
+        name_template,
+        args=(),
+        kwargs={},
+        var2arg={},
+        hints={},
+        **options,
+    ):
         """
         Constructor.
-        
+
         Parameters
         ----------
         base: class
@@ -58,9 +62,9 @@ class Factory:
             Hints for print_toc, only for variables for which the
             options are functions or missing
         options: dict
-            For each variable, e.g. A, B or C, the list or dict 
+            For each variable, e.g. A, B or C, the list or dict
             or function that maps a str to the actual value
-        
+
         """
         self.base = base
         self.name_template = name_template
@@ -71,7 +75,9 @@ class Factory:
 
         parts = name_template.split(">")
         if len(parts) < 2:
-            raise ValueError(f"Factory '{name_template}': Expecting at least one variable in template, pattern '<..>'")
+            raise ValueError(
+                f"Factory '{name_template}': Expecting at least one variable in template, pattern '<..>'"
+            )
 
         self._vars = []
         self._pre = []
@@ -79,7 +85,13 @@ class Factory:
             if i < len(parts) - 1:
                 parts2 = p.split("<")
                 if len(parts2) != 2:
-                    raise ValueError(f"Factory '{name_template}': incomplete pattern brackets '<..>'")
+                    raise ValueError(
+                        f"Factory '{name_template}': incomplete pattern brackets '<..>' between variables, e.g. '_'"
+                    )
+                if i > 0 and len(parts2[0]) == 0:
+                    raise ValueError(
+                        f"Factory '{name_template}': Missing seperator like '_' in template between variables '{self._vars[-1]}' and '{parts[1]}'"
+                    )
                 self._pre.append(parts2[0])
                 self._vars.append(parts2[1])
             else:
@@ -89,34 +101,42 @@ class Factory:
             for vi, v in enumerate(self.variables):
                 p = self._pre[vi]
                 if vi < len(self.variables) - 1 and p == "":
-                    raise ValueError(f"Factory '{name_template}': Require indicator before variable '{v}' in template, e.g. '{v}<{v}>'")
-        
+                    raise ValueError(
+                        f"Factory '{name_template}': Require indicator before variable '{v}' in template, e.g. '{v}<{v}>'"
+                    )
+
         self.options = Dict(name=f"{self._pre[0]}_options")
-        for v, o  in options.items():
+        for v, o in options.items():
             if v not in self.variables:
-                raise KeyError(f"Factory '{name_template}': Variable '{v}' found in options, but not in template")
+                raise KeyError(
+                    f"Factory '{name_template}': Variable '{v}' found in options, but not in template"
+                )
             if isinstance(o, list) or isinstance(o, tuple):
                 o = {str(k): k for k in o}
             if isinstance(o, dict):
                 for k in o.keys():
                     if not isinstance(k, str):
-                        raise TypeError(f"Factory '{name_template}': Found option for variable '{v}' that is not a str, {k}")
+                        raise TypeError(
+                            f"Factory '{name_template}': Found option for variable '{v}' that is not a str, {k}"
+                        )
                 self.options[v] = Dict(name=f"{self._pre[0]}_options_{v}", **o)
             elif hasattr(o, "__call__"):
                 self.options[v] = o
             else:
-                raise ValueError(f"Factory '{name_template}': Variable '{v}' has option of type '{type(v).__name__}'. Only list, tuple, dict or function are supported")
-    
+                raise ValueError(
+                    f"Factory '{name_template}': Variable '{v}' has option of type '{type(v).__name__}'. Only list, tuple, dict or function are supported"
+                )
+
     @property
     def name_prefix(self):
         """
         The beginning of the name template
-        
+
         Returns
         -------
         nbase: str
             The beginning of the name template
-        
+
         """
         return self._pre[0]
 
@@ -124,30 +144,30 @@ class Factory:
     def name_suffix(self):
         """
         The ending of the name template
-        
+
         Returns
         -------
         nbase: str
             The ending of the name template
-        
+
         """
         return self._pre[-1]
-    
+
     @property
     def variables(self):
         """
         The list of variables
-        
+
         Returns
         -------
         vrs: list of str
             The variables
-        
+
         """
         return self._vars
-    
+
     def __str__(self):
-        """ String representation """
+        """String representation"""
         s = f"{self.name_template}: {self.base.__name__} with"
         for k, d in self.kwargs.items():
             s += f"\n  {k}={d}"
@@ -157,11 +177,11 @@ class Factory:
             else:
                 s += f"\n  {v}={self.hints.get(v, '(value)')}"
         return s
-    
+
     def check_match(self, name):
         """
         Tests if a name matches the template
-        
+
         Parameters
         ----------
         name: str
@@ -171,7 +191,7 @@ class Factory:
         -------
         success: bool
             True if the template is matched
-        
+
         """
         data_str = name
         for vi in range(len(self.variables)):
@@ -182,7 +202,7 @@ class Factory:
                 return False
             data_str = data_str[j:]
 
-            q = self._pre[vi+1]
+            q = self._pre[vi + 1]
             if q != "":
                 i = data_str.find(q)
                 j = i + len(q)
@@ -190,47 +210,42 @@ class Factory:
                     return False
             else:
                 data_str = ""
-        
+
         return True
 
     def construct(self, name):
         """
         Create an object of the base class.
-        
+
         Parameters
         ----------
         name: str
             The name, matching the template
-        
+
         Returns
         -------
         obj: object
             The instance of the base class
-        
+
         """
-        data_str = name
+        j = 0
         wlist = []
-        for vi, v in enumerate(self.variables):
-            p = self._pre[vi]
-            i = data_str.find(p)
-            j = i + len(p)
-            if i < 0 or len(data_str) <= j:
-                raise ValueError(f"Factory '{self.name_template}': Name '{name}' not matching template")
-            data_str = data_str[j:]
-
-            q = self._pre[vi+1]
-            if q != "":
-                i = data_str.find(q)
-                j = i + len(q)
-                if i < 0 or len(data_str) <= j:
-                    raise ValueError(f"Factory '{self.name_template}': Name '{name}' not matching template")
-                wlist.append(data_str[:i])
+        for pi, p in enumerate(self._pre):
+            if len(p) > 0:
+                i = name[j:].find(p)
+                if i < 0 or (pi == 0 and i > 0):
+                    raise ValueError(
+                        f"Factory '{self.name_template}': Name '{name}' not matching template"
+                    )
+                w = name[j : j + i]
+                j += i + len(p)
             else:
-                wlist.append(data_str)
-                data_str = ""
+                w = name[j:]
+            if pi > 0:
+                wlist.append(w)
 
         kwargs = {}
-        for vi, v in enumerate(self.variables):          
+        for vi, v in enumerate(self.variables):
             w = self.var2arg.get(v, v)
             data = wlist[vi]
             if v in self.options:
@@ -246,24 +261,26 @@ class Factory:
 
         return self.base(*self.args, **kwargs)
 
+
 class FDict(Dict):
     """
     A dictionary with factory support
-    
+
     Attributes
     ----------
     store_created: bool
         Flag for storing created objects
     factories: list of foxes.utils.Factory
         The factories
-    
+
     :group: utils
-    
+
     """
+
     def __init__(self, *args, store_created=True, **kwargs):
         """
         Constructor.
-        
+
         Parameters
         ----------
         args: tuple, optional
@@ -272,7 +289,7 @@ class FDict(Dict):
             Flag for storing created objects
         kwargs: dict, optional
             Parameters for the base class
-        
+
         """
         super().__init__(*args, **kwargs)
         self.store_created = store_created
@@ -281,21 +298,21 @@ class FDict(Dict):
     def add_factory(self, *args, **kwargs):
         """
         Constructor.
-        
+
         Parameters
         ----------
         args: tuple, optional
             Parameters for the Factory constructor
         kwargs: dict, optional
             Parameters for the Factory constructor
-        
+
         """
         f = Factory(*args, **kwargs)
         i = len(self.factories)
         for gi in range(len(self.factories) - 1, -1, -1):
             g = self.factories[gi]
             if (
-                g.name_prefix == f.name_prefix 
+                g.name_prefix == f.name_prefix
                 and g.name_suffix == f.name_suffix
                 and len(f.variables) > len(g.variables)
             ):
@@ -330,4 +347,3 @@ class FDict(Dict):
         k = ", ".join(sorted(list(self.keys())))
         e = f"{self.name}: Cannot find key '{key}', also no factory matches. Known keys: {k}. Known factories: {[f.name_template for f in self.factories]}"
         raise KeyError(e)
-                

{foxes-0.7.1.dist-info → foxes-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.7.1
+Version: 0.7.2
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
 Author-email: jonas.schmidt@iwes.fraunhofer.de

{foxes-0.7.1.dist-info → foxes-0.7.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-foxes/VERSION,sha256=kCMRx7s4-hZY_0A972FY7nN4_p1uLihPocOHNcMb0ws,6
+foxes/VERSION,sha256=0BdnGL0hTOhHTAbtYcOVyhE_38Ks3YbZqpkztA2bVh4,6
 foxes/__init__.py,sha256=4ptDOBaQC8fAd_ZH5XH7d5pIgx3JXEY9xLcK3Nrs2Ow,718
 foxes/constants.py,sha256=UfflqHQ67uSQYFFktZBSe6rrWntoL2ccpMHnKs7zTcA,2650
 foxes/variables.py,sha256=I-S25WejH33ffOcVnmN2TDL1pIxWqg0aM1lhIBwZ9NQ,4454
 foxes/algorithms/__init__.py,sha256=uaXU8OYMT3eclcE6a2b8NkozHVXoM1BF5RJA2XR4DUw,260
 foxes/algorithms/downwind/__init__.py,sha256=lyygq5GMc6NAPmH0b0mhGeccWyuC8JTOEMZl-UlmE5M,53
-foxes/algorithms/downwind/downwind.py,sha256=W2W1ftPTnfNroBSskbBbSYZSXM0_wSfTrye8wXmfu7k,21652
+foxes/algorithms/downwind/downwind.py,sha256=7TuClA6ZbHNJg2L9oOrWWUQ_qhRsiRTwYuK1BkN8od0,21690
 foxes/algorithms/downwind/models/__init__.py,sha256=0ov8rjIQ02w3iB6yYCxaswPvHDlPM_8_di6xPh1TTkQ,300
 foxes/algorithms/downwind/models/farm_wakes_calc.py,sha256=nRE_lCwrlVYB9zXJ0XR557IncNb6M7tUbhN9kBPgw_c,5178
 foxes/algorithms/downwind/models/init_farm_data.py,sha256=sTUMYGLU9iHr56prdNRR4cs0yuCFp7gqiCDut685HKM,4022
@@ -83,11 +83,11 @@ foxes/input/states/create/random_abl_states.py,sha256=45h0a84FmeLZwxbtwtxs5kmoz8
 foxes/input/states/create/random_timeseries.py,sha256=gJpaQ4nEXxOjI4hp3xjNcVbCsmZUm-brXUxoqDb63WE,1266
 foxes/input/windio/__init__.py,sha256=Bj9qtJNapfvgFcjThCI_oDia2hvMKN_seNLgm5KhWhw,89
 foxes/input/windio/windio.py,sha256=GtUS3IpHdvb_f2WPcoutpbKNQMEZbE4Bc0U3EVfXBEQ,7948
-foxes/models/__init__.py,sha256=FNEKtkT75LfVkT7H9rXX2Jn_15xB1qKF-2p3_nwCzIU,413
-foxes/models/model_book.py,sha256=PXs0amTpouSpoMmGToGuaDaUMe4H2sI6XcZOdBXvz60,26376
-foxes/models/axial_induction_models/__init__.py,sha256=CdYOzu45DWu7xrzpRpFIQ6CGZIMABjjy_lqAszjj9lg,78
-foxes/models/axial_induction_models/betz.py,sha256=rAaq7pnu-FmfYh61BU5Af1h4_bG2AAimP4Qah1aZo88,894
-foxes/models/axial_induction_models/madsen.py,sha256=_-ycfh8SnIpCKWm1uwx5VH7f49FQvR0y1Nbb_U8xWyU,1403
+foxes/models/__init__.py,sha256=oLuCuBgSGFPVviqtBhzEu-zo1lxLKeRE0ksqA3dkrz0,406
+foxes/models/model_book.py,sha256=34HoVcIEUneqb4EZZYaC0mhtraulEO_Ga50omRJSAhY,26786
+foxes/models/axial_induction/__init__.py,sha256=CdYOzu45DWu7xrzpRpFIQ6CGZIMABjjy_lqAszjj9lg,78
+foxes/models/axial_induction/betz.py,sha256=rAaq7pnu-FmfYh61BU5Af1h4_bG2AAimP4Qah1aZo88,894
+foxes/models/axial_induction/madsen.py,sha256=_-ycfh8SnIpCKWm1uwx5VH7f49FQvR0y1Nbb_U8xWyU,1403
 foxes/models/farm_controllers/__init__.py,sha256=oDdW_fA3GSkJBzn9Vsd3T9bBVhB9-j_IglFjYV4G2rU,72
 foxes/models/farm_controllers/basic.py,sha256=6pinNXiyfoG3apXhqQWcnxx4vN_7Q63YryXX5Z7kTE0,249
 foxes/models/farm_models/__init__.py,sha256=WoC1Cmeo5-LLdC5I_S9hwZhZOtBnWDL6azjaUTcoOuY,66
@@ -167,10 +167,10 @@ foxes/models/wake_superpositions/ti_max.py,sha256=fnfYmr_Wt9EPZftHoHnqRlTwFWAawr
 foxes/models/wake_superpositions/ti_pow.py,sha256=4ZS3d0ulRkIDaVeG2VvcdjpJch673INQRUGgj37cs_A,4160
 foxes/models/wake_superpositions/ti_quadratic.py,sha256=tkmaoIm7a-Q4c3qtMpBmX25jfcVdt0Qp7Xn0fQrxN4A,3926
 foxes/models/wake_superpositions/ws_linear.py,sha256=TiKaRAxNioY4oIloJODfT1zftnkXzhuqfqEkqG33owc,9155
-foxes/models/wake_superpositions/ws_max.py,sha256=lWQtvHwudPxyA1vUQodcqY37hlU4KiCWIC9XeupEHT8,9380
-foxes/models/wake_superpositions/ws_pow.py,sha256=HiuGiMffV7dT6qydK-O8VDuFsrx0bNEIancYy_zUO_o,9601
+foxes/models/wake_superpositions/ws_max.py,sha256=MktXVo3PfMgh172DJP_KRftiqs8jXsuaQPLne1jHKyY,9381
+foxes/models/wake_superpositions/ws_pow.py,sha256=aPtm5NwQx6byNfetSX57Z7tVkXtgXIRleSf4grKtZF0,9602
 foxes/models/wake_superpositions/ws_product.py,sha256=8dCDaKfuzHfTEBo0_N7BR-x_qG2tWXTabzPsgpIAtXk,4672
-foxes/models/wake_superpositions/ws_quadratic.py,sha256=6H0BXMXpraPX7iz_U6m8ZB9NSEcWgUJr7pR-x4ZzNo0,9196
+foxes/models/wake_superpositions/ws_quadratic.py,sha256=jUo4wFkrUPbj-27m3ozCEzab7iamkNZtVlrCwY-Yh2w,9197
 foxes/opt/__init__.py,sha256=okwZagHJMkUkLvKCSQLbE0cjx_47RLl3bEz576j6CdI,172
 foxes/opt/constraints/__init__.py,sha256=UZzN_JlxGaASdGtvBn5d5xwdSDpwO6bklj3vw70IZvU,159
 foxes/opt/constraints/area_geometry.py,sha256=9TFsyuM8_pp3HEUV4N0w0KnhxOk0OLPMKd6ZvNQGC80,6156
@@ -221,7 +221,7 @@ foxes/utils/cubic_roots.py,sha256=u2Pf-yHZ6EASpFONMfkv0mvldmd1E1VRZxj69YabDoc,33
 foxes/utils/data_book.py,sha256=DgxusriNH-fhHNN_v6TY3QWcAnrAcw20Wgz7lDfbMeg,5302
 foxes/utils/dict.py,sha256=s922OY22wOKBMbzQ_g-T-MhEw1dga0d3CCwFwd0nI78,886
 foxes/utils/exec_python.py,sha256=BRylxWOyYHpjIZXCuoOp_A-P9VMoQZ13P2vpHs-lqj8,1714
-foxes/utils/factory.py,sha256=pq028O6hlDFxhvMf7QN8_EUc4GOoBocDPOjwRt7gG80,9994
+foxes/utils/factory.py,sha256=_EO9H2xS-ceNJh9okS5FtQYKEGQUdcmhmCPZg6iLZ7w,10036
 foxes/utils/geopandas_helpers.py,sha256=inVQHMco6Op7YN3VFH1DGAJZWREuveJUS7gyoRudw2A,7895
 foxes/utils/geopandas_utils.py,sha256=inVQHMco6Op7YN3VFH1DGAJZWREuveJUS7gyoRudw2A,7895
 foxes/utils/load.py,sha256=7jrCX2GQ_GTgrSu3nz-jfxiyswa7Q3XXCYqobl6bkyk,1290
@@ -250,9 +250,9 @@ foxes/utils/geom2d/half_plane.py,sha256=kzZD6pkZxZ03MK9WAboWzXb5Ws5dWLQY9GIahD4D
 foxes/utils/geom2d/polygon.py,sha256=8ASfy7No_-Pt_xDSeNsDtLEkCjBWsNZK8nIxDQtqeOE,5534
 foxes/utils/runners/__init__.py,sha256=-WL4ZmdgNYldkqhCV6dR-aXCumBrH-Ea-V1shsRhsbs,55
 foxes/utils/runners/runners.py,sha256=Sc06qsCzPduMyxbywgf6G3uHRioDs1qWRSc6GZbLFAY,6932
-foxes-0.7.1.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
-foxes-0.7.1.dist-info/METADATA,sha256=-i7RicI54Ewf9bAL0TQcPm19xduZAR3Qq2WKSEEzQvo,9520
-foxes-0.7.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foxes-0.7.1.dist-info/top_level.txt,sha256=B4spGR6JHsVHz7CEXsa68xsjYalAA70nBwHa1gfyRHc,6
-foxes-0.7.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-foxes-0.7.1.dist-info/RECORD,,
+foxes-0.7.2.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
+foxes-0.7.2.dist-info/METADATA,sha256=4M2qRnVI00yQWjqJ9Fc6srHQh1M-6pSypZlNaeDzVP0,9520
+foxes-0.7.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foxes-0.7.2.dist-info/top_level.txt,sha256=B4spGR6JHsVHz7CEXsa68xsjYalAA70nBwHa1gfyRHc,6
+foxes-0.7.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+foxes-0.7.2.dist-info/RECORD,,