diff --git a/src/heatpumps/hp_dashboard.py b/src/heatpumps/hp_dashboard.py index 8e4d9e6..7a36b01 100644 --- 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 index 3330573..5561815 100644 --- 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 index 8718b43..6ae0534 100644 --- 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 index ef63d77..843b552 100644 --- 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 index e86e423..d596f8e 100644 --- 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 index d39ea7a..5510017 100644 --- 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 index 4271a77..86567fd 100644 --- 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 index bddec85..7431658 100644 --- 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 index 590bf32..a083a0b 100644 --- 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 index bbeef6a..cc0c6b2 100644 --- 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 index 8a44ed9..3a3ba26 100644 --- 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 index d31e7f0..a8247cb 100644 --- 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 index 31a7bd7..8a2cd91 100644 --- 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 index 300a2de..2c2010e 100644 --- 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 index 3ee4ff2..6067a62 100644 --- 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 index 93594e2..dcb1443 100644 --- 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 index e695ec4..5565f4b 100644 --- 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 index f0f5c81..285f9b2 100644 --- 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 index 8a33abb..8151916 100644 --- 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 index c625aa0..4e2ff6d 100644 --- 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 index a4e5e7c..25d847c 100644 --- 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 index b26aadc..eac8361 100644 --- 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 index 8180bc0..c3bb8b7 100644 --- 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 index a634cb1..685be1a 100644 --- 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 index f432186..0f025de 100644 --- 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 index 9469cf3..34b3b0c 100644 --- 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 index 9420e66..cb8397a 100644 --- 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 index 88d5a4d..71df1aa 100644 --- 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 index 819bc6d..97ef36d 100644 --- 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": { diff --git a/src/heatpumps/models/input/params_hp_cascade_2ihx_trans.json b/src/heatpumps/models/input/params_hp_cascade_2ihx_trans.json index 67b301f..bd40da2 100644 --- a/src/heatpumps/models/input/params_hp_cascade_2ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_cascade_2ihx_trans.json @@ -78,7 +78,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 90 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_cascade_trans.json b/src/heatpumps/models/input/params_hp_cascade_trans.json index 5170082..ec308fb 100644 --- a/src/heatpumps/models/input/params_hp_cascade_trans.json +++ b/src/heatpumps/models/input/params_hp_cascade_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_closed.json b/src/heatpumps/models/input/params_hp_econ_closed.json index 2a199fc..0d73078 100644 --- a/src/heatpumps/models/input/params_hp_econ_closed.json +++ b/src/heatpumps/models/input/params_hp_econ_closed.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_closed_ihx.json b/src/heatpumps/models/input/params_hp_econ_closed_ihx.json index 3cfae9f..be112fd 100644 --- a/src/heatpumps/models/input/params_hp_econ_closed_ihx.json +++ b/src/heatpumps/models/input/params_hp_econ_closed_ihx.json @@ -65,7 +65,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_closed_ihx_trans.json b/src/heatpumps/models/input/params_hp_econ_closed_ihx_trans.json index 74d90d8..849647f 100644 --- a/src/heatpumps/models/input/params_hp_econ_closed_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_econ_closed_ihx_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_closed_trans.json b/src/heatpumps/models/input/params_hp_econ_closed_trans.json index 22edbf4..122103a 100644 --- a/src/heatpumps/models/input/params_hp_econ_closed_trans.json +++ b/src/heatpumps/models/input/params_hp_econ_closed_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_open.json b/src/heatpumps/models/input/params_hp_econ_open.json index 8c2add7..b8b52c7 100644 --- a/src/heatpumps/models/input/params_hp_econ_open.json +++ b/src/heatpumps/models/input/params_hp_econ_open.json @@ -59,7 +59,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_open_ihx.json b/src/heatpumps/models/input/params_hp_econ_open_ihx.json index 055e859..6de4b0d 100644 --- a/src/heatpumps/models/input/params_hp_econ_open_ihx.json +++ b/src/heatpumps/models/input/params_hp_econ_open_ihx.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_open_ihx_trans.json b/src/heatpumps/models/input/params_hp_econ_open_ihx_trans.json index b8ca51d..1ea14ed 100644 --- a/src/heatpumps/models/input/params_hp_econ_open_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_econ_open_ihx_trans.json @@ -63,7 +63,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_econ_open_trans.json b/src/heatpumps/models/input/params_hp_econ_open_trans.json index 2ec3bec..3b31f54 100644 --- a/src/heatpumps/models/input/params_hp_econ_open_trans.json +++ b/src/heatpumps/models/input/params_hp_econ_open_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_flash.json b/src/heatpumps/models/input/params_hp_flash.json index 27ee0a9..1eac74a 100644 --- a/src/heatpumps/models/input/params_hp_flash.json +++ b/src/heatpumps/models/input/params_hp_flash.json @@ -55,7 +55,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_flash_trans.json b/src/heatpumps/models/input/params_hp_flash_trans.json index 56ba3da..3091eab 100644 --- a/src/heatpumps/models/input/params_hp_flash_trans.json +++ b/src/heatpumps/models/input/params_hp_flash_trans.json @@ -58,7 +58,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ic.json b/src/heatpumps/models/input/params_hp_ic.json index dcba14a..d585f43 100644 --- a/src/heatpumps/models/input/params_hp_ic.json +++ b/src/heatpumps/models/input/params_hp_ic.json @@ -59,7 +59,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ic_trans.json b/src/heatpumps/models/input/params_hp_ic_trans.json index cf3c6c8..d53ddb6 100644 --- a/src/heatpumps/models/input/params_hp_ic_trans.json +++ b/src/heatpumps/models/input/params_hp_ic_trans.json @@ -62,7 +62,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx.json b/src/heatpumps/models/input/params_hp_ihx.json index a9411a3..dd1d049 100644 --- a/src/heatpumps/models/input/params_hp_ihx.json +++ b/src/heatpumps/models/input/params_hp_ihx.json @@ -57,7 +57,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_econ_closed.json b/src/heatpumps/models/input/params_hp_ihx_econ_closed.json index 87415ff..104b9ac 100644 --- a/src/heatpumps/models/input/params_hp_ihx_econ_closed.json +++ b/src/heatpumps/models/input/params_hp_ihx_econ_closed.json @@ -65,7 +65,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_econ_closed_trans.json b/src/heatpumps/models/input/params_hp_ihx_econ_closed_trans.json index 2b373f8..510b2fe 100644 --- a/src/heatpumps/models/input/params_hp_ihx_econ_closed_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_econ_closed_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_econ_open.json b/src/heatpumps/models/input/params_hp_ihx_econ_open.json index 0c06660..180b770 100644 --- a/src/heatpumps/models/input/params_hp_ihx_econ_open.json +++ b/src/heatpumps/models/input/params_hp_ihx_econ_open.json @@ -64,7 +64,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_econ_open_trans.json b/src/heatpumps/models/input/params_hp_ihx_econ_open_trans.json index 8b12fab..ff11082 100644 --- a/src/heatpumps/models/input/params_hp_ihx_econ_open_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_econ_open_trans.json @@ -67,7 +67,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed.json index 0d8475f..39b6c50 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed.json @@ -65,7 +65,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx.json index e78c375..76b4cb1 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx.json @@ -70,7 +70,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx_trans.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx_trans.json index 20d9589..4c1defb 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_ihx_trans.json @@ -73,7 +73,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_trans.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_trans.json index 1c08ce9..14fb7e8 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_closed_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open.json index 22fa82e..5443515 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx.json index 67e5783..45be6ad 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx.json @@ -69,7 +69,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx_trans.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx_trans.json index 822e7a2..7b05a1c 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_ihx_trans.json @@ -72,7 +72,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 80 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_trans.json b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_trans.json index 28c981f..bf43e68 100644 --- a/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_pc_econ_open_trans.json @@ -63,7 +63,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_ihx_trans.json b/src/heatpumps/models/input/params_hp_ihx_trans.json index da0f2f3..86e0bb8 100644 --- a/src/heatpumps/models/input/params_hp_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_ihx_trans.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_closed.json b/src/heatpumps/models/input/params_hp_pc_econ_closed.json index aab4a9e..d54d9ca 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_closed.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_closed.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx.json b/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx.json index 0d8475f..39b6c50 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx.json @@ -65,7 +65,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx_trans.json b/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx_trans.json index 785089a..c1a6356 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_closed_ihx_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_closed_trans.json b/src/heatpumps/models/input/params_hp_pc_econ_closed_trans.json index 409712f..a5a32fa 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_closed_trans.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_closed_trans.json @@ -63,7 +63,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 70 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_open.json b/src/heatpumps/models/input/params_hp_pc_econ_open.json index 26307a0..0c1daf1 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_open.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_open.json @@ -59,7 +59,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_open_ihx.json b/src/heatpumps/models/input/params_hp_pc_econ_open_ihx.json index 22fa82e..5443515 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_open_ihx.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_open_ihx.json @@ -60,7 +60,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_open_ihx_trans.json b/src/heatpumps/models/input/params_hp_pc_econ_open_ihx_trans.json index 070e739..6571574 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_open_ihx_trans.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_open_ihx_trans.json @@ -68,7 +68,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 60 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_pc_econ_open_trans.json b/src/heatpumps/models/input/params_hp_pc_econ_open_trans.json index e4157df..5b9fe05 100644 --- a/src/heatpumps/models/input/params_hp_pc_econ_open_trans.json +++ b/src/heatpumps/models/input/params_hp_pc_econ_open_trans.json @@ -62,7 +62,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 70 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_simple.json b/src/heatpumps/models/input/params_hp_simple.json index ca668bd..22aeb83 100644 --- a/src/heatpumps/models/input/params_hp_simple.json +++ b/src/heatpumps/models/input/params_hp_simple.json @@ -52,7 +52,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 50 }, "C3": { diff --git a/src/heatpumps/models/input/params_hp_simple_trans.json b/src/heatpumps/models/input/params_hp_simple_trans.json index cfbcb4a..349fc1a 100644 --- a/src/heatpumps/models/input/params_hp_simple_trans.json +++ b/src/heatpumps/models/input/params_hp_simple_trans.json @@ -55,7 +55,7 @@ "B2": { "T": 5 }, - "C0": { + "C1": { "T": 40 }, "C3": {