From 839dc91bc06b98c891a6d3f5cde7c8f601f86412 Mon Sep 17 00:00:00 2001 From: mlauster Date: Wed, 20 Jul 2016 13:45:07 +0200 Subject: [PATCH 1/2] allows defining weather file path and weather file header --- .../data/output/modelicatemplate/AixLib/AixLib_model | 6 ++++-- teaser/project.py | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_model b/teaser/data/output/modelicatemplate/AixLib/AixLib_model index 61399c560..61752a08b 100644 --- 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 index d81f6b16f..c46dea11f 100644 --- 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 From 09eca2beab5d474dea2c24e4ac49f9c36ac809f1 Mon Sep 17 00:00:00 2001 From: mlauster Date: Thu, 21 Jul 2016 13:00:20 +0200 Subject: [PATCH 2/2] sets version number to 0.3.7 #256 --- README.md | 2 +- doc/conf.py | 2 +- doc/index.rst | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3c91b8eea..7aa65a38b 100644 --- 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 index 4f0133e12..2b4a8f785 100644 --- 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 index 05fd2ac4e..1bd4e6294 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -60,7 +60,7 @@ IEA-EBC `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 index fe7dd108a..d8bd522e9 100644 --- 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',