Store all *args and *kwargs as deep copies in the preparemethod2arguments dictionary of class TargetParameterUpdater of module importtools.

tyralla · tyralla · commit 54a5b7dec724 · 2025-02-24T10:56:17.000+01:00
This change must be considered a bug fix that potentially impacts simulation results.  Only those projects that use a main model that defines a "prepare method", a submodel that does not define this method, and a sub-submodel that uses the information provided by this method could be affected.  Such combinations can only occur with HydPy-Evap and should be rare.  Hence, it is unclear if any real projects have been affected by this bug.
diff --git a/hydpy/core/importtools.py b/hydpy/core/importtools.py
@@ -1064,17 +1064,19 @@ def __get__(
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> None:
         assert (model := self._model) is not None
+        args = copy.deepcopy(args)
+        kwargs = copy.deepcopy(kwargs)
         model.preparemethod2arguments[self._wrapped.__name__] = args, kwargs
         control = model.parameters.control
         if self.testmode:
             if (name := self.targetparameter.name) in control.names:
                 par = control[name]
-                self.values_test[model] = copy.deepcopy(((args, kwargs), par.value))
+                self.values_test[model] = ((args, kwargs), copy.deepcopy(par.value))
         else:
             if (name := self.targetparameter.name) in control.names:
                 self._wrapped(model, *args, **kwargs)
                 par = control[name]
-                self.values_orig[model] = copy.deepcopy(((args, kwargs), par.value))
+                self.values_orig[model] = ((args, kwargs), copy.deepcopy(par.value))
 
 
 def simulationstep(timestep: timetools.PeriodConstrArg) -> None:
diff --git a/hydpy/models/hland/hland_model.py b/hydpy/models/hland/hland_model.py
@@ -4567,7 +4567,7 @@ def add_aetmodel_v1(
         prepare_elevations: [300. 300. 300. 300. 300.]
         prepare_maxsoilwater: [200. 200. 200. 200. 200.]
         prepare_water: [False False  True False False]
-        prepare_interception: [ True  True False False False]
+        prepare_interception: [ True  True False False  True]
         prepare_plant: [ True  True False False False]
         prepare_soil: [ True  True False False False]
 
@@ -4596,8 +4596,8 @@ def add_aetmodel_v1(
         sel = ~sel
         sel[zonetype == GLACIER] = False
         aetmodel.prepare_interception(sel)
-        aetmodel.prepare_plant(sel)
         sel[zonetype == SEALED] = False
+        aetmodel.prepare_plant(sel)
         aetmodel.prepare_soil(sel)
 
 
diff --git a/hydpy/models/lland/lland_model.py b/hydpy/models/lland/lland_model.py
@@ -7531,11 +7531,11 @@ def add_aetmodel_v1(
         prepare_leafareaindex: [[1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1.]
         ...
         prepare_maxsoilwater: [50. 50. 50. 50. 50. 50. 50. 50. 50.]
-        prepare_water: [False False False  True  True  True  True  True  True]
+        prepare_water: [False False False False  True  True  True False False]
         prepare_interception: [ True  True  True  True False False False  True  True]
         prepare_soil: [ True  True  True False False False False  True  True]
         prepare_plant: [ True  True  True False False False False False False]
-        prepare_conifer: [False  True  True False False False False False False]
+        prepare_conifer: [False False  True False False False False False False]
         prepare_tree: [False  True  True False False False False False False]
 
         >>> model.aetmodel.parameters.control.leafareaindex.acker_jan
diff --git a/hydpy/models/wland/wland_model.py b/hydpy/models/wland/wland_model.py
@@ -3466,8 +3466,13 @@ def add_petmodel_v1(
         ...     nmbhru
         ...     hruarea
         ...     evapotranspirationfactor(field=1.0, trees=2.0, water=1.5)
+        ...     for method, arguments in model.preparemethod2arguments.items():
+        ...         print(method, arguments[0][0], sep=": ")
         nmbhru(3)
         hruarea(5.0, 3.0, 2.0)
+        prepare_nmbzones: 3
+        prepare_zonetypes: [13 19 23]
+        prepare_subareas: [5. 3. 2.]
 
         >>> etf = model.petmodel.parameters.control.evapotranspirationfactor
         >>> etf
@@ -3545,6 +3550,8 @@ def add_petmodel_v2(
         ...     groundalbedo(conifer=0.05, decidious=0.1, field=0.15, mixed=0.2,
         ...                  orchard=0.25, pasture=0.3, sealed=0.35, soil=0.4,
         ...                  trees=0.45, water=0.5, wetland=0.55, wine=0.6)
+        ...     for method, arguments in model.preparemethod2arguments.items():
+        ...         print(method, arguments[0][0], sep=": ")  # doctest: +ELLIPSIS
         nmbhru(12)
         hrutype(SEALED, FIELD, WINE, ORCHARD, SOIL, PASTURE, WETLAND, TREES,
                 CONIFER, DECIDIOUS, MIXED, WATER)
@@ -3564,6 +3571,21 @@ def add_petmodel_v2(
         ((12,), {})
         ((array([0.06, 0.2 , 0.34, 0.48, 0.62, 0.76, 0.9 , 1.04, 1.18, 1.32, 1.46,
                1.64]),), {})
+        prepare_nmbzones: 12
+        prepare_zonetypes: [12 13 14 15 16 17 18 19 20 21 22 23]
+        prepare_subareas: [0.06 0.2  0.34 0.48 0.62 0.76 0.9  1.04 1.18 1.32 1.46 1.64]
+        prepare_leafareaindex: [[1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1.]
+        ...
+        prepare_water: [False False False False False False False False False False \
+False  True]
+        prepare_interception: [ True  True  True  True  True  True  True  True  True  \
+True  True False]
+        prepare_soil: [False  True  True  True  True  True  True  True  True  True  \
+True False]
+        prepare_plant: [False  True  True  True False  True  True  True  True  True  \
+True False]
+        prepare_tree: [False False False False False False False False  True  True  \
+True False]
 
         >>> assert model is model.petmodel.tempmodel
         >>> assert model is model.petmodel.precipmodel
