Fix starting value discovery for loading networks after export

oemof · Sep 25, 2023 · 22733ce · 22733ce
1 parent f9320e1
commit 22733ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/tespy/networks/network.py b/src/tespy/networks/network.py
@@ -1012,17 +1012,15 @@ def presolve_fluid_topology(self):
                 main_conn._fluid_tmp.is_set = main_conn.fluid.is_set.copy()
                 main_conn._fluid_tmp.is_var = main_conn.fluid.is_var.copy()
                 main_conn._fluid_tmp.wrapper = main_conn.fluid.wrapper.copy()
+                main_conn._fluid_tmp.engine = main_conn.fluid.engine.copy()
+                main_conn._fluid_tmp.back_end = main_conn.fluid.back_end.copy()
 
                 for c in all_connections[1:]:
                     c._fluid_tmp = c.fluid
                     c.fluid = main_conn.fluid
 
                 if len(main_conn._potential_fluids) > 1:
                     main_conn.fluid.is_var = {f for f in main_conn.fluid.val}
-                    with_starting_value = sum(main_conn.fluid.val0.values())
-                    for f in main_conn.fluid.val:
-                        if f not in main_conn.fluid.val0:
-                            main_conn.fluid.val[f] = (1 - with_starting_value) / len(main_conn.fluid.is_var)
                 else:
                     main_conn.fluid.val[list(main_conn._potential_fluids)[0]] = 1
 

diff --git a/src/tespy/networks/network_reader.py b/src/tespy/networks/network_reader.py
@@ -51,6 +51,7 @@
 from tespy.tools.data_containers import ComponentCharacteristicMaps as dc_cm
 from tespy.tools.data_containers import ComponentCharacteristics as dc_cc
 from tespy.tools.data_containers import DataContainer as dc
+from tespy.tools.data_containers import FluidProperties as dc_prop
 from tespy.tools.fluid_properties.wrappers import CoolPropWrapper
 from tespy.tools.fluid_properties.wrappers import IAPWSWrapper
 from tespy.tools.fluid_properties.wrappers import PyromatWrapper
@@ -338,6 +339,8 @@ def construct_components(component, data):
                     param_data["char_func"] = CharLine(**param_data["char_func"])
                 elif isinstance(container, dc_cm):
                     param_data["char_func"] = CharMap(**param_data["char_func"])
+                if isinstance(container, dc_prop):
+                    param_data["val0"] = param_data["val"]
                 container.set_attr(**param_data)
             else:
                 instances[cp].set_attr(**{param: param_data})