Skip to content

Commit

Permalink
Merge pull request #538 from RWTH-EBC/issue537_windows
Browse files Browse the repository at this point in the history
fix windows bug
  • Loading branch information
PRemmen authored Sep 25, 2018
2 parents c64daec + 2be49a6 commit aea2efc
Show file tree
Hide file tree
Showing 7 changed files with 774 additions and 777 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ models for all libraries supporting the

## Version

TEASER is a ongoing research project, the current version is 0.6.1, which is
TEASER is a ongoing research project, the current version is 0.6.2, which is
still a pre-release.

## How to use TEASER
Expand Down
10 changes: 5 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# The short X.Y version.
version = '0.6.'
# The full version, including alpha/beta/rc tags.
release = '0.6.1'
release = '0.6.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -209,16 +209,16 @@

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
# 'preamble': '',

# Latex figure (float) alignment
#'figure_align': 'htbp',
# 'figure_align': 'htbp',
}

# Grouping the document tree into LaTeX files. List of tuples
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup

setup(name='teaser',
version='0.6.1',
version='0.6.2',
description='Tool for Energy Analysis and Simulation for '
'Efficient Retrofit ',
url='https://github.com/RWTH-EBC/TEASER',
Expand Down
4 changes: 2 additions & 2 deletions teaser/data/input/inputdata/TypeBuildingElements.xml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
</elements:layer>
<elements:layer>
<elements:id>1</elements:id>
<elements:thickness>0.0</elements:thickness>
<elements:thickness>0.001</elements:thickness>
<elements:material material_id="6c217f5c-3a43-11e7-8fc5-2cd444b2e704">steel_sheet</elements:material>
</elements:layer>
<elements:layer>
Expand All @@ -345,7 +345,7 @@
</elements:layer>
<elements:layer>
<elements:id>2</elements:id>
<elements:thickness>0.0</elements:thickness>
<elements:thickness>0.001</elements:thickness>
<elements:material material_id="6c217f5c-3a43-11e7-8fc5-2cd444b2e704">steel_sheet</elements:material>
</elements:layer>
</elements:Layers>
Expand Down
Loading

0 comments on commit aea2efc

Please sign in to comment.