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
RWTH-EBC · Mar 29, 2017 · b679eb4 · b679eb4
1 parent b0e24c3
commit b679eb4
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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