tespy 0.3.0__tar.gz → 0.3.2__tar.gz

{TESPy-0.3.0 → TESPy-0.3.2}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: TESPy
-Version: 0.3.0
+Version: 0.3.2
 Summary: Thermal Engineering Systems in Python (TESPy)
 Home-page: https://github.com/oemof/tespy
 Author: Francesco Witte
 Author-email: francesco.witte@hs-flensburg.de
 License: MIT
+Project-URL: Issue Tracker, https://github.com/oemof/tespy/issues
 Project-URL: Documentation, https://tespy.readthedocs.io/
 Project-URL: Changelog, https://tespy.readthedocs.io/en/latest/whats_new.html
-Project-URL: Issue Tracker, https://github.com/oemof/tespy/issues
 Description: Thermal Engineering Systems in Python
         =====================================
         
@@ -139,5 +139,5 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.6, <3.9
-Provides-Extra: dev
 Provides-Extra: dummy
+Provides-Extra: dev

TESPy-0.3.2/docs/whats_new/v0-3-1.rst

@@ -0,0 +1,11 @@
+v0.3.1 - Fix for Mayer's Merit (May, 29, 2020)
+++++++++++++++++++++++++++++++++++++++++++++++
+
+Bug fixes
+#########
+- Remove a debugging printout in the kA_func of the
+  :py:class:`tespy.components.heat_exchangers.heat_exchanger_simple` class.
+
+Contributors
+############
+- Francesco Witte (`@fwitte <https://github.com/fwitte>`_)

TESPy-0.3.2/docs/whats_new/v0-3-2.rst

@@ -0,0 +1,47 @@
+v0.3.2 - Carnot's Colors (June, 10, 2020)
++++++++++++++++++++++++++++++++++++++++++
+
+New features
+############
+- Colored printouts are available in the :code:`print_results()` method of the
+  network class. There are three different color codes available with default
+  settings:
+
+  - user specified parameters (:code:`'set'`, blue)
+  - component parameters specified as variables (:code:`'var'`, green)
+  - faulty parameters (:code:`'err'`, red)
+
+  In order to change the colors, simply import :code:`coloring` from the
+  :py:mod:`tespy.tools.global_vars` module and adjust the escape codes. For
+  example, to reset all colors to white text:
+
+  .. code-block:: python
+
+        from tespy.tools.global_vars import coloring
+        coloring['set'] = '\033[0m'
+        coloring['err'] = '\033[0m'
+        coloring['var'] = '\033[0m'
+
+  See `here <https://en.wikipedia.org/wiki/ANSI_escape_code#Colors>`_ for a
+  list of available codes
+  (`PR #205 <https://github.com/oemof/tespy/pull/205>`_).
+
+Bug fixes
+#########
+- Readd method for :code:`T_mix_ps` calculation for pure fluids: In case the
+  fluid propagation did not go through (e.g. due to availability of good
+  starting values) the fluid composition at a turbomachine's inlet and outlet
+  may not be equal (`PR #207 <https://github.com/oemof/tespy/pull/207>`_).
+- Fix the calculation of mixture density: The density is calculated as sum of
+  the densities of the mixture components at their respective partial pressure
+  and the mixture temperature
+  (`PR #207 <https://github.com/oemof/tespy/pull/207>`_). With the old method,
+  the specific volume was calculated according to Amagat's law, which produced
+  incorrect values if one or more components of the mixture were liquid at the
+  mixture's temperature and pressure. See discussion about humid air propreties
+  here: `Issue #206 <https://github.com/oemof/tespy/issues/206>`_.
+
+Contributors
+############
+- Francesco Witte (`@fwitte <https://github.com/fwitte>`_)
+- `@jbueck <https://github.com/jbueck>`_

{TESPy-0.3.0 → TESPy-0.3.2}/docs/whats_new.rst

@@ -7,7 +7,9 @@ Discover noteable new features and improvements in each release
     :depth: 1
     :local:
     :backlinks: top
