Add IE39 with hydro nodes

SanPen · Jan 8, 2024 · 4c080d8 · 4c080d8
1 parent 6ae0c4d
commit 4c080d8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 31 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/GridCalEngine/Core/Devices/Fluid/fluid_node.py b/src/GridCalEngine/Core/Devices/Fluid/fluid_node.py
@@ -105,28 +105,28 @@ def copy(self):
         :return: Copy of this object
         """
 
-    # make a new instance (separated object in memory)
-    fluid_node = FluidNode()
+        # make a new instance (separated object in memory)
+        fluid_node = FluidNode()
 
-    fluid_node.min_level = self.min_level  # hm3
-    fluid_node.max_level = self.max_level  # hm3
-    fluid_node.initial_level = self.current_level  # hm3
-    fluid_node.spillage_cost = self.spillage_cost  # m3/h
-    fluid_node.inflow = self.inflow  # m3/h
-    fluid_node._bus: Bus = self.bus
-    fluid_node.build_status = self.build_status
+        fluid_node.min_level = self.min_level  # hm3
+        fluid_node.max_level = self.max_level  # hm3
+        fluid_node.initial_level = self.current_level  # hm3
+        fluid_node.spillage_cost = self.spillage_cost  # m3/h
+        fluid_node.inflow = self.inflow  # m3/h
+        fluid_node._bus: Bus = self.bus
+        fluid_node.build_status = self.build_status
 
-    fluid_node.inflow_prof = self.inflow_prof  # m3/h
-    fluid_node.spillage_cost_prof = self.spillage_cost_prof  # €/(m3/h)
+        fluid_node.inflow_prof = self.inflow_prof  # m3/h
+        fluid_node.spillage_cost_prof = self.spillage_cost_prof  # €/(m3/h)
 
-    # list of turbines
-    fluid_node.turbines = self.turbines
+        # list of turbines
+        fluid_node.turbines = self.turbines
 
-    # list of pumps
-    fluid_node.pumps = self.pumps
+        # list of pumps
+        fluid_node.pumps = self.pumps
 
-    # list of power to gas devices
-    fluid_node.p2xs = self.p2xs
+        # list of power to gas devices
+        fluid_node.p2xs = self.p2xs
 
     @property
     def bus(self) -> Bus:

diff --git a/src/GridCalEngine/Simulations/OPF/linear_opf_ts.py b/src/GridCalEngine/Simulations/OPF/linear_opf_ts.py
@@ -1327,10 +1327,6 @@ def add_hydro_formulation(t: Union[int, None],
                                             ub=path_data.max_flow[m],
                                             name=join("hflow_", [t, m], "_"))
 
-    # add flow variables for turbines and pumps to be recovered later on
-    # for m in range(turbine_data.nelm):
-    #     inj_vars.flow[t, m] = prob.add_var()
-
     # Constraints
     for m in range(path_data.nelm):
         # inflow: fluid flow entering the target node in m3/h
@@ -1358,7 +1354,7 @@ def add_hydro_formulation(t: Union[int, None],
             logger.add_error(msg='Turbine generator pmin < 0 is not possible',
                              value=generator_data.pmin[gen_idx])
 
-        f_obj += turbine_flow
+        # f_obj += turbine_flow
 
     for m in range(pump_data.nelm):
         gen_idx = pump_data.generator_idx[m]
@@ -1380,7 +1376,7 @@ def add_hydro_formulation(t: Union[int, None],
             logger.add_error(msg='Pump generator pmax > 0 is not possible',
                              value=generator_data.pmax[gen_idx])
 
-        f_obj -= pump_flow
+        # f_obj -= pump_flow
 
     for m in range(p2x_data.nelm):
         gen_idx = p2x_data.generator_idx[m]
@@ -1399,7 +1395,7 @@ def add_hydro_formulation(t: Union[int, None],
             logger.add_error(msg='P2X generator pmax > 0 is not possible',
                              value=generator_data.pmax[gen_idx])
 
-        f_obj -= p2x_flow
+        # f_obj -= p2x_flow
 
     if t is not None:
         # constraints for the node level