added proper mappings to all blocks

Author: RemDelaporteMathurin

src/python/custom_pathsim_blocks.py

@@ -6,6 +6,7 @@
 
 class Process(ODE):
     name_to_output_port = {"inv": 0, "mass_flow_rate": 1}
+    _port_map_out = {"inv": 0, "mass_flow_rate": 1}
 
     def __init__(self, residence_time=0, initial_value=0, source_term=0):
         alpha = -1 / residence_time if residence_time != 0 else 0
@@ -25,8 +26,8 @@ def update(self, t):
             mass_rate = x / self.residence_time
         # first output is the inv, second is the mass_flow_rate
         outputs = [None, None]
-        outputs[self.name_to_output_port["inv"]] = x
-        outputs[self.name_to_output_port["mass_flow_rate"]] = mass_rate
+        outputs[self._port_map_out["inv"]] = x
+        outputs[self._port_map_out["mass_flow_rate"]] = mass_rate
         # update the outputs
         self.outputs.update_from_array(outputs)
 
@@ -48,6 +49,7 @@ def update(self, t):
 
 class Splitter2(Splitter):
     name_to_output_port = {"source1": 0, "source2": 1}
+    _port_map_out = {"source1": 0, "source2": 1}
 
     def __init__(self, f1=0.5, f2=0.5):
         """
@@ -58,6 +60,7 @@ def __init__(self, f1=0.5, f2=0.5):
 
 class Splitter3(Splitter):
     name_to_output_port = {"source1": 0, "source2": 1, "source3": 2}
+    _port_map_out = {"source1": 0, "source2": 1, "source3": 2}
 
     def __init__(self, f1=1 / 3, f2=1 / 3, f3=1 / 3):
         """
@@ -126,6 +129,17 @@ class Bubbler(Subsystem):
         "vial4": 3,
         "sample_out": 4,
     }
+    _port_map_out = {
+        "vial1": 0,
+        "vial2": 1,
+        "vial3": 2,
+        "vial4": 3,
+        "sample_out": 4,
+    }
+    _port_map_in = {
+        "sample_in_soluble": 0,
+        "sample_in_insoluble": 1,
+    }
 
     def __init__(
         self,
@@ -183,7 +197,7 @@ def __init__(
         ]
         connections = [
             Connection(
-                interface[self.name_to_input_port["sample_in_soluble"]], col_eff1
+                interface[self._port_map_in["sample_in_soluble"]], col_eff1
             ),
             Connection(col_eff1[0], vial_1),
             Connection(col_eff1[1], col_eff2),
@@ -192,18 +206,18 @@ def __init__(
             Connection(conversion_eff[0], add1[0]),
             Connection(conversion_eff[1], add2[0]),
             Connection(
-                interface[self.name_to_input_port["sample_in_insoluble"]], add1[1]
+                interface[self._port_map_in["sample_in_insoluble"]], add1[1]
             ),
             Connection(add1, col_eff3),
             Connection(col_eff3[0], vial_3),
             Connection(col_eff3[1], col_eff4),
             Connection(col_eff4[0], vial_4),
             Connection(col_eff4[1], add2[1]),
-            Connection(vial_1, interface[self.name_to_output_port["vial1"]]),
-            Connection(vial_2, interface[self.name_to_output_port["vial2"]]),
-            Connection(vial_3, interface[self.name_to_output_port["vial3"]]),
-            Connection(vial_4, interface[self.name_to_output_port["vial4"]]),
-            Connection(add2, interface[self.name_to_output_port["sample_out"]]),
+            Connection(vial_1, interface[self._port_map_out["vial1"]]),
+            Connection(vial_2, interface[self._port_map_out["vial2"]]),
+            Connection(vial_3, interface[self._port_map_out["vial3"]]),
+            Connection(vial_4, interface[self._port_map_out["vial4"]]),
+            Connection(add2, interface[self._port_map_out["sample_out"]]),
         ]
         super().__init__(blocks, connections)
 
@@ -262,17 +276,20 @@ class FestimWall(Block):
     name_to_output_port = {"flux_0": 0, "flux_L": 1}
     name_to_input_port = {"c_0": 0, "c_L": 1}
 
+    _port_map_out = {"flux_0": 0, "flux_L": 1}
+    _port_map_in = {"c_0": 0, "c_L": 1}
+
     def __init__(
         self, thickness, temperature, D_0, E_D, surface_area=1, n_vertices=100
     ):
-        super().__init__()
         try:
             import festim as F
         except ImportError:
             raise ImportError("festim is needed for FestimWall node.")
+        super().__init__()
 
-        self.inputs = Register(size=2)
-        self.outputs = Register(size=2)
+        self.inputs = Register(size=2, mapping=self._port_map_in)
+        self.outputs = Register(size=2, mapping=self._port_map_out)
 
         self.thickness = thickness
         self.temperature = temperature
@@ -345,10 +362,8 @@ def update(self, t):
         #     return 0.0
 
         # block inputs
-        inputs = self.inputs.to_array()
-        c_0 = inputs[self.name_to_input_port["c_0"]]
-        c_L = inputs[self.name_to_input_port["c_L"]]
-        # print(c_0, c_L)
+        c_0 = self.inputs["c_0"]
+        c_L = self.inputs["c_L"]
 
         if t == 0.0:
             flux_0, flux_L = 0, 0
@@ -359,7 +374,7 @@ def update(self, t):
 
         flux_0 *= self.surface_area
         flux_L *= self.surface_area
-        outputs = [None, None]
-        outputs[self.name_to_output_port["flux_0"]] = flux_0
-        outputs[self.name_to_output_port["flux_L"]] = flux_L
-        return self.outputs.update_from_array(outputs)
+
+        self.outputs["flux_0"] = flux_0
+        self.outputs["flux_L"] = flux_L
+        return self.outputs