-
+    
+.. include::  whats_new/v0-3-2.rst
+.. include::  whats_new/v0-3-1.rst
 .. include::  whats_new/v0-3-0.rst
 .. include::  whats_new/v0-2-2.rst
 .. include::  whats_new/v0-2-1.rst

{TESPy-0.3.0 → TESPy-0.3.2}/setup.py

@@ -25,7 +25,7 @@ def read(*names, **kwargs):
 
 setup(
     name='TESPy',
-    version='0.3.0',
+    version='0.3.2',
     license='MIT',
     description='Thermal Engineering Systems in Python (TESPy)',
     long_description='%s' % (

{TESPy-0.3.0 → TESPy-0.3.2}/src/TESPy.egg-info/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: TESPy
-Version: 0.3.0
+Version: 0.3.2
 Summary: Thermal Engineering Systems in Python (TESPy)
 Home-page: https://github.com/oemof/tespy
 Author: Francesco Witte
 Author-email: francesco.witte@hs-flensburg.de
 License: MIT
+Project-URL: Issue Tracker, https://github.com/oemof/tespy/issues
 Project-URL: Documentation, https://tespy.readthedocs.io/
 Project-URL: Changelog, https://tespy.readthedocs.io/en/latest/whats_new.html
-Project-URL: Issue Tracker, https://github.com/oemof/tespy/issues
 Description: Thermal Engineering Systems in Python
         =====================================
         
@@ -139,5 +139,5 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.6, <3.9
-Provides-Extra: dev
 Provides-Extra: dummy
+Provides-Extra: dev

{TESPy-0.3.0 → TESPy-0.3.2}/src/TESPy.egg-info/SOURCES.txt

@@ -108,6 +108,8 @@ docs/whats_new/v0-2-0.rst
 docs/whats_new/v0-2-1.rst
 docs/whats_new/v0-2-2.rst
 docs/whats_new/v0-3-0.rst
+docs/whats_new/v0-3-1.rst
+docs/whats_new/v0-3-2.rst
 src/TESPy.egg-info/PKG-INFO
 src/TESPy.egg-info/SOURCES.txt
 src/TESPy.egg-info/dependency_links.txt

{TESPy-0.3.0 → TESPy-0.3.2}/src/tespy/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8
 
-__version__ = '0.3.0 - Mayer\'s Merit'
+__version__ = '0.3.2 - Carnot\'s Colors'
 
 # tespy data and connection import
 from . import connections  # noqa: F401

{TESPy-0.3.0 → TESPy-0.3.2}/src/tespy/components/heat_exchangers.py

@@ -319,7 +319,7 @@ class heat_exchanger_simple(component):
                 'in the calculation. If you want to use the value adaption of '
                 'kA by the characteristic line, please use kA_char as '
                 'parameter instead (occurred at ' + self.label + '). This '
-                'warning will disappear in TESPy version 0.3.2.')
+                'warning will disappear in TESPy version 0.4.0.')
             warnings.warn(msg, FutureWarning, stacklevel=2)
 
         self.jacobian = np.zeros((
@@ -647,8 +647,6 @@ class heat_exchanger_simple(component):
         else:
             td_log = 0
 
-        print(ttd_1, ttd_2)
-
         return i[0] * (o[2] - i[2]) + self.kA.val * td_log
 
     def kA_char_func(self):
@@ -1830,7 +1828,7 @@ class heat_exchanger(component):
                 'in the calculation. If you want to use the value adaption of '
                 'kA by the characteristic line, please use kA_char as '
                 'parameter instead (occurred at ' + self.label + '). This '
-                'warning will disappear in TESPy version 0.3.2.')
+                'warning will disappear in TESPy version 0.4.0.')
             warnings.warn(msg, FutureWarning, stacklevel=2)
 
         self.jacobian = np.zeros((
@@ -2707,7 +2705,7 @@ class condenser(heat_exchanger):
                 'in the calculation. If you want to use the value adaption of '
                 'kA by the characteristic line, please use kA_char as '
                 'parameter instead (occurred at ' + self.label + '). This '
-                'warning will disappear in TESPy version 0.3.2.')
+                'warning will disappear in TESPy version 0.4.0.')
             warnings.warn(msg, FutureWarning, stacklevel=2)
 
         self.jacobian = np.zeros((
@@ -3075,7 +3073,7 @@ class desuperheater(heat_exchanger):
                 'in the calculation. If you want to use the value adaption of '
                 'kA by the characteristic line, please use kA_char as '
                 'parameter instead (occurred at ' + self.label + '). This '
-                'warning will disappear in TESPy version 0.3.2.')
+                'warning will disappear in TESPy version 0.4.0.')
             warnings.warn(msg, FutureWarning, stacklevel=2)
 
         self.jacobian = np.zeros((

{TESPy-0.3.0 → TESPy-0.3.2}/src/tespy/connections.py

@@ -902,7 +902,7 @@ class bus:
                         comp = c['c']
                         msg = (
                             'The dictionary keyword "c" will be removed in '
-                            'TESPy version 0.3.2. Please use "comp" instead.')
+                            'TESPy version 0.4.0. Please use "comp" instead.')
                         warnings.warn(msg, FutureWarning, stacklevel=2)
                     else:
                         comp = c['comp']
@@ -924,7 +924,7 @@ class bus:
                         if k == 'p':
                             msg = (
                                 'The dictionary keyword "p" will be removed '
-                                'TESPy version 0.3.2. Please use "param" '
+                                'TESPy version 0.4.0. Please use "param" '
                                 'instead.')
                             warnings.warn(msg, FutureWarning, stacklevel=2)
                         if isinstance(v, str) or v is None:

{TESPy-0.3.0 → TESPy-0.3.2}/src/tespy/networks/network_reader.py

@@ -214,7 +214,7 @@ def load_network(path):
     >>> eta_s_t
     0.898
     >>> igva
-    20.139
+    20.138
 
     The designed network is exported to the path 'exported_nwk'. Now import the
     network and recalculate. Check if the results match with the previous
@@ -305,7 +305,7 @@ def load_network(path):
                     'component data for component of type ' + f[:-4] + '. '
                     'Please make sure to add the column bus_base to your data '
                     'or recreate the network export with the TESPy 0.3.x API. '
-                    'This warning will be removed in TESPy version 0.3.2.')
+                    'This warning will be removed in TESPy version 0.4.0.')
                 warnings.warn(msg, FutureWarning, stacklevel=2)
 
             comps = pd.concat((comps, df[cols]), axis=0)

