allows defining weather file path and weather file header

RWTH-EBC · Jul 20, 2016 · 839dc91 · 839dc91
1 parent e798425
commit 839dc91
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_model b/teaser/data/output/modelicatemplate/AixLib/AixLib_model
@@ -42,7 +42,8 @@ model ${bldg.name}
     Sky_rad=true,
     Ter_rad=true,
     fileName=Modelica.Utilities.Files.loadResource(
-        "modelica://AixLib/Resources/WeatherData/TRY2010_12_Jahr_Modelica-Library.txt"),
+      "${weather}"),
+    tableName="${weather_header}",
     % if bldg.latitude is None:
       Latitude=49.5,
     % else:
@@ -176,7 +177,8 @@ end ${bldg.name};
     Sky_rad=true,
     Ter_rad=true,
     fileName=Modelica.Utilities.Files.loadResource(
-        "modelica://AixLib/Resources/WeatherData/TRY2010_12_Jahr_Modelica-Library.txt"),
+      "${weather}"),
+    tableName="${weather_header}",
     % if bldg.latitude is None:
       Latitude=49.5,
     % else:

diff --git a/teaser/project.py b/teaser/project.py
@@ -79,8 +79,9 @@ def __init__(self, load_data=True):
         self.modelica_info = ModelicaInfo()
 
         self.modelica_project = self.name
-        self.weather_file_header = ""
-        self.weather_file_path = ""
+        self.weather_file_header = "wetter"
+        self.weather_file_path = "modelica://AixLib/Resources/WeatherData/" \
+                                 "TRY2010_12_Jahr_Modelica-Library.txt"
         self.buildings = []
 
         self._calculation_method = "vdi"
@@ -1012,8 +1013,9 @@ def set_default(self):
         self.name = "Project"
 
         self.modelica_project = self.name
-        self.weather_file_header = ""
-        self.weather_file_path = ""
+        self.weather_file_header = "wetter"
+        self.weather_file_path = "modelica://AixLib/Resources/WeatherData/" \
+                                 "TRY2010_12_Jahr_Modelica-Library.txt"
         self.buildings = []
         self._number_of_elements_calc = 2
         self._merge_windows_calc = False