Merge commits from ipudk/tespy

pyproject.toml

@@ -1,29 +1,4 @@
-[build-system]
-requires = ["flit_core >=3.2,<4"]
-build-backend = "flit_core.buildapi"
-
-[tool.flit.sdist]
-include = [
-    "CHANGELOG.rst",
-    "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md",
-    "MANIFEST.in",
-    "LICENSE*",
-    "PULL_REQUEST_TEMPLATE.md",
-    ".coveragerc",
-    ".editorconfig",
-    ".pep8speaks.yml",
-    ".readthedocs.yml",
-    "paper.bib",
-    "paper.md",
-    "tox.ini",
-    "docs/",
-    "tests/",
-    "tutorial/",
-]
-exclude = ["docs/_build"]
-
-[project]
+[tool.poetry]
 name = "tespy"
 version = "0.7.3"
 description = "Thermal Engineering Systems in Python (TESPy)"
@@ -56,25 +31,33 @@ dependencies = [
 ]
 license = {text = "MIT"}
 
-[project.urls]
-Homepage = "https://github.com/oemof/tespy"
-Documentation = "https://tespy.readthedocs.io/"
-Changelog = "https://tespy.readthedocs.io/en/main/whats_new.html"
-"Issue Tracker" = "https://github.com/oemof/tespy/issues"
+[tool.poetry.dependencies]
+python = "^3.9"
+numpy = "^1.25.1"
+matplotlib = "^3.7.2"
+pandas = "^2.0.3"
+tabulate = "^0.9.0"
+coolprop = "^6.6.0"
 
-[project.optional-dependencies]
-dev = [
-    "build",
-    "flit",
-    "furo",
-    "iapws",
-    "pyromat",
-    "pytest",
-    "sphinx>=7.2.2",
-    "sphinx-copybutton",
-    "sphinx-design",
-    "sphinxcontrib.bibtex",
-    "tox",
+[tool.poetry.group.coolprop.dependencies]
+cython = "^0.29.35"
+setuptools = "^67.8.0"
+wheel = "^0.40.0"
+requests = "^2.31.0"
+jinja2 = "^3.1.2"
+pyyaml = "^6.0"
+
+
+
+[tool.poetry.group.dev.dependencies]
+ipykernel = "^6.26.0"
+
+[build-system]
+requires = [
+    "poetry-core",
+    "setuptools>=30.3.0",
+    "wheel",
+    "setuptools_scm>=3.3.1",
 ]
 
 [tool.pytest.ini_options]

src/tespy/components/__init__.py

@@ -27,3 +27,9 @@
 from .turbomachinery.compressor import Compressor  # noqa: F401
 from .turbomachinery.pump import Pump  # noqa: F401
 from .turbomachinery.turbine import Turbine  # noqa: F401
+
+# New components
+from .newComponents import *
+from .newAdvancedComponents import *
+from .energySupplyComponents import *
+

src/tespy/components/component.py

@@ -24,6 +24,7 @@
 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
+from tespy.tools.data_containers import ComponentPropertiesArray as dc_cpa
 from tespy.tools.document_models import generate_latex_eq
 from tespy.tools.fluid_properties import v_mix_ph
 from tespy.tools.global_vars import ERR
@@ -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/separator.py

@@ -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