Merge pull request #276 from RWTH-EBC/issue256_weatherHeader

allows defining weather file path and weather file header
RWTH-EBC · Jul 21, 2016 · 4e0ab5c · 4e0ab5c
2 parents e798425 + 09eca2b
commit 4e0ab5c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ IEA-EBC [Annex60](https://github.com/iea-annex60/modelica-annex60).
 
 ### Version
 
-The current version is 0.3.6, which is a pre-release.
+The current version is 0.3.7, which is a pre-release.
 
 ### How to cite TEASER
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.3.'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.6'
+release = '0.3.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/index.rst b/doc/index.rst
@@ -60,7 +60,7 @@ IEA-EBC `Annex60 <https://github.com/iea-annex60/modelica-annex60>`_.
 Version
 ==================
 
-The current version is 0.3.6, which is a pre-release.
+The current version is 0.3.7, which is a pre-release.
 
 How to cite TEASER
 ==================

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='teaser',
-      version='0.3.6',
+      version='0.3.7',
       description='Tool for Energy Analysis and Simulation for Efficient Retrofit ',
       url='https://github.com/RWTH-EBC/TEASER',
       author='RWTH Aachen University, E.ON Energy Research Center, Institute of Energy Efficient Buildings and Indoor Climate',

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