Merge pull request #15 from BAMresearch/development

Merge development for new version

Author: StGoebel

bamLoadBasedTesting/Example/modelOnTestBench.py renamed to Example/modelOnTestBench.py

@@ -1,25 +1,25 @@
-from bamLoadBasedTesting.BuildingModels import BAM_RRT_MT
+from bamLoadBasedTesting.BuildingModels import BAM_RRT_HP3_variableflow_8Kcalc
 import time
 
 # Step Size
-stepSize = 1
+stepSize = 1  #ToDo: Allign step size with your own step size
 
 # Create Reduced building
-BamBuilding = BAM_RRT_MT.MTBui_A
+BamBuilding = BAM_RRT_HP3_variableflow_8Kcalc.MTBui_F
 
 while True:
     t1 = time.time()
 
     t_sup_test_bench = 52 #TODO Connect your test bench here!
-    v_flow = 720/3600 #in l/s  #TODO Connect your test bench here!
+    m_w_hp = 720/3600 #in kg/s  #TODO Connect your test bench here!
     t_ret_test_bench = 45 #TODO Connect your test bench here!
     #Calculate time step in Building model
-    BamBuilding.doStep(t_sup=t_sup_test_bench, m_dot=v_flow, stepSize=stepSize, t_ret_mea=t_ret_test_bench)
+    BamBuilding.doStep(t_sup=t_sup_test_bench, m_w_hp=m_w_hp, stepSize=stepSize, t_ret_mea=t_ret_test_bench)
 
     print("Has to be connected to test bench! Set return temperature for test bench:" + str(BamBuilding.t_ret)) #TODO Connect your test bench here!
 
     print("Supply Temperature: " + str(round(t_sup_test_bench, 2)) +
-          " V_flow : " + str(round(v_flow, 2)) +
+          " m_flow : " + str(round(m_w_hp, 2)) +
           " Return Temperature: " + str(round(BamBuilding.t_ret, 2)))
     print(" T_H = " + str(round(BamBuilding.MassH.T, 2)) +
           " T_B = " + str(round(BamBuilding.MassB.T, 2)) +

bamLoadBasedTesting/Example/testModelSim.py renamed to Example/testModelSim.py

@@ -1,12 +1,13 @@
 """Script to test 2-mass-building model"""
 
-from bamLoadBasedTesting.BuildingModels import BAM_RRT_MT
+from bamLoadBasedTesting.BuildingModels import BAM_RRT_HP3_fixedflow
 import numpy as np
 import matplotlib.pyplot as plt
 
 # Create new building model:
-Building = BAM_RRT_MT.MTBui_E
-stepSize = 0.5
+comBui = BAM_RRT_HP3_fixedflow
+Building = comBui.MTBui_D
+stepSize = 1
 T_b = []
 T_H = []
 T_ret = []
@@ -17,55 +18,76 @@
 q_flow_int = []
 t = []
 t_sup = []
+T_sup_hs = []
+m_flow_byp = []
+m_flow_hp = []
+m_flow_sh = []
 internalGains = 0 # 0 W constant internal gains into building
 #loop by doing x steps
-for x in range(3600*3):
+m_flow = comBui.m_dot_H_design
+for x in range(3600*6):
     t.append(x * stepSize)
     "Step response"
-    if x<3600:
-        t_sup.append(52)
+    if x<3600*6:
+        t_sup.append(30)
     else:
         t_sup.append(Building.t_ret)
     T_ret.append(Building.t_ret)
     "Do step with Building Model"
-    Building.doStep(t_sup=t_sup[-1], t_ret_mea=T_ret[-1], m_dot=720/3600, stepSize=stepSize, q_dot_int=internalGains)
+    Building.doStep(t_sup=t_sup[-1], t_ret_mea=T_ret[-1], m_w_hp=m_flow, stepSize=stepSize, q_dot_int=internalGains)
+    if x==0:
+        print("Start value for return temperature " + str(T_ret[-1]) + " °C")
     "Save current values:"
     T_b.append(Building.MassB.T)
     T_H.append(Building.MassH.T)
+    T_sup_hs.append(Building.hydraulicSwitch.T_sup_swi)
     q_flow_ba.append(Building.q_dot_ba)
     q_flow_hb.append(Building.q_dot_hb)
     q_flow_hp.append(Building.q_dot_hp)
     q_flow_int.append(Building.q_dot_int)
     q_flow_bh.append(Building.q_dot_bh)
+    m_flow_byp.append(Building.hydraulicSwitch.m_flow_swi)
+    m_flow_hp.append(m_flow)
+    m_flow_sh.append(Building.hydraulicSwitch.m_flow_sh)
 
 hours = np.array(t)
 hours = hours/3600
 fig, ax = plt.subplots()
 ax.plot(hours, T_ret, label = "return temperature")
 ax.plot(hours, T_H, label = 'transfer system temperature')
-ax.plot(hours, t_sup, label = 'supply temperature')
+ax.plot(hours, t_sup, label = 'supply temperature heat pump')
+ax.plot(hours, T_sup_hs, label = 'supply temperature transfer system')
 ax.legend()
 plt.grid(True)
-plt.ylabel('[°C]')
+plt.ylabel('Temperature in °C')
 plt.xlabel('time in hours')
 plt.show()
 
 fig, ax = plt.subplots()
 ax.plot(hours, q_flow_hp, label = 'heat flow heat pump --> heating system ')
 ax.plot(hours, q_flow_hb, label = 'heat flow transfer --> building')
 ax.plot(hours, q_flow_ba, label = 'heat flow Building --> Ambient')
-ax.plot(hours, q_flow_int, label = 'heat flow internal gains --> building')
-ax.plot(hours, q_flow_bh, label = 'heat flow booster heater --> heating system')
+#ax.plot(hours, q_flow_bh, label = 'heat flow booster heater --> heating system')
 ax.legend()
-plt.ylabel('[W]')
+plt.ylabel('Heat flow in W')
 plt.xlabel('time in hours')
 plt.grid(True)
 plt.show()
 
 fig, ax = plt.subplots()
 ax.plot(hours, T_b, label = 'building temperature')
 ax.legend()
-plt.ylabel('[°C]')
+plt.ylabel('Temperature in °C')
+plt.xlabel('time in hours')
+plt.grid(True)
+plt.show()
+
+fig, ax = plt.subplots()
+ax.plot(hours, m_flow_byp, label = 'm_flow_bypass')
+ax.plot(hours, m_flow_sh, label = 'm_flow_sh')
+ax.plot(hours, m_flow_hp, label = 'm_flow_hp')
+ax.legend()
+plt.ylabel('mass flow in kg/s')
 plt.xlabel('time in hours')
 plt.grid(True)
 plt.show()

bamLoadBasedTesting/BuildingModels/BAM_RRT_HP3_fixedflow.py

@@ -0,0 +1,35 @@
+from bamLoadBasedTesting.twoMassModel import CalcParameters
+
+"Change design power according to your heat pump"
+q_design_e = 7550 # design heating power in E - only value which is dependent on the heat pump
+t_a_design = -10
+t_flow_design = 55
+tau_b = 209125
+tau_h = 1957
+m_dot_H_design = 0.129 #kg/s equal to 464/3600
+t_b = 20 # constant building temperature
+
+
+#TLF: T_biv=-5°C
+ParaMTBui_F = CalcParameters(t_a_design=t_a_design, t_a=-5, q_design=q_design_e, PLC=0.81, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=49.8, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = False)
+MTBui_F = ParaMTBui_F.createBuilding()
+
+
+ParaMTBui_B = CalcParameters(t_a_design=t_a_design, t_a=2, q_design=q_design_e, PLC=0.538, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=42, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = False)
+MTBui_B = ParaMTBui_B.createBuilding()
+
+
+ParaMTBui_C = CalcParameters(t_a_design=t_a_design, t_a=7, q_design=q_design_e, PLC=0.346, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=36, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = False)
+MTBui_C = ParaMTBui_C.createBuilding()
+
+
+ParaMTBui_D = CalcParameters(t_a_design=t_a_design, t_a=12, q_design=q_design_e, PLC=0.154, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=30, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = False)
+MTBui_D = ParaMTBui_D.createBuilding()

bamLoadBasedTesting/BuildingModels/BAM_RRT_HP3_variableflow_0129.py

@@ -0,0 +1,35 @@
+from bamLoadBasedTesting.twoMassModel import CalcParameters
+
+"Change design power according to your heat pump"
+q_design_e = 7550 # design heating power in E - only value which is dependent on the heat pump
+t_a_design = -10
+t_flow_design = 55
+tau_b = 209125
+tau_h = 1957
+m_dot_H_design = 0.129 #kg/s equal to 464/3600
+t_b = 20 # constant building temperature
+
+
+#TLF: T_biv=-5°C
+ParaMTBui_F = CalcParameters(t_a_design=t_a_design, t_a=-5, q_design=q_design_e, PLC=0.81, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=49.8, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_F = ParaMTBui_F.createBuilding()
+
+
+ParaMTBui_B = CalcParameters(t_a_design=t_a_design, t_a=2, q_design=q_design_e, PLC=0.538, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=42, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_B = ParaMTBui_B.createBuilding()
+
+
+ParaMTBui_C = CalcParameters(t_a_design=t_a_design, t_a=7, q_design=q_design_e, PLC=0.346, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=36, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_C = ParaMTBui_C.createBuilding()
+
+
+ParaMTBui_D = CalcParameters(t_a_design=t_a_design, t_a=12, q_design=q_design_e, PLC=0.154, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=30, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_D = ParaMTBui_D.createBuilding()

bamLoadBasedTesting/BuildingModels/BAM_RRT_HP3_variableflow_8Kcalc.py

@@ -0,0 +1,35 @@
+from bamLoadBasedTesting.twoMassModel import CalcParameters
+
+"Change design power according to your heat pump"
+q_design_e = 7550 # design heating power in E - only value which is dependent on the heat pump
+t_a_design = -10
+t_flow_design = 55
+tau_b = 209125
+tau_h = 1957
+m_dot_H_design = q_design_e / (4183 * 8) #kg/s equal to 8 K spread in design power point
+t_b = 20 # constant building temperature
+
+
+#TLF: T_biv=-5°C
+ParaMTBui_F = CalcParameters(t_a_design=t_a_design, t_a=-5, q_design=q_design_e, PLC=0.81, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=49.8, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_F = ParaMTBui_F.createBuilding()
+
+
+ParaMTBui_B = CalcParameters(t_a_design=t_a_design, t_a=2, q_design=q_design_e, PLC=0.538, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=42, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_B = ParaMTBui_B.createBuilding()
+
+
+ParaMTBui_C = CalcParameters(t_a_design=t_a_design, t_a=7, q_design=q_design_e, PLC=0.346, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=36, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_C = ParaMTBui_C.createBuilding()
+
+
+ParaMTBui_D = CalcParameters(t_a_design=t_a_design, t_a=12, q_design=q_design_e, PLC=0.154, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=30, t_b=t_b, const_flow=True, m_dot_H_design=m_dot_H_design,
+                             hydraulicSwitch = True)
+MTBui_D = ParaMTBui_D.createBuilding()

bamLoadBasedTesting/BuildingModels/BAM_RRT_MT.py

@@ -2,27 +2,30 @@
 
 "Change design power according to your heat pump"
 q_design_e = 5390 # design heating power in E - only value which is dependent on the heat pump
+t_a_design = -10
+t_flow_design = 55
 tau_b = 209125
 tau_h = 1957
 mass_flow = 720/3600
 t_b = 20 # constant building temperature
 
-ParaMTBui_E = CalcParameters(t_a=-10, q_design=q_design_e, tau_b=tau_b, tau_h=tau_h, t_flow_design=55, t_b=t_b,
-                             const_flow=True, mass_flow=mass_flow, boostHeat=True, maxPowBooHea=7000)
+ParaMTBui_E = CalcParameters(t_a_design=t_a_design, t_a=-10, q_design=q_design_e, PLC=1, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=55, t_b=t_b, const_flow=True, m_dot_H_design=mass_flow,
+                             boostHeat=False, maxPowBooHea=7000)
 MTBui_E = ParaMTBui_E.createBuilding()
 
-ParaMTBui_A = CalcParameters(t_a=-7, q_design=q_design_e*0.885, tau_b=tau_b, tau_h=tau_h, t_flow_design=52, t_b=t_b,
-                             const_flow=True, mass_flow=mass_flow)
+ParaMTBui_A = CalcParameters(t_a_design=t_a_design, t_a=-7, q_design=q_design_e, PLC=0.885, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=52, t_b=t_b, const_flow=True, m_dot_H_design=mass_flow)
 MTBui_A = ParaMTBui_A.createBuilding()
 
-ParaMTBui_B = CalcParameters(t_a=2, q_design=q_design_e*.538, tau_b=tau_b, tau_h=tau_h, t_flow_design=42, t_b=t_b,
-                             const_flow=True, mass_flow=mass_flow)
+ParaMTBui_B = CalcParameters(t_a_design=t_a_design, t_a=2, q_design=q_design_e, PLC=0.538, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=42, t_b=t_b, const_flow=True, m_dot_H_design=mass_flow)
 MTBui_B = ParaMTBui_B.createBuilding()
 
-ParaMTBui_C = CalcParameters(t_a=7, q_design=q_design_e*0.346, tau_b=tau_b, tau_h=tau_h, t_flow_design=36, t_b=t_b,
-                             const_flow=True, mass_flow=mass_flow)
+ParaMTBui_C = CalcParameters(t_a_design=t_a_design, t_a=7, q_design=q_design_e, PLC=0.346, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=36, t_b=t_b, const_flow=True, m_dot_H_design=mass_flow)
 MTBui_C = ParaMTBui_C.createBuilding()
 
-ParaMTBui_D = CalcParameters(t_a=12, q_design=q_design_e *0.154, tau_b=tau_b, tau_h=tau_h, t_flow_design=30, t_b=t_b,
-                             const_flow=True, mass_flow=mass_flow)
+ParaMTBui_D = CalcParameters(t_a_design=t_a_design, t_a=12, q_design=q_design_e, PLC=0.154, tau_b=tau_b, tau_h=tau_h,
+                             t_flow_design=t_flow_design, t_flow_plc=30, t_b=t_b, const_flow=True, m_dot_H_design=mass_flow)
 MTBui_D = ParaMTBui_D.createBuilding()

bamLoadBasedTesting/BuildingModels/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.0"
+__version__ = "0.25.0"
 __author__ = "Stephan Göbel"

bamLoadBasedTesting/Example/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.0"
+__version__ = "0.25.0"
 __author__ = "Stephan Göbel"