{TESPy-0.3.0 → TESPy-0.3.2}/src/tespy/networks/networks.py

@@ -42,6 +42,7 @@ from tespy.components.reactors import water_electrolyzer
 from tespy.tools import data_containers as dc
 from tespy.tools import fluid_properties as fp
 from tespy.tools import helpers as hlp
+from tespy.tools.global_vars import coloring
 from tespy.tools.global_vars import err
 
 
@@ -305,11 +306,11 @@ class network:
         self.h_range_SI = np.array([1e3, 7e6])
 
         for prop in ['m', 'p', 'h']:
-            msg = ('Default ' + self.props[prop] + ' limits, min: ' +
-                   str(self.__dict__[prop + '_range_SI'][0]) + ' ' +
-                   self.SI_units[prop] + ', max: ' +
-                   str(self.__dict__[prop + '_range_SI'][1]) + ' ' +
-                   self.SI_units[prop] + '.')
+            limits = self.get_attr(prop + '_range_SI')
+            msg = (
+                'Default ' + self.props[prop] + ' limits, min: ' +
+                str(limits[0]) + ' ' + self.SI_units[prop] + ', max: ' +
+                str(limits[1]) + ' ' + self.SI_units[prop] + '.')
             logging.debug(msg)
 
         self.set_attr(**kwargs)
@@ -365,7 +366,7 @@ class network:
                     logging.error(msg)
                     raise ValueError(msg)
                 else:
-                    self.__dict__[unit] = kwargs[unit]
+                    self.__dict__.update({unit: kwargs[unit]})
                     msg = ('Setting ' + self.props[prop] + ' unit: ' +
                            kwargs[unit] + '.')
                     logging.debug(msg)
@@ -382,13 +383,13 @@ class network:
                     self.__dict__.update(
                         {prop + '_range_SI':
                          np.array(kwargs[prop + '_range']) *
-                         self.__dict__[prop][self.__dict__[prop + '_unit']]})
+                         self.get_attr(prop)[self.get_attr(prop + '_unit')]})
 
-                msg = ('Setting ' + self.props[prop] + ' limits, min: ' +
-                       str(self.__dict__[prop + '_range_SI'][0]) + ' ' +
-                       self.SI_units[prop] + ', max: ' +
-                       str(self.__dict__[prop + '_range_SI'][1]) + ' ' +
-                       self.SI_units[prop] + '.')
+                limits = self.get_attr(prop + '_range_SI')
+                msg = (
+                    'Setting ' + self.props[prop] + ' limits, min: ' +
+                    str(limits[0]) + ' ' + self.SI_units[prop] + ', max: ' +
+                    str(limits[1]) + ' ' + self.SI_units[prop] + '.')
                 logging.debug(msg)
 
         # update non SI value ranges
@@ -438,18 +439,6 @@ class network:
             for c in subsys.conns.values():
                 self.add_conns(c)
 
-    def add_nwks(self, *args):
-        """
-        Add connections from a different network.
-
-        :param args: network objects si :code:`add_subsys(s1, s2, s3, ...)`
-        :type args: tespy.networks.network
-        :returns: no return value
-        """
-        for nw in args:
-            for c in nw.conns.index:
-                self.add_conns(c)
-
     def add_conns(self, *args):
         r"""
         Add one or more connections to the network.
@@ -613,18 +602,18 @@ class network:
             num_o = (self.conns[['source', 'target']] == comp).sum().source
             num_i = (self.conns[['source', 'target']] == comp).sum().target
             if num_o != comp.num_o:
-                msg = (comp.label + ' is missing ' + str(comp.num_o - num_o) +
-                       ' outgoing connections. Make sure all outlets are '
-                       ' connected and all connections have been added to the '
-                       'network.')
+                msg = (
+                    comp.label + ' is missing ' + str(comp.num_o - num_o) + ' '
+                    'outgoing connections. Make sure all outlets are connected'
+                    ' and all connections have been added to the network.')
                 logging.error(msg)
                 # raise an error in case network check is unsuccesful
                 raise hlp.TESPyNetworkError(msg)
             elif num_i != comp.num_i:
-                msg = (comp.label + ' is missing ' + str(comp.num_i - num_i) +
-                       ' incoming connections. Make sure all inlets are '
-                       ' connected and all connections have been added to the '
-                       'network.')
+                msg = (
+                    comp.label + ' is missing ' + str(comp.num_i - num_i) + ' '
+                    'incoming connections. Make sure all inlets are connected '
+                    'and all connections have been added to the network.')
                 logging.error(msg)
                 # raise an error in case network check is unsuccesful
                 raise hlp.TESPyNetworkError(msg)
@@ -679,10 +668,10 @@ class network:
 
         # check for duplicates in the component labels
         if len(labels) != len(list(set(labels))):
-            duplicates = [item for item, count in
-                          Counter(labels).items() if count > 1]
-            msg = ('All Components must have unique labels, duplicates are: '
-                   + str(duplicates) + '.')
+            duplicates = [
+                item for item, count in Counter(labels).items() if count > 1]
+            msg = ('All Components must have unique labels, duplicates are: ' +
+                   str(duplicates) + '.')
             logging.error(msg)
             raise hlp.TESPyNetworkError(msg)
 
@@ -702,9 +691,9 @@ class network:
         - Switch from design/offdesign parameter specification.
         """
         if len(self.conns) == 0:
