Skip to content

Commit

Permalink
Merge dev to master to follow AixLib update (#689)
Browse files Browse the repository at this point in the history
* #543 changed shading g total to 1 for the use for the sunblind shading factor, added shading_max_irr and shading_g_total to record export, attention hardcode

* #543 changed sunblind parameters to be usecondition parameters

* boundary conditions are not needed any longer

* just black

* untested proposal for shading gvalue

* fix calculation of shading

* #635 should revise the setters

* Update doc strings and mark todos

* Add value for max power of ideal cooler

* Typo in doc string

* Improvements excel import

* Update air density typo

* added info to doc string conv_rad

* Improvements excel import

* revert part of a commit that accidently had these changes

* run black on exvel import

* add info

* delete blank line

* restart ci

* Revert "restart ci"

This reverts commit 6253f74.

* add document suggestions made by @MartinRaetz

* defaults to 1.0 if now windows

* More doc strings extensions

* More doc strings extensions 2

* WithProfile commit

* schedules is private attribute (doc string)

* Format

* Correct and reformulate withProfile docstrings

* Correct and reformulate withProfile docstrings

* correct "nan-dealing" and update pandas df.at to df.loc and typing error

* update pandas df.at to df.loc

* update parameter names based on MBL

* add moisture and nports to RC models

* add 0 time step to internal gains

* set columns in gains file to 4

* set humidification to false if central_ahu

* change shading default

* remove hacked moisure and nports

* Adds UseCondition for classrooms

* update aixlib model to CO2 multizone

* propagate use_c_flow and set medium with c

* make example import use co2 and moisture balance

* update thermal zone name

* delete probable clutter

* E261 at least two spaces before inline comment

* update for aixlib PR1052

* update buildings version

* Issue566weatherfile (#664)

* first changes

* weird things happening in git

* Revert "weird things happening in git"

This reverts commit 923747b.

* implement working version of weather file export

* delete trial results

* convert everything to: saving weather file at "project" level and not at building level

* Revert "Merge branch 'issue566weatherfile' into development"

This reverts commit 9e772fbff69fbce8711cf3629f0aec4eea0363c3.

* Revert "Revert "Merge branch 'issue566weatherfile' into development""

This reverts commit e376eec.

* blank lines (ci)

* run Black on project.py

* update unitTest.json -> previous weatherfile is outdated (doesnt work for AixLib Version) -> set to None(null) to use default weatherfile of Teaser

* naming

* naming

* Weather file line is to long resulting in error

* First try of IBPSA Weather file export

* fixing

* blank line end of file

* #566 fixed tab stop at end of file

* 566 raised aixlib version number to actual dev number

Co-authored-by: MichaMans <[email protected]>

* Add annotation

For #669

* Write test scripts

For #669

* Add script to run unit tests

For #669

* Option to export reference results

For #669

* Remove test line

For #669

* Use runUnitTests from IBPSA

For #669

* Replace very old version

For #669

* Adjust model path in test script

For #669

* Add missing comma

For #669

* Add missing tolerance

For #669

* Fix decoding errors

For #669

* Deactivate pedantic mode

For #669

* Adjust annotation

For #669

* Change script location

* Delete stray bracket

* Add missing quotes

* Increase count

* revised project name of e3, revised and reformatted runUnitTests.py, added pytest simulaiton export

* revised formatting of aixlib_ouput.py

* added reference results for e2 and added them to the ref path of that example

* Add missing file to setup

For #669

* Adjusted the profiles to a uniform 24h-Format

* solve export problem

* #688 raised version number for master merge

* #688 raise AixLib version number + sort import section following pep8

Co-authored-by: MichaMans <[email protected]>
Co-authored-by: Peter Remmen <[email protected]>
Co-authored-by: Peter Remmen <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Martin Kremer <[email protected]>
Co-authored-by: Michael Mans <[email protected]>
Co-authored-by: Martin Kremer <[email protected]>
Co-authored-by: Marcus Fuchs <[email protected]>
Co-authored-by: Wackerbauer <[email protected]>
Co-authored-by: David Wackerbauer <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: David Jansen <[email protected]>
  • Loading branch information
15 people authored Jun 16, 2021
1 parent ef19f22 commit 36c4ff8
Show file tree
Hide file tree
Showing 81 changed files with 3,486 additions and 2,427 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ models for all libraries supporting the

## Version

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

## How to use TEASER
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
# The short X.Y version.
version = "0.7."
# The full version, including alpha/beta/rc tags.
release = "0.7.5"
release = "0.7.6"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="teaser",
version="0.7.5",
version="0.7.6",
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, "
Expand Down Expand Up @@ -47,6 +47,7 @@
"package_order",
"conversion",
"modelica_language",
"modelica_test_script",
],
"teaser.data.output.modelicatemplate.AixLib": [
"AixLib_Multizone",
Expand Down
8 changes: 4 additions & 4 deletions teaser/data/input/inputdata/MaterialTemplates.json
Original file line number Diff line number Diff line change
Expand Up @@ -7020,7 +7020,7 @@
},
"6cb62e70-3a43-11e7-a790-2cd444b2e704": {
"name": "air",
"density": 1184.0,
"density": 1.184,
"thermal_conduc": 0.0261,
"heat_capac": 1.005,
"thickness_default": 0.02,
Expand Down Expand Up @@ -7253,7 +7253,7 @@
},
"b362502c-3f99-11e7-b117-2cd444b2e704": {
"name": "air_layer",
"density": 1184.0,
"density": 1.184,
"thermal_conduc": 0.35,
"heat_capac": 1.005,
"thickness_default": 0.04,
Expand Down Expand Up @@ -7401,7 +7401,7 @@
},
"87e8a070-cc6c-11e8-8dd8-08002700bc00": {
"name": "Air_layer_DK",
"density": 1184.0,
"density": 1.184,
"thermal_conduc": 0.35,
"heat_capac": 1.005,
"thickness_default": 0.0,
Expand All @@ -7410,7 +7410,7 @@
},
"94454f92-cc6c-11e8-bbca-08002700bc00": {
"name": "Air_layer_poor_DK",
"density": 1184.0,
"density": 1.184,
"thermal_conduc": 0.7,
"heat_capac": 1.005,
"thickness_default": 0.0,
Expand Down
Loading

0 comments on commit 36c4ff8

Please sign in to comment.