From 61d7adad927dec1bf13b05336e62168381b148b2 Mon Sep 17 00:00:00 2001
From: F Rehmann <49240249+c0nb4@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:42:46 +0100
Subject: [PATCH] Fix: Multizone average temperature profiles for recude /
 increased load

---
 districtgenerator/data/info.txt               |  4 ++
 .../non_residential_design_building_data.json | 42 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/districtgenerator/data/info.txt b/districtgenerator/data/info.txt
index 7b55d927..1122e256 100644
--- a/districtgenerator/data/info.txt
+++ b/districtgenerator/data/info.txt
@@ -30,6 +30,8 @@ The data folder contains essential information for simulating mixed-use district
 4. multi_zone_average:
    Contains Non-domestic-multi-zone-average-usage-profiles-for-Germany.csv, providing average usage profiles for non-residential buildings.
    Data obtained from IWU:  https://github.com/IWUGERMANY/Non-domestic-multi-zone-average-usage-profiles-for-Germany 
+  
+
 
 5. weather:
    Stores weather data files (e.g., EPW files) used for simulations.
@@ -45,6 +47,8 @@ The data folder contains essential information for simulating mixed-use district
 8. non_residential_design_building_data.json:
    Contains design data for non-residential buildings.
    Data is obtained from: https://github.com/IWUGERMANY/Non-domestic-multi-zone-average-usage-profiles-for-Germany for heating and cooling limits. 
+   For the reduced heating set point temperature the set point temperature is reduced by deltaTheta_i_NA. 
+   For the increased cooling set point temperature the set point temperature is increased by deltaTheta_i_NA. 
 
 
 This structure allows for flexible and comprehensive modeling of various building types and their characteristics, enabling accurate simulation of mixed-use districts.
diff --git a/districtgenerator/data/non_residential_design_building_data.json b/districtgenerator/data/non_residential_design_building_data.json
index 6fa52770..19a4bbac 100644
--- a/districtgenerator/data/non_residential_design_building_data.json
+++ b/districtgenerator/data/non_residential_design_building_data.json
@@ -1,34 +1,36 @@
 {
 "IWU Hotels, Boarding, Restaurants or Catering": {
-    "T_set_min": 20.8,
-    "T_set_min_night": 18.0,
+    "T_set_min": 21.0,
+    "T_set_min_night": 18.3,
     "T_set_max": 24.0,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 26.7,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5
+
 },
 "IWU Office, Administrative or Government Buildings": {
     "T_set_min": 20.8,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 16.9,
     "T_set_max": 24.0,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 27.9,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5
 },
 "IWU Trade Buildings": {
     "T_set_min": 20.8,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 16.9,
     "T_set_max": 24.0,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 27.9,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5
+
 },
 "IWU Technical and Utility (supply and disposal)": {
     "T_set_min": 21.0,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 17.0,
     "T_set_max": 24.0,
     "T_set_max_night": 28.0,
     "T_bivalent": -2.0,
@@ -37,7 +39,7 @@
 },
 "IWU School, Day Nursery and other Care": {
     "T_set_min": 21.0,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 17.0,
     "T_set_max": 24.0,
     "T_set_max_night": 28.0,
     "T_bivalent": -2.0,
@@ -46,7 +48,7 @@
 },
 "IWU Transport": {
     "T_set_min": 21.0,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 17.0,
     "T_set_max": 24.0,
     "T_set_max_night": 28.0,
     "T_bivalent": -2.0,
@@ -55,17 +57,17 @@
 },
 "IWU Health and Care": {
     "T_set_min": 21.5,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 18.6,
     "T_set_max": 24.0,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 26.9,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5
 },
 "IWU Sports Facilities": {
-    "T_set_min": 20.0,
-    "T_set_min_night": 18.0,
-    "T_set_max": 26.0,
+    "T_set_min": 20.1,
+    "T_set_min_night": 16.2,
+    "T_set_max": 24.1,
     "T_set_max_night": 28.0,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
@@ -73,7 +75,7 @@
 },
 "IWU Culture and Leisure": {
     "T_set_min": 21.0,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 17.0,
     "T_set_max": 24.0,
     "T_set_max_night": 28.0,
     "T_bivalent": -2.0,
@@ -100,18 +102,18 @@
 },
 "IWU Generalized (2) Production buildings": {
     "T_set_min": 15.1,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 13.5,
     "T_set_max": 25.4,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 27.0,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5
 },
 "IWU Production, Workshop, Warehouse or Operations": {
     "T_set_min": 15.1,
-    "T_set_min_night": 18.0,
+    "T_set_min_night": 13.5,
     "T_set_max": 25.4,
-    "T_set_max_night": 28.0,
+    "T_set_max_night": 27.0,
     "T_bivalent": -2.0,
     "T_heatlimit": 15.0,
     "ventilation_rate": 0.5