-            msg = ('No connections have been added to the network, please '
-                   'make sure to add your connections with the '
-                   '.add_conns() method.')
+            msg = (
+                'No connections have been added to the network, please make '
+                'sure to add your connections with the .add_conns() method.')
             logging.error(msg)
             raise hlp.TESPyNetworkError(msg)
 
@@ -818,11 +807,10 @@ class network:
                     # read design point information
                     path = hlp.modify_path_os(
                         cp.design_path + '/components/' + c + '.csv')
-                    df = pd.read_csv(path, sep=';', decimal='.',
-                                     converters={
-                                             'busses': ast.literal_eval,
-                                             'bus_P_ref': ast.literal_eval
-                                             })
+                    df = pd.read_csv(
+                        path, sep=';', decimal='.', converters={
+                            'busses': ast.literal_eval,
+                            'bus_P_ref': ast.literal_eval})
                     df.set_index('label', inplace=True)
                     # write data
                     self.init_comp_design_params(cp, df.loc[cp.label])
@@ -884,14 +872,15 @@ class network:
         (connections) handle the parameter specification.
         """
         # components without any parameters
-        not_required = ['source', 'sink', 'node', 'merge', 'splitter',
-                        'separator', 'drum', 'subsystem_interface']
+        not_required = [
+            'source', 'sink', 'node', 'merge', 'splitter', 'separator', 'drum',
+            'subsystem_interface', 'droplet_separator']
         # fetch all components, reindex with label
         cp_sort = self.comps.copy()
         # get class name
         cp_sort['cp'] = cp_sort.apply(network.get_class_base, axis=1)
-        cp_sort['label'] = cp_sort.apply(network.get_props, axis=1,
-                                         args=('label',))
+        cp_sort['label'] = cp_sort.apply(
+            network.get_props, axis=1, args=('label',))
         cp_sort['comp'] = cp_sort.index
         cp_sort.set_index('label', inplace=True)
 
@@ -931,7 +920,7 @@ class network:
                     # write data to components
                     self.init_comp_design_params(comp, data)
 
-        msg = 'Read design point information for components.'
+        msg = 'Done reading design point information for components.'
         logging.debug(msg)
 
         # read connection design point information
@@ -952,8 +941,8 @@ class network:
                     'Reading individual design point information for '
                     'connection ' + c.label + ' from path ' + path_c + '.')
                 logging.debug(msg)
-                df_c = pd.read_csv(path_c, index_col=0,
-                                   delimiter=';', decimal='.')
+                df_c = pd.read_csv(
+                    path_c, index_col=0, delimiter=';', decimal='.')
 
                 # write data
                 self.init_conn_design_params(c, df_c)
@@ -962,7 +951,7 @@ class network:
                 # write data
                 self.init_conn_design_params(c, df)
 
-        msg = 'Read design point information for connections.'
+        msg = 'Done reading design point information for connections.'
         logging.debug(msg)
 
     def init_comp_design_params(self, component, data):
@@ -1006,19 +995,13 @@ class network:
             df['source_id'].isin([c.source_id]) &
             df['target_id'].isin([c.target_id])]
 
-        if len(conn.index) > 0:
+        try:
             # read connection information
             conn_id = conn.index[0]
-            c.m.design = (
-                df.loc[conn_id, 'm'] * self.m[df.loc[conn_id, 'm_unit']])
-            c.p.design = (
-                df.loc[conn_id, 'p'] * self.p[df.loc[conn_id, 'p_unit']])
-            c.h.design = (
-                df.loc[conn_id, 'h'] * self.h[df.loc[conn_id, 'h_unit']])
-            c.v.design = (
-                df.loc[conn_id, 'v'] * self.v[df.loc[conn_id, 'v_unit']])
-            c.x.design = (
-                df.loc[conn_id, 'x'] * self.x[df.loc[conn_id, 'x_unit']])
+            for var in ['m', 'p', 'h', 'v', 'x']:
+                c.get_attr(var).design = (
+                    df.loc[conn_id, var] *
+                    self.get_attr(var)[df.loc[conn_id, var + '_unit']])
             c.T.design = ((df.loc[conn_id, 'T'] +
                            self.T[df.loc[conn_id, 'T_unit']][0]) *
                           self.T[df.loc[conn_id, 'T_unit']][1])
@@ -1026,7 +1009,7 @@ class network:
                               self.T[df.loc[conn_id, 'T_unit']][1])
             for fluid in self.fluids:
                 c.fluid.design[fluid] = df.loc[conn_id, fluid]
-        else:
+        except IndexError:
             # no matches in the connections of the network and the design files
             msg = (
                 'Could not find connection ' + c.label + ' in design case. '
@@ -1123,9 +1106,9 @@ class network:
         # iterate over connectons, create ordered dicts
         for c in self.conns.index:
             c.conn_loc = self.conns.index.get_loc(c)
-            tmp = c.fluid.val.copy()
-            tmp0 = c.fluid.val0.copy()
-            tmp_set = c.fluid.val_set.copy()
+            tmp = c.fluid.val
+            tmp0 = c.fluid.val0
+            tmp_set = c.fluid.val_set
             c.fluid.val = OrderedDict()
             c.fluid.val0 = OrderedDict()
             c.fluid.val_set = OrderedDict()
@@ -1375,7 +1358,7 @@ class network:
                         c.get_attr(key).unit = self.get_attr('T_unit')
                     else:
                         c.get_attr(key).unit = self.get_attr(key + '_unit')
-                if (key not in ['T', 'x', 'v', 's', 'vol', 'Td_bp'] and
+                if (key in ['m', 'p', 'h'] and
                         c.get_attr(key).val_set is False):
                     if c.good_starting_values is False:
                         self.init_val0(c, key)
@@ -1412,7 +1395,10 @@ class network:
 
             # starting values for specified vapour content or temperature
             if c.x.val_set and not c.h.val_set:
-                c.h.val_SI = fp.h_mix_pQ(c.to_flow(), c.x.val_SI)
+                try:
+                    c.h.val_SI = fp.h_mix_pQ(c.to_flow(), c.x.val_SI)
+                except ValueError:
+                    pass
 
             if c.T.val_set and not c.h.val_set:
                 try:
@@ -1500,7 +1486,7 @@ class network:
                 df['target'].isin([c.target.label]) &
                 df['source_id'].isin([c.source_id]) &
                 df['target_id'].isin([c.target_id])]
-            if len(conn.index) > 0:
+            try:
                 conn_id = conn.index[0]
                 # overwrite SI-values with values from init_file,
                 # except user specified values
@@ -1523,7 +1509,7 @@ class network:
                 c.h.val0 = c.h.val_SI / self.h[c.h.unit]
                 c.fluid.val0 = c.fluid.val.copy()
                 c.good_starting_values = True
-            else:
+            except IndexError:
                 msg = (
                     'Could not find connection ' + c.label + ' in '
                     'connections.csv of init_path ' + self.init_path + '.')
@@ -1575,18 +1561,18 @@ class network:
         For more information on the solution process have a look at the online
         documentation at tespy.readthedocs.io in the section "using TESPy".
         """
