Addition of some features implemented by ipudk

docs/modules/fluid_properties.rst

@@ -184,7 +184,7 @@ isentropic change of pressure for an ideal gas.
     ...             + self.coefficients[5] * y ** 2
     ...         ) / self.coefficients[6]
     ...
-    ...     def h_pT(self, p, T):
+    ...     def h_pT(self, p, T, **kwargs):
     ...         return self._h_pT(p, T) - self.h_ref
     ...
     ...     def _h_pT(self, p, T):

pyproject.toml

@@ -25,7 +25,7 @@ exclude = ["docs/_build"]
 
 [project]
 name = "tespy"
-version = "0.7.3"
+version = "0.8"
 description = "Thermal Engineering Systems in Python (TESPy)"
 readme = "README.rst"
 authors = [

src/tespy/components/component.py

@@ -21,6 +21,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 ComponentProperties as dc_cp
+from tespy.tools.data_containers import ComponentPropertiesArray as dc_cpa
 from tespy.tools.data_containers import GroupedComponentCharacteristics as dc_gcc
 from tespy.tools.data_containers import GroupedComponentProperties as dc_gcp
 from tespy.tools.data_containers import SimpleDataContainer as dc_simple
@@ -209,6 +210,22 @@ def set_attr(self, **kwargs):
                         logger.error(msg)
                         raise TypeError(msg)
 
+                elif isinstance(data, dc_cpa):
+                    floats = [isinstance(f, float) for f in kwargs[key]]
+                    vars = [f == 'var' for f in kwargs[key]]
+                    is_numeric = any(floats)
+                    is_var = any(vars)
+                    num_eq = floats.count(True)
+
+                    if is_numeric or is_var:
+                        data.set_attr(val=kwargs[key], is_set=floats, is_var=vars, num_eq = num_eq)
+                    else:
+                        msg = (
+                            'Bad datatype for keyword argument ' + key +
+                            ' at ' + self.label + '.')
+                        logger.error(msg)
+                        raise TypeError(msg)
+
             elif key in ['design', 'offdesign']:
                 if not isinstance(kwargs[key], list):
                     msg = (

src/tespy/components/nodes/base.py

@@ -171,6 +171,8 @@ def initialise_source(c, key):
             return 1e5
         elif key == 'h':
             return 5e5
+        elif key == 'T': # maybe add more parameters
+            return 300            
 
     @staticmethod
     def initialise_target(c, key):
@@ -201,6 +203,8 @@ def initialise_target(c, key):
             return 1e5
         elif key == 'h':
             return 5e5
+        elif key == 'T': # maybe add more parameters
+            return 300
 
     def propagate_to_target(self, branch):
 

src/tespy/components/nodes/merge.py

@@ -112,7 +112,7 @@ class Merge(NodeBase):
     >>> inc1.set_attr(fluid={'O2': 0.23, 'N2': 0.77}, p=1, T=T, m=5)
     >>> inc2.set_attr(fluid={'O2': 1}, T=T, m=5)
     >>> inc3.set_attr(fluid={'N2': 1}, T=T)
-    >>> outg.set_attr(fluid={'N2': 0.4})
+    >>> outg.set_attr(fluid={'N2': 0.4, 'O2': 0.6})
     >>> nw.solve('design')
     >>> round(inc3.m.val_SI, 2)
     0.25

src/tespy/components/nodes/separator.py

@@ -127,7 +127,7 @@ class Separator(NodeBase):
     mass fraction for this outlet.
 
     >>> outg1.set_attr(m=None)
-    >>> outg2.set_attr(fluid={'O2': 0.3})
+    >>> outg2.set_attr(fluid={'O2': 0.3, 'N2': 0.7})
     >>> nw.solve('design')
     >>> outg2.fluid.val['O2']
     0.3
@@ -350,8 +350,10 @@ def energy_balance_deriv(self, increment_filter, k):
             # for fluid in i.fluid.is_var:
             #     self.jacobian[k, i.fluid.J_col[fluid]] = dT_dfluid_in[fluid]
             args = (o.p.val_SI, o.h.val_SI, o.fluid_data, o.mixing_rule)
-            self.jacobian[k, o.p.J_col] = -dT_mix_dph(*args)
-            self.jacobian[k, o.h.J_col] = -dT_mix_pdh(*args)
+            if self.is_variable(o.p):
+                self.jacobian[k, o.p.J_col] = -dT_mix_dph(*args)
+            if self.is_variable(o.h):
+                self.jacobian[k, o.h.J_col] = -dT_mix_pdh(*args)
             # for fluid in o.fluid.is_var:
             #     self.jacobian[k, o.fluid.J_col[fluid]] = -dT_mix_ph_dfluid(o)
             k += 1