Merge pull request #22 from bilwint/main

Models especially at higher sink Temperature fails (Singularity in Jacobian matrix) #21
jfreissmann · Jun 21, 2024 · 24f0e0a · 24f0e0a
2 parents 9f8a121 + 06a2169
commit 24f0e0a
Show file tree

Hide file tree

Showing 67 changed files with 83 additions and 83 deletions.
diff --git a/src/heatpumps/hp_dashboard.py b/src/heatpumps/hp_dashboard.py
@@ -246,18 +246,18 @@ def info_df(label, refrigs):
                 'Temperatur Vorlauf', min_value=0, max_value=T_crit,
                 value=params['C3']['T'], format='%d°C', key='T_consumer_ff'
             )
-            params['C0']['T'] = st.slider(
+            params['C1']['T'] = st.slider(
                 'Temperatur Rücklauf', min_value=0, max_value=T_crit,
-                value=params['C0']['T'], format='%d°C', key='T_consumer_bf'
+                value=params['C1']['T'], format='%d°C', key='T_consumer_bf'
             )
 
-            invalid_temp_diff = params['C0']['T'] >= params['C3']['T']
+            invalid_temp_diff = params['C1']['T'] >= params['C3']['T']
             if invalid_temp_diff:
                 st.error(
                     'Die Rücklauftemperatur muss niedriger sein, als die '
                     + 'Vorlauftemperatur.'
                 )
-            invalid_temp_diff = params['C0']['T'] <= params['B1']['T']
+            invalid_temp_diff = params['C1']['T'] <= params['B1']['T']
             if invalid_temp_diff:
                 st.error(
                     'Die Temperatur der Wärmesenke muss höher sein, als die '

diff --git a/src/heatpumps/models/HeatPumpCascade.py b/src/heatpumps/models/HeatPumpCascade.py
@@ -221,7 +221,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpCascade2IHX.py b/src/heatpumps/models/HeatPumpCascade2IHX.py
@@ -257,7 +257,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpCascade2IHXTrans.py b/src/heatpumps/models/HeatPumpCascade2IHXTrans.py
@@ -258,7 +258,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
         )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -517,7 +517,7 @@ def get_pressure_levels(self, T_mid):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             self.wf2
         ) * 1e-3
 

diff --git a/src/heatpumps/models/HeatPumpCascadeTrans.py b/src/heatpumps/models/HeatPumpCascadeTrans.py
@@ -224,7 +224,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -462,7 +462,7 @@ def get_pressure_levels(self, T_mid):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p']*1e5,
-            'T', self.params['C3']['T']+self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T']+self.params['trans']['ttd_l'] + 273.15,
             self.wf2
             ) * 1e-3
 

diff --git a/src/heatpumps/models/HeatPumpEcon.py b/src/heatpumps/models/HeatPumpEcon.py
@@ -223,7 +223,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpEconIHX.py b/src/heatpumps/models/HeatPumpEconIHX.py
@@ -270,7 +270,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpEconIHXTrans.py b/src/heatpumps/models/HeatPumpEconIHXTrans.py
@@ -270,7 +270,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -515,7 +515,7 @@ def get_pressure_levels(self, wf=None):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpEconTrans.py b/src/heatpumps/models/HeatPumpEconTrans.py
@@ -226,7 +226,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
         )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -459,7 +459,7 @@ def get_pressure_levels(self, wf=None):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C3']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpFlash.py b/src/heatpumps/models/HeatPumpFlash.py
@@ -176,7 +176,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpFlashTrans.py b/src/heatpumps/models/HeatPumpFlashTrans.py
@@ -179,7 +179,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -405,7 +405,7 @@ def get_pressure_levels(self, wf=None):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpIC.py b/src/heatpumps/models/HeatPumpIC.py
@@ -177,7 +177,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpICTrans.py b/src/heatpumps/models/HeatPumpICTrans.py
@@ -179,7 +179,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -415,7 +415,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p']*1e5,
-            'T', self.params['C3']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
             ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpIHX.py b/src/heatpumps/models/HeatPumpIHX.py
