From b679eb487a3032554addb3b552ebec0186b669d4 Mon Sep 17 00:00:00 2001 From: Moritz Lauster Date: Wed, 29 Mar 2017 15:27:19 +0200 Subject: [PATCH] Changes UA-value of windows to U-value of windows in all templates Adds "area weighted" to description of u_value_win Adds u_value_win to set_calc_default #423 --- .../AixLib/AixLib_ThermalZoneRecord_FourElement | 2 +- .../AixLib/AixLib_ThermalZoneRecord_OneElement | 2 +- .../AixLib/AixLib_ThermalZoneRecord_ThreeElement | 2 +- .../AixLib/AixLib_ThermalZoneRecord_TwoElement | 2 +- .../data/output/modelicatemplate/Annex60/Annex60_FourElements | 2 +- teaser/data/output/modelicatemplate/Annex60/Annex60_OneElement | 2 +- .../data/output/modelicatemplate/Annex60/Annex60_ThreeElements | 2 +- .../data/output/modelicatemplate/Annex60/Annex60_TwoElements | 2 +- teaser/logic/buildingobjects/calculation/four_element.py | 3 ++- teaser/logic/buildingobjects/calculation/one_element.py | 3 ++- teaser/logic/buildingobjects/calculation/three_element.py | 3 ++- teaser/logic/buildingobjects/calculation/two_element.py | 3 ++- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_FourElement b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_FourElement index 562f30195..47e948ae1 100644 --- a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_FourElement +++ b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_FourElement @@ -15,7 +15,7 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}" alphaWin = ${zone.model_attr.alpha_conv_inner_win}, RWin = ${zone.model_attr.r1_win}, gWin = ${zone.model_attr.weighted_g_value}, - UWin= ${zone.model_attr.ua_value_win}, + UWin= ${zone.model_attr.u_value_win}, ratioWinConRad = ${zone.model_attr.ratio_conv_rad_inner_win}, AExt = ${get_list(zone.model_attr.facade_areas)}, alphaExt = ${zone.model_attr.alpha_conv_inner_ow}, diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_OneElement b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_OneElement index ffbe78080..b0d3eff7a 100644 --- a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_OneElement +++ b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_OneElement @@ -14,7 +14,7 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}" alphaWin = ${zone.model_attr.alpha_conv_inner_win}, RWin = ${zone.model_attr.r1_win}, gWin = ${zone.model_attr.weighted_g_value}, - UWin= ${zone.model_attr.ua_value_win}, + UWin= ${zone.model_attr.u_value_win}, ratioWinConRad = ${zone.model_attr.ratio_conv_rad_inner_win}, AExt = ${get_list(zone.model_attr.facade_areas)}, alphaExt = ${zone.model_attr.alpha_conv_inner_ow}, diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_ThreeElement b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_ThreeElement index 3a934b32f..407c4a5e9 100644 --- a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_ThreeElement +++ b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_ThreeElement @@ -14,7 +14,7 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}" alphaWin = ${zone.model_attr.alpha_conv_inner_win}, RWin = ${zone.model_attr.r1_win}, gWin = ${zone.model_attr.weighted_g_value}, - UWin= ${zone.model_attr.ua_value_win}, + UWin= ${zone.model_attr.u_value_win}, ratioWinConRad = ${zone.model_attr.ratio_conv_rad_inner_win}, AExt = ${get_list(zone.model_attr.facade_areas)}, alphaExt = ${zone.model_attr.alpha_conv_inner_ow}, diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_TwoElement b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_TwoElement index 3d323ac3b..c1cce2861 100644 --- a/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_TwoElement +++ b/teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_TwoElement @@ -14,7 +14,7 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}" alphaWin = ${zone.model_attr.alpha_conv_inner_win}, RWin = ${zone.model_attr.r1_win}, gWin = ${zone.model_attr.weighted_g_value}, - UWin= ${zone.model_attr.ua_value_win}, + UWin= ${zone.model_attr.u_value_win}, ratioWinConRad = ${zone.model_attr.ratio_conv_rad_inner_win}, AExt = ${get_list(zone.model_attr.facade_areas)}, alphaExt = ${zone.model_attr.alpha_conv_inner_ow}, diff --git a/teaser/data/output/modelicatemplate/Annex60/Annex60_FourElements b/teaser/data/output/modelicatemplate/Annex60/Annex60_FourElements index 1ca85017d..f01612998 100644 --- a/teaser/data/output/modelicatemplate/Annex60/Annex60_FourElements +++ b/teaser/data/output/modelicatemplate/Annex60/Annex60_FourElements @@ -24,7 +24,7 @@ model ${zone.parent.name}_${zone.name} "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); Annex60.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane corGDoublePane(n=${zone.model_attr.n_outer}, - UWin=${zone.model_attr.ua_value_win}) + UWin=${zone.model_attr.u_value_win}) "Correction factor for solar transmission" annotation (Placement(transformation(extent={{6,54},{26,74}}))); Annex60.ThermalZones.ReducedOrder.RC.FourElements diff --git a/teaser/data/output/modelicatemplate/Annex60/Annex60_OneElement b/teaser/data/output/modelicatemplate/Annex60/Annex60_OneElement index 655d55b10..b93b5caba 100644 --- a/teaser/data/output/modelicatemplate/Annex60/Annex60_OneElement +++ b/teaser/data/output/modelicatemplate/Annex60/Annex60_OneElement @@ -24,7 +24,7 @@ model ${zone.parent.name}_${zone.name} "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); Annex60.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane corGDoublePane(n=${zone.model_attr.n_outer}, - UWin=${zone.model_attr.ua_value_win}) + UWin=${zone.model_attr.u_value_win}) "Correction factor for solar transmission" annotation (Placement(transformation(extent={{6,54},{26,74}}))); Annex60.ThermalZones.ReducedOrder.RC.OneElement diff --git a/teaser/data/output/modelicatemplate/Annex60/Annex60_ThreeElements b/teaser/data/output/modelicatemplate/Annex60/Annex60_ThreeElements index 63bfd5488..e33722702 100644 --- a/teaser/data/output/modelicatemplate/Annex60/Annex60_ThreeElements +++ b/teaser/data/output/modelicatemplate/Annex60/Annex60_ThreeElements @@ -24,7 +24,7 @@ model ${zone.parent.name}_${zone.name} "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); Annex60.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane corGDoublePane(n=${zone.model_attr.n_outer}, - UWin=${zone.model_attr.ua_value_win}) + UWin=${zone.model_attr.u_value_win}) "Correction factor for solar transmission" annotation (Placement(transformation(extent={{6,54},{26,74}}))); Annex60.ThermalZones.ReducedOrder.RC.ThreeElements diff --git a/teaser/data/output/modelicatemplate/Annex60/Annex60_TwoElements b/teaser/data/output/modelicatemplate/Annex60/Annex60_TwoElements index c84637f7d..6489dc9de 100644 --- a/teaser/data/output/modelicatemplate/Annex60/Annex60_TwoElements +++ b/teaser/data/output/modelicatemplate/Annex60/Annex60_TwoElements @@ -24,7 +24,7 @@ model ${zone.parent.name}_${zone.name} "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); Annex60.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane corGDoublePane(n=${zone.model_attr.n_outer}, - UWin=${zone.model_attr.ua_value_win}) + UWin=${zone.model_attr.u_value_win}) "Correction factor for solar transmission" annotation (Placement(transformation(extent={{6,54},{26,74}}))); Annex60.ThermalZones.ReducedOrder.RC.TwoElements diff --git a/teaser/logic/buildingobjects/calculation/four_element.py b/teaser/logic/buildingobjects/calculation/four_element.py index e99b33b4c..15cbec4ed 100644 --- a/teaser/logic/buildingobjects/calculation/four_element.py +++ b/teaser/logic/buildingobjects/calculation/four_element.py @@ -289,7 +289,7 @@ class FourElement(object): ua_value_win : float [W/K] U-Value times outer wall area. u_value_win : float [W/(m2K)] - U-Value of windows. + Are weighted U-Value of windows. r_conv_inner_win : float [K/W] Sum of convective resistances for all windows facing the inside of this thermal zone. @@ -1592,6 +1592,7 @@ def set_calc_default(self): # UA-Value self.ua_value_win = 0.0 + self.u_value_win = 0.0 # resistances for heat transfer facing the inside of this thermal zone self.r_conv_inner_win = 0.0 diff --git a/teaser/logic/buildingobjects/calculation/one_element.py b/teaser/logic/buildingobjects/calculation/one_element.py index 39eeeabc8..5155c0cbb 100644 --- a/teaser/logic/buildingobjects/calculation/one_element.py +++ b/teaser/logic/buildingobjects/calculation/one_element.py @@ -143,7 +143,7 @@ class OneElement(object): ua_value_win : float [W/K] U-Value times window wall area. u_value_win : float [W/(m2K)] - U-Value of windows. + Are weighted U-Value of windows. r_conv_inner_win : float [K/W] Sum of convective resistances for all windows facing the inside of this thermal zone. @@ -946,6 +946,7 @@ def set_calc_default(self): # UA-Value self.ua_value_win = 0.0 + self.u_value_win = 0.0 # resistances for heat transfer facing the inside of this thermal zone self.r_conv_inner_win = 0.0 diff --git a/teaser/logic/buildingobjects/calculation/three_element.py b/teaser/logic/buildingobjects/calculation/three_element.py index 8281b6146..33c849a99 100644 --- a/teaser/logic/buildingobjects/calculation/three_element.py +++ b/teaser/logic/buildingobjects/calculation/three_element.py @@ -218,7 +218,7 @@ class ThreeElement(object): ua_value_win : float [W/K] U-Value times outer wall area. u_value_win : float [W/(m2K)] - U-Value of windows. + Are weighted U-Value of windows. r_conv_inner_win : float [K/W] Sum of convective resistances for all windows facing the inside of this thermal zone. @@ -1301,6 +1301,7 @@ def set_calc_default(self): # UA-Value self.ua_value_win = 0.0 + self.u_value_win = 0.0 # resistances for heat transfer facing the inside of this thermal zone self.r_conv_inner_win = 0.0 diff --git a/teaser/logic/buildingobjects/calculation/two_element.py b/teaser/logic/buildingobjects/calculation/two_element.py index 70fd68a62..9b8be1d70 100644 --- a/teaser/logic/buildingobjects/calculation/two_element.py +++ b/teaser/logic/buildingobjects/calculation/two_element.py @@ -179,7 +179,7 @@ class TwoElement(object): ua_value_win : float [W/K] U-Value times window wall area. u_value_win : float [W/(m2K)] - U-Value of windows. + Are weighted U-Value of windows. r_conv_inner_win : float [K/W] Sum of convective resistances for all windows facing the inside of this thermal zone. @@ -1155,6 +1155,7 @@ def set_calc_default(self): # UA-Value self.ua_value_win = 0.0 + self.u_value_win = 0.0 # resistances for heat transfer facing the inside of this thermal zone self.r_conv_inner_win = 0.0