Merge branch 'main' into 787-dynamic-heating-and-cooling-profiles

RWTH-EBC · Dec 12, 2024 · 0bca1c0 · 0bca1c0
2 parents 9f11638 + 085c991
commit 0bca1c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/teaser/data/input/inputdata/TypeElements_IWU.json b/teaser/data/input/inputdata/TypeElements_IWU.json
@@ -1219,7 +1219,7 @@
             "2": {
                 "thickness": 0.14,
                 "material": {
-                    "name": "wood_fibreboard_iwu_light_200",
+                    "name": "wood_fibreboard_light_200",
                     "material_id": "2b23145c-3a43-11e7-ad60-2cd444b2e704"
                 }
             }

diff --git a/teaser/logic/buildingobjects/useconditions.py b/teaser/logic/buildingobjects/useconditions.py
@@ -136,7 +136,9 @@ class UseConditions(object):
         :cite:`DiLaura.2011`.
         AixLib: Used in Zone record for internal gains, lighting
     maintained_illuminance : float [Lx]
-        maintained illuminance value for lighting. This value is taken from SIA 2024
+        maintained illuminance value for lighting.
+        This value is partially taken from SIA 2024 (2015-10) and partially
+        from DIN V EN 18599-10 (2018-09).
     lighting_efficiency_lumen: float [lm/W_el]
         lighting efficiency in lm/W_el, in german: Lichtausbeute
     lighting_profil : [float]