Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to Master (due to AixLib update) #688

Closed
MartinRaetz opened this issue Jun 9, 2021 · 3 comments
Closed

Dev to Master (due to AixLib update) #688

MartinRaetz opened this issue Jun 9, 2021 · 3 comments

Comments

@MartinRaetz
Copy link
Contributor

What is the problem?

  • The AixLib Master is updated with the development. Current Teaser master is not anymore compatible with AixLib master.

Why do we want to solve it?

  • Restore compatibility

How do we want to solve it?

  • Merge Teaser development into Master
@MartinRaetz
Copy link
Contributor Author

MartinRaetz commented Jun 9, 2021

Manually tested files:

  • verification_ASHRAE_140_600.py
  • verification_ASHRAE_140_620.py
  • verification_ASHRAE_140_900.py
  • verification_ASHRAE_140_920.py
  • e2_export_aixlib_models.py
  • e6_generate_building.py (including AixLib export)
  • e9_building_data_import_from_excel.py

MartinRaetz added a commit that referenced this issue Jun 16, 2021
* #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
Copy link
Contributor

@MartinRaetz
As far as I can see is this merge done, right? Unfortunately the auto deployment to pypi seems to be not existing anymore (as we are not using travis anymore?) We should change that and introduce a new github action for this deployment. Do you agree?

@MartinRaetz
Copy link
Contributor Author

Thank you for noticing!
I agree with you!

pseiwert pushed a commit that referenced this issue Feb 3, 2023
* #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]>
pseiwert pushed a commit that referenced this issue Feb 3, 2023
* #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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants