making generic variable list

decoimpact/business/entities/rules/depth_average_rule.py

@@ -19,6 +19,11 @@
 )
 from decoimpact.business.entities.rules.rule_base import RuleBase
 from decoimpact.crosscutting.i_logger import ILogger
+from decoimpact.crosscutting.delft3d_specific_data import (
+    interfaces_name,
+    bed_level_name,
+    water_level_name,
+)
 
 
 class DepthAverageRule(RuleBase, IMultiArrayBasedRule):
@@ -42,9 +47,9 @@ def execute(
         variables = next(iter(value_arrays.values()))
 
         # depths interfaces = borders of the layers in terms of depth
-        depths_interfaces = value_arrays["mesh2d_interface_z"]
-        water_level_values = value_arrays["mesh2d_s1"]
-        bed_level_values = value_arrays["mesh2d_flowelem_bl"]
+        depths_interfaces = value_arrays[interfaces_name]
+        water_level_values = value_arrays[water_level_name]
+        bed_level_values = value_arrays[bed_level_name]
 
         # Get the dimension names for the interfaces and for the layers
         dim_interfaces_name = list(depths_interfaces.dims)[0]

decoimpact/crosscutting/delft3d_specific_data.py

@@ -0,0 +1,3 @@
+interfaces_name = "mesh2d_interface_z"
+bed_level_name = "mesh2d_flowelem_bl"
+water_level_name = "mesh2d_s1"

decoimpact/data/parsers/parser_depth_average_rule.py

@@ -17,6 +17,11 @@
 from decoimpact.data.dictionary_utils import get_dict_element
 from decoimpact.data.entities.depth_average_rule_data import DepthAverageRuleData
 from decoimpact.data.parsers.i_parser_rule_base import IParserRuleBase
+from decoimpact.crosscutting.delft3d_specific_data import (
+    interfaces_name,
+    bed_level_name,
+    water_level_name,
+)
 
 
 class ParserDepthAverageRule(IParserRuleBase):
@@ -38,9 +43,9 @@ def parse_dict(self, dictionary: Dict[str, Any], logger: ILogger) -> IRuleData:
         name: str = get_dict_element("name", dictionary)
         input_variable_names: List[str] = [
             get_dict_element("input_variable", dictionary),
-            "mesh2d_interface_z",
-            "mesh2d_s1",
-            "mesh2d_flowelem_bl",
+            interfaces_name,
+            water_level_name,
+            bed_level_name,
         ]
         output_variable_name: str = get_dict_element("output_variable", dictionary)
         description: str = get_dict_element("description", dictionary, False) or ""

tests/business/entities/rules/test_depth_average_rule.py

@@ -88,7 +88,7 @@ def test_depth_average_rule(
     data_variable: List[float],
     mesh2d_interface_z: List[float],
     mesh2d_flowelem_bl: List[float],
-    mesh2d_s1: List[List[float]],
+    mesh2d_s1: List[float],
     result_data: List[float],
 ):
     """Make sure the calculation of the depth average is correct. Including