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

CI for #785 #786

Open
wants to merge 51 commits into
base: main
Choose a base branch
from

Conversation

DaJansenGit
Copy link
Member

This runs the CI for #785 as this is an external PR.

PGorzalka and others added 30 commits March 16, 2020 17:41
…ackage without setup

outside parameter added to outer wall
…useconditions now cover interzonal air exchange and heat flow parameters

outside parameter removed from outerwall
tabula_de archetype generation and thermalzone adapted for introducing external geometry, including adjustments to innerwall, floor and ceiling
…truction, different type when creating teaser building parts from btom building parts
…nnections

inner ir emissivity calculation bugfix
some changes in parameter handling due to inconsistencies in previous version
adjustment regarding resistance orientation of nz borders
… 4-contribute-dlr-changes-to-open-source-repository

# Conflicts:
#	data/input/inputdata/UseConditions.json
#	data/output/aixlib_output.py
#	data/output/modelicatemplate/AixLib/AixLib_Multizone
#	data/output/modelicatemplate/modelica_test_script
#	data/output/runUnitTests.py
#	logic/buildingobjects/calculation/aixlib.py
#	logic/buildingobjects/calculation/four_element.py
#	teaser/logic/archetypebuildings/tabula/de/singlefamilyhouse.py
…es that should not be contributed and consistency of those that should be.
…neighbored zone functionality in InnerWall and its children
…s with selection. change integration of inner wall area approximation.
…, test of inner wall calculation approach added, additional internal gains removed
…ons to the overall code made after discussing everything with David
PGorzalka and others added 19 commits June 16, 2023 15:58
added new tests that revelead other errors: concise solution for handling interzonal elements depending on properties of the zones still needs to be implemented.
…if interzonals are treated as inner elements
…tom_paths_interzonal_soil

# Conflicts:
#	teaser/data/input/buildingelement_input_json.py
#	teaser/data/output/aixlib_output.py
#	teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone
#	teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_FourElement
#	teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_ThreeElement
#	teaser/data/output/modelicatemplate/AixLib/AixLib_ThermalZoneRecord_TwoElement
#	teaser/logic/archetypebuildings/bmvbs/custom/institute.py
#	teaser/logic/archetypebuildings/bmvbs/custom/institute4.py
#	teaser/logic/archetypebuildings/bmvbs/custom/institute8.py
#	teaser/logic/archetypebuildings/bmvbs/office.py
#	teaser/logic/archetypebuildings/bmvbs/singlefamilydwelling.py
#	teaser/logic/archetypebuildings/residential.py
#	teaser/logic/archetypebuildings/tabula/de/apartmentblock.py
#	teaser/logic/archetypebuildings/tabula/de/multifamilyhouse.py
#	teaser/logic/archetypebuildings/tabula/de/singlefamilyhouse.py
#	teaser/logic/archetypebuildings/tabula/de/terracedhouse.py
#	teaser/logic/archetypebuildings/tabula/dk/apartmentblock.py
#	teaser/logic/archetypebuildings/tabula/dk/singlefamilyhouse.py
#	teaser/logic/archetypebuildings/tabula/dk/terracedhouse.py
#	teaser/logic/archetypebuildings/urbanrenet/est1a.py
#	teaser/logic/archetypebuildings/urbanrenet/est1b.py
#	teaser/logic/archetypebuildings/urbanrenet/est2.py
#	teaser/logic/archetypebuildings/urbanrenet/est3.py
#	teaser/logic/archetypebuildings/urbanrenet/est4a.py
#	teaser/logic/archetypebuildings/urbanrenet/est4b.py
#	teaser/logic/archetypebuildings/urbanrenet/est5.py
#	teaser/logic/archetypebuildings/urbanrenet/est6.py
#	teaser/logic/archetypebuildings/urbanrenet/est7.py
#	teaser/logic/archetypebuildings/urbanrenet/est8a.py
#	teaser/logic/archetypebuildings/urbanrenet/est8b.py
#	teaser/logic/buildingobjects/buildingphysics/wall.py
#	teaser/logic/buildingobjects/calculation/aixlib.py
#	teaser/logic/buildingobjects/calculation/four_element.py
#	teaser/logic/buildingobjects/calculation/one_element.py
#	teaser/logic/buildingobjects/calculation/three_element.py
#	teaser/logic/buildingobjects/calculation/two_element.py
#	teaser/logic/buildingobjects/thermalzone.py
#	teaser/project.py
#	tests/test_data.py
…nd made interzonal import/export choices more concise. Tests are successful for now
added ASHRAE 140 Case 960 into example 11
version update in json files
added separate tests for building elements with interzonals
minor fixes
…hs_interzonal_soil

# Conflicts:
#	teaser/logic/buildingobjects/calculation/aixlib.py
@PGorzalka
Copy link
Contributor

Thanks :) CI seems to run fine, looking forward to your review!

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

Successfully merging this pull request may close these issues.

2 participants