Merge branch 'cleaning_simulation_models'
This commit is contained in:
commit
1906862517
@ -71,7 +71,7 @@ class DomesticHotWaterHeatPumpTes:
|
||||
hp_electricity[i] = 0
|
||||
|
||||
t_tank[i + 1] = t_tank[i] + (delta_t_hp - delta_t_freshwater - delta_t_demand + delta_t_coil)
|
||||
total_consumption[i] = q_hp[i] + q_coil[i]
|
||||
total_consumption[i] = hp_electricity[i] + q_coil[i]
|
||||
tes.temperature = []
|
||||
hp_electricity_j = [(x * cte.WATTS_HOUR_TO_JULES) / number_of_ts for x in hp_electricity]
|
||||
heating_coil_j = [(x * cte.WATTS_HOUR_TO_JULES) / number_of_ts for x in q_coil]
|
||||
|
@ -74,8 +74,8 @@ class HeatPumpBoilerTesHeating:
|
||||
hp_cop[i + 1] = self.hp_characteristics.air_to_water_cop(source_temperature[i + 1], t_tank[i + 1], mode=cte.HEATING)
|
||||
hp_electricity[i + 1] = q_hp[i + 1] / hp_cop[i + 1]
|
||||
else:
|
||||
hp_cop[i] = 0
|
||||
hp_electricity[i] = 0
|
||||
hp_cop[i + 1] = 0
|
||||
hp_electricity[i + 1] = 0
|
||||
# boiler operation
|
||||
if q_hp[i + 1] > 0:
|
||||
if t_sup_hp[i + 1] < 45:
|
||||
@ -105,7 +105,7 @@ class HeatPumpBoilerTesHeating:
|
||||
m_dis[i + 1] = self.heating_peak_load / (cte.WATER_HEAT_CAPACITY * factor)
|
||||
t_ret[i + 1] = t_tank[i + 1] - demand[i + 1] / (m_dis[i + 1] * cte.WATER_HEAT_CAPACITY)
|
||||
# total consumption
|
||||
total_consumption[i + 1] = q_hp[i + 1] + q_boiler[i + 1] + q_coil[i + 1]
|
||||
total_consumption[i + 1] = hp_electricity[i + 1] + boiler_energy_consumption[i + 1] + q_coil[i + 1]
|
||||
tes.temperature = []
|
||||
hp_electricity_j = [(x * cte.WATTS_HOUR_TO_JULES) / number_of_ts for x in hp_electricity]
|
||||
boiler_consumption_j = [(x * cte.WATTS_HOUR_TO_JULES) / number_of_ts for x in boiler_energy_consumption]
|
||||
|
@ -43,12 +43,12 @@ class HeatPump:
|
||||
else:
|
||||
if self.hp.heat_efficiency_curve is not None:
|
||||
cop_curve_coefficients = [float(coefficient) for coefficient in self.hp.heat_efficiency_curve.coefficients]
|
||||
cop_coefficient = (1 / (cop_curve_coefficients[0] +
|
||||
cop_curve_coefficients[1] * inlet_water_temperature +
|
||||
cop_curve_coefficients[2] * inlet_water_temperature ** 2 +
|
||||
cop_curve_coefficients[3] * source_temperature +
|
||||
cop_curve_coefficients[4] * source_temperature ** 2 +
|
||||
cop_curve_coefficients[5] * inlet_water_temperature * source_temperature))
|
||||
cop_coefficient = (cop_curve_coefficients[0] +
|
||||
cop_curve_coefficients[1] * source_temperature +
|
||||
cop_curve_coefficients[2] * source_temperature ** 2 +
|
||||
cop_curve_coefficients[3] * inlet_water_temperature +
|
||||
cop_curve_coefficients[4] * inlet_water_temperature ** 2 +
|
||||
cop_curve_coefficients[5] * inlet_water_temperature * source_temperature)
|
||||
hp_efficiency = float(self.hp.heat_efficiency)
|
||||
hp_cop = cop_coefficient * hp_efficiency
|
||||
return hp_cop
|
||||
|
@ -1,191 +0,0 @@
|
||||
[
|
||||
{
|
||||
"DN": 16,
|
||||
"inner_diameter": 16.1,
|
||||
"outer_diameter": 21.3,
|
||||
"thickness": 2.6,
|
||||
"cost_per_meter": 320
|
||||
},
|
||||
{
|
||||
"DN": 20,
|
||||
"inner_diameter": 21.7,
|
||||
"outer_diameter": 26.9,
|
||||
"thickness": 2.6,
|
||||
"cost_per_meter": 320
|
||||
},
|
||||
{
|
||||
"DN": 25,
|
||||
"inner_diameter": 27.3,
|
||||
"outer_diameter": 33.7,
|
||||
"thickness": 3.2,
|
||||
"cost_per_meter": 320
|
||||
},
|
||||
{
|
||||
"DN": 32,
|
||||
"inner_diameter": 37.2,
|
||||
"outer_diameter": 42.4,
|
||||
"thickness": 2.6,
|
||||
"cost_per_meter": 350
|
||||
},
|
||||
{
|
||||
"DN": 40,
|
||||
"inner_diameter": 43.1,
|
||||
"outer_diameter": 48.3,
|
||||
"thickness": 2.6,
|
||||
"cost_per_meter": 375
|
||||
},
|
||||
{
|
||||
"DN": 50,
|
||||
"inner_diameter": 54.5,
|
||||
"outer_diameter": 60.3,
|
||||
"thickness": 2.9,
|
||||
"cost_per_meter": 400
|
||||
},
|
||||
{
|
||||
"DN": 65,
|
||||
"inner_diameter": 70.3,
|
||||
"outer_diameter": 76.1,
|
||||
"thickness": 2.9,
|
||||
"cost_per_meter": 450
|
||||
},
|
||||
{
|
||||
"DN": 80,
|
||||
"inner_diameter": 82.5,
|
||||
"outer_diameter": 88.9,
|
||||
"thickness": 3.2,
|
||||
"cost_per_meter": 480
|
||||
},
|
||||
{
|
||||
"DN": 90,
|
||||
"inner_diameter": 100.8,
|
||||
"outer_diameter": 108,
|
||||
"thickness": 3.6,
|
||||
"cost_per_meter": 480
|
||||
},
|
||||
{
|
||||
"DN": 100,
|
||||
"inner_diameter": 107.1,
|
||||
"outer_diameter": 114.3,
|
||||
"thickness": 3.6,
|
||||
"cost_per_meter": 550
|
||||
},
|
||||
{
|
||||
"DN": 110,
|
||||
"inner_diameter": 125.8,
|
||||
"outer_diameter": 133,
|
||||
"thickness": 3.6,
|
||||
"cost_per_meter": 550
|
||||
},
|
||||
{
|
||||
"DN": 125,
|
||||
"inner_diameter": 132.5,
|
||||
"outer_diameter": 139.7,
|
||||
"thickness": 3.6,
|
||||
"cost_per_meter": 630
|
||||
},
|
||||
{
|
||||
"DN": 140,
|
||||
"inner_diameter": 151,
|
||||
"outer_diameter": 159,
|
||||
"thickness": 4,
|
||||
"cost_per_meter": 700
|
||||
},
|
||||
{
|
||||
"DN": 150,
|
||||
"inner_diameter": 160.3,
|
||||
"outer_diameter": 168.3,
|
||||
"thickness": 4,
|
||||
"cost_per_meter": 700
|
||||
},
|
||||
{
|
||||
"DN": 180,
|
||||
"inner_diameter": 184.7,
|
||||
"outer_diameter": 193.7,
|
||||
"thickness": 4.5,
|
||||
"cost_per_meter": 700
|
||||
},
|
||||
{
|
||||
"DN": 200,
|
||||
"inner_diameter": 210.1,
|
||||
"outer_diameter": 219.1,
|
||||
"thickness": 4.5,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 250,
|
||||
"inner_diameter": 263,
|
||||
"outer_diameter": 273,
|
||||
"thickness": 5,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 300,
|
||||
"inner_diameter": 312.7,
|
||||
"outer_diameter": 323.9,
|
||||
"thickness": 5.6,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 350,
|
||||
"inner_diameter": 344.4,
|
||||
"outer_diameter": 355.6,
|
||||
"thickness": 5.6,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 400,
|
||||
"inner_diameter": 393.8,
|
||||
"outer_diameter": 406.4,
|
||||
"thickness": 6.3,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 450,
|
||||
"inner_diameter": 444.4,
|
||||
"outer_diameter": 457,
|
||||
"thickness": 6.3,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 500,
|
||||
"inner_diameter": 495.4,
|
||||
"outer_diameter": 508,
|
||||
"thickness": 6.3,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 600,
|
||||
"inner_diameter": 595.8,
|
||||
"outer_diameter": 610,
|
||||
"thickness": 7.1,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 700,
|
||||
"inner_diameter": 696.8,
|
||||
"outer_diameter": 711,
|
||||
"thickness": 7.1,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 800,
|
||||
"inner_diameter": 797,
|
||||
"outer_diameter": 813,
|
||||
"thickness": 8,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 900,
|
||||
"inner_diameter": 894,
|
||||
"outer_diameter": 914,
|
||||
"thickness": 10,
|
||||
"cost_per_meter": 860
|
||||
},
|
||||
{
|
||||
"DN": 1000,
|
||||
"inner_diameter": 996,
|
||||
"outer_diameter": 1016,
|
||||
"thickness": 10,
|
||||
"cost_per_meter": 860
|
||||
}
|
||||
]
|
1585013
input_files/roads.json
1585013
input_files/roads.json
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user