@@ -177,7 +177,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpIHXEcon.py b/src/heatpumps/models/HeatPumpIHXEcon.py
@@ -242,7 +242,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpIHXEconTrans.py b/src/heatpumps/models/HeatPumpIHXEconTrans.py
@@ -245,7 +245,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
         )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -490,7 +490,7 @@ def get_pressure_levels(self, wf=None):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpIHXPC.py b/src/heatpumps/models/HeatPumpIHXPC.py
@@ -242,7 +242,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpIHXPCIHX.py b/src/heatpumps/models/HeatPumpIHXPCIHX.py
@@ -259,7 +259,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpIHXPCIHXTrans.py b/src/heatpumps/models/HeatPumpIHXPCIHXTrans.py
@@ -261,7 +261,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -514,7 +514,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpIHXPCTrans.py b/src/heatpumps/models/HeatPumpIHXPCTrans.py
@@ -244,7 +244,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -488,7 +488,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpIHXTrans.py b/src/heatpumps/models/HeatPumpIHXTrans.py
@@ -178,7 +178,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -407,7 +407,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p']*1e5,
-            'T', self.params['C0']['T']+self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T']+self.params['trans']['ttd_l'] + 273.15,
             wf
             ) * 1e-3
 

diff --git a/src/heatpumps/models/HeatPumpPC.py b/src/heatpumps/models/HeatPumpPC.py
@@ -223,7 +223,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpPCIHX.py b/src/heatpumps/models/HeatPumpPCIHX.py
@@ -242,7 +242,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpPCIHXTrans.py b/src/heatpumps/models/HeatPumpPCIHXTrans.py
@@ -244,7 +244,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -488,7 +488,7 @@ def get_pressure_levels(self, wf=None):
         ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpPCTrans.py b/src/heatpumps/models/HeatPumpPCTrans.py
@@ -225,7 +225,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -459,7 +459,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p'] * 1e5,
-            'T', self.params['C0']['T'] + self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T'] + self.params['trans']['ttd_l'] + 273.15,
             wf
         ) * 1e-3
         p_mid = np.sqrt(p_evap * self.params['A0']['p'])

diff --git a/src/heatpumps/models/HeatPumpSimple.py b/src/heatpumps/models/HeatPumpSimple.py
@@ -158,7 +158,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)

diff --git a/src/heatpumps/models/HeatPumpSimpleTrans.py b/src/heatpumps/models/HeatPumpSimpleTrans.py
@@ -159,7 +159,7 @@ def init_simulation(self, **kwargs):
             T=self.params['C3']['T'], p=self.params['C3']['p'],
             fluid={self.si: 1}
             )
-        self.conns['C0'].set_attr(T=self.params['C0']['T'])
+        self.conns['C1'].set_attr(T=self.params['C1']['T'])
 
         # Perform initial simulation and unset starting values
         self._solve_model(**kwargs)
@@ -376,7 +376,7 @@ def get_pressure_levels(self, wf=None):
             ) * 1e-5
         h_trans_out = PSI(
             'H', 'P', self.params['A0']['p']*1e5,
-            'T', self.params['C3']['T']+self.params['trans']['ttd_l'] + 273.15,
+            'T', self.params['C1']['T']+self.params['trans']['ttd_l'] + 273.15,
             wf
             ) * 1e-3
 

diff --git a/src/heatpumps/models/input/params_hp_cascade.json b/src/heatpumps/models/input/params_hp_cascade.json
@@ -65,7 +65,7 @@
     "B2": {
         "T": 5
     },
-    "C0": {
+    "C1": {
         "T": 50
     },
     "C3": {

diff --git a/src/heatpumps/models/input/params_hp_cascade_2ihx.json b/src/heatpumps/models/input/params_hp_cascade_2ihx.json
@@ -75,7 +75,7 @@
     "B2": {
         "T": 5
     },
-    "C0": {
+    "C1": {
         "T": 50
     },
     "C3": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ @@
         "B2": {
             "T": 5
         },
-        "C0": {
+        "C1": {
             "T": 50
         },
         "C3": {
@@ Expand Down @@