Merge dev to master to follow AixLib update #689

MartinRaetz · 2021-06-09T08:50:10Z

solves #688

…g factor, added shading_max_irr and shading_g_total to record export, attention hardcode

Merge pull request #632 from RWTH-EBC/development

This reverts commit 6253f74.

#635 should revise the setters

For #669

…added pytest simulaiton export

… example

Issue669 buildingspy

For #669

Add missing file to setup

Adjusted all profiles to a uniform 24h-Format

solve export problem

MartinRaetz · 2021-06-09T08:51:27Z

I suggest to "squash and merge" - objections?

DaJansenGit

Some minor things. Mostly version raise of aixlib version

teaser/data/input/inputdata/MaterialTemplates.json

teaser/data/input/inputdata/TypeElements_TABULA_DE.json

teaser/data/input/inputdata/TypeElements_TABULA_DK.json

teaser/data/output/aixlib_output.py

teaser/logic/buildingobjects/calculation/aixlib.py

teaser/logic/buildingobjects/calculation/ibpsa.py

MartinRaetz

Thank you for your thorough review!
Most changes are introduced due to prior branches merged to the development. Nevertheless, I tried to apply your requested changes on these as well. Thank you for noticing!
The Version Numbers of the AixLib are updated as well.

teaser/logic/buildingobjects/calculation/ibpsa.py

teaser/data/input/inputdata/MaterialTemplates.json

teaser/data/output/aixlib_output.py

teaser/logic/buildingobjects/calculation/aixlib.py

DaJansenGit · 2021-06-16T12:44:48Z

Thanks for the changes! :)

@MartinRaetz

* #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]>

@MartinRaetz

* #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]>

MichaMans and others added 30 commits October 25, 2018 19:43

#543 changed shading g total to 1 for the use for the sunblind shadin…

cc4ec84

…g factor, added shading_max_irr and shading_g_total to record export, attention hardcode

#543 changed sunblind parameters to be usecondition parameters

edd4af5

merge current master in this old branch #543

d97015e

boundary conditions are not needed any longer

df7e2e4

Merge pull request #633 from RWTH-EBC/master

c66be36

Merge pull request #632 from RWTH-EBC/development

just black

1a75f50

untested proposal for shading gvalue

f28ebf8

fix calculation of shading

6b1d92e

#635 should revise the setters

a23d150

Update doc strings and mark todos

f9178bd

Add value for max power of ideal cooler

b144760

Typo in doc string

608deee

Improvements excel import

d88eb34

Update air density typo

534de56

added info to doc string conv_rad

284aaa1

Improvements excel import

4d1abed

revert part of a commit that accidently had these changes

a4db947

run black on exvel import

e029f7e

add info

25c8c00

delete blank line

9a35e4b

restart ci

6253f74

Revert "restart ci"

1ae7e99

This reverts commit 6253f74.

Merge branch 'development' into issue543_sunblinds

d6b627d

add document suggestions made by @MartinRaetz

c70d0b9

defaults to 1.0 if now windows

61d1e4b

Merge pull request #636 from RWTH-EBC/issue635_building_element_setter

58f8570

#635 should revise the setters

More doc strings extensions

759f787

More doc strings extensions 2

4fc7187

WithProfile commit

0eda9a8

schedules is private attribute (doc string)

a6bc81a

marcusfuchs and others added 16 commits December 7, 2020 22:17

Adjust annotation

a25a779

For #669

Change script location

9fa5b99

Delete stray bracket

3bd52b0

Add missing quotes

6bea9b7

Increase count

905830b

revised project name of e3, revised and reformatted runUnitTests.py, …

8de2806

…added pytest simulaiton export

revised formatting of aixlib_ouput.py

2516d17

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

5720562

… example

Merge pull request #672 from RWTH-EBC/issue669_buildingspy

4501902

Issue669 buildingspy

Add missing file to setup

840806a

For #669

Merge pull request #674 from RWTH-EBC/issue669_setup

c2ded84

Add missing file to setup

Adjusted the profiles to a uniform 24h-Format

5eeb3ea

Merge pull request #685 from RWTH-EBC/issue682_AHUprofiles

f90eb6d

Adjusted all profiles to a uniform 24h-Format

solve export problem

421dd0a

Merge pull request #687 from RWTH-EBC/issue686_exportFunction

95243d4

solve export problem

#688 raised version number for master merge

37aefc0

MartinRaetz requested a review from DaJansenGit June 9, 2021 08:50

MartinRaetz self-assigned this Jun 9, 2021

MartinRaetz changed the title ~~Development~~ Merge Dev to Master to follow AixLib Update Jun 9, 2021

MartinRaetz changed the title ~~Merge Dev to Master to follow AixLib Update~~ Merge dev to master to follow AixLib update Jun 9, 2021

DaJansenGit requested changes Jun 14, 2021

View reviewed changes

MartinRaetz commented Jun 16, 2021

View reviewed changes

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

033d310

MartinRaetz requested a review from DaJansenGit June 16, 2021 12:17

DaJansenGit approved these changes Jun 16, 2021

View reviewed changes

MartinRaetz merged commit 36c4ff8 into master Jun 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge dev to master to follow AixLib update #689

Merge dev to master to follow AixLib update #689

MartinRaetz commented Jun 9, 2021

MartinRaetz commented Jun 9, 2021

DaJansenGit left a comment

MartinRaetz left a comment •

edited

Loading

DaJansenGit commented Jun 16, 2021

Merge dev to master to follow AixLib update #689

Merge dev to master to follow AixLib update #689

Conversation

MartinRaetz commented Jun 9, 2021

MartinRaetz commented Jun 9, 2021

DaJansenGit left a comment

Choose a reason for hiding this comment

MartinRaetz left a comment • edited Loading

Choose a reason for hiding this comment

DaJansenGit commented Jun 16, 2021

MartinRaetz left a comment •

edited

Loading