+        self.new_design = False
         if self.design_path == design_path and design_path is not None:
             for c in self.conns.index:
                 if c.new_design is True:
                     self.new_design = True
                     break
+            if self.new_design is False:
+                for cp in self.comps.index:
+                    if cp.new_design is True:
+                        self.new_design = True
+                        break
 
-            for cp in self.comps.index:
-                if cp.new_design is True:
-                    self.new_design = True
-                    break
-
-            self.new_design = False
         else:
             self.new_design = True
 
@@ -1899,7 +1885,7 @@ class network:
                     # keep mass fractions within [0, 1]
                     if c.fluid.val[fluid] < err:
                         c.fluid.val[fluid] = 0
-                    if c.fluid.val[fluid] > 1 - err:
+                    elif c.fluid.val[fluid] > 1 - err:
                         c.fluid.val[fluid] = 1
 
                     j += 1
@@ -1922,7 +1908,7 @@ class network:
                     # keep value within specified value range
                     if var.val < var.min_val:
                         var.val = var.min_val
-                    if var.val > var.max_val:
+                    elif var.val > var.max_val:
                         var.val = var.max_val
 
                 sum_c_var += cp.num_vars
@@ -2059,10 +2045,12 @@ class network:
         """
         flow = c.to_flow()
         Tmin = max(
-            [fp.memorise.value_range[f][2] for f in flow[3].keys() if flow[3][f] > err]
+            [fp.memorise.value_range[f][2] for
+             f in flow[3].keys() if flow[3][f] > err]
         ) + 100
         Tmax = min(
-            [fp.memorise.value_range[f][3] for f in flow[3].keys() if flow[3][f] > err]
+            [fp.memorise.value_range[f][3] for
+             f in flow[3].keys() if flow[3][f] > err]
         ) - 100
         hmin = fp.h_mix_pT(flow, Tmin)
         hmax = fp.h_mix_pT(flow, Tmax)
@@ -2391,7 +2379,6 @@ class network:
         # equations and derivatives for specified primary variables are static
         if self.iter == 0:
             for c in self.conns.index:
-                flow = c.to_flow()
                 col = c.conn_loc * self.num_conn_vars
 
                 # specified mass flow, pressure and enthalpy
@@ -2422,15 +2409,12 @@ class network:
             if bus.P.is_set is True:
                 P_res = 0
                 for cp in bus.comps.index:
-                    i = self.comps.loc[cp, 'inlets'].tolist()
-                    o = self.comps.loc[cp, 'outlets'].tolist()
 
-                    P_res += cp.calc_bus_value(bus)
+                    P_res -= cp.calc_bus_value(bus)
                     deriv = -cp.bus_deriv(bus)
 
                     j = 0
-                    for c in i + o:
-                        loc = self.conns.index.get_loc(c)
+                    for loc in cp.conn_loc:
                         # start collumn index
                         coll_s = loc * self.num_conn_vars
                         # end collumn index
@@ -2438,8 +2422,7 @@ class network:
                         self.jacobian[row, coll_s:coll_e] = deriv[:, j]
                         j += 1
 
-                self.residual[row] = bus.P.val - P_res
-
+                self.residual[row] = bus.P.val + P_res
                 row += 1
 
     def postprocessing(self):
@@ -2560,13 +2543,18 @@ class network:
             if c.printout is True:
                 row = (c.source.label + ':' + c.source_id + ' -> ' +
                        c.target.label + ':' + c.target_id)
-                df.loc[row] = (
-                        [c.m.val_SI / self.m[self.m_unit],
-                         c.p.val_SI / self.p[self.p_unit],
-                         c.h.val_SI / self.h[self.h_unit],
-                         c.T.val_SI / self.T[self.T_unit][1] -
-                         self.T[self.T_unit][0]]
-                        )
+
+                row_data = []
+                for var in ['m', 'p', 'h', 'T']:
+                    if c.get_attr(var).val_set is True:
+                        row_data += [
+                            coloring['set'] + str(c.get_attr(var).val) +
+                            coloring['end']
+                        ]
+                    else:
+                        row_data += [str(c.get_attr(var).val)]
+
+                df.loc[row] = row_data
         if len(df) > 0:
             print('##### RESULTS (connections) #####')
             print(
@@ -2598,7 +2586,15 @@ class network:
 
     def print_components(c, *args):
         if c.name.printout is True:
-            return c.name.get_attr(args[0]).val
+            val = float(c.name.get_attr(args[0]).val)
+            if (val < c.name.get_attr(args[0]).min_val or
+                    val > c.name.get_attr(args[0]).max_val):
+                return coloring['err'] + ' ' + str(val) + ' ' + coloring['end']
+            if c.name.get_attr(args[0]).is_var:
+                return coloring['var'] + ' ' + str(val) + ' ' + coloring['end']
+            if c.name.get_attr(args[0]).is_set:
+                return coloring['set'] + ' ' + str(val) + ' ' + coloring['end']
+            return str(val)
         else:
             return np.nan