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.

Sign up for GitHub

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

Jump to bottom

Issue745 add kfw archetypes #757

Merged
merged 30 commits into from
Jul 24, 2024
Merged

Issue745 add kfw archetypes #757

merged 30 commits into from
Jul 24, 2024

Conversation

jonas0902
Copy link
Contributor

closes #745

jonas0902 and others added 6 commits March 12, 2024 18:17
@jonas0902
added KFW efficiency house standards and refactored the parameters me…
f1fc186 
…thod, usage, construction_type to construction_data and geometry_data using enums
@jonas0902
adjusted all tests and examples with the two new parameters construct…
91dc969 
…ion_data and geometry_data
@jonas0902
Updated the documentation, example and tests to new variables
40aa4fe
@jonas0902
Formal changes: changed 'geometry_data' back to 'usage' in context of…
a150592 
… use_conditions
@FWuellhorst
Merge remote-tracking branch 'origin/development' into issue745_AddKf…
4f5f01f 
…WArchetypes

# Conflicts:
#	teaser/data/output/aixlib_output.py
#	teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone
#	teaser/logic/buildingobjects/buildingphysics/wall.py
#	teaser/logic/buildingobjects/useconditions.py
#	teaser/project.py
#	tests/test_useconditions.py
@FWuellhorst
enable again
2641e66
@FWuellhorst FWuellhorst mentioned this pull request May 7, 2024
Merged
@jonas0902 jonas0902 changed the title Issue745 add kf w archetypes Issue745 add kfw archetypes May 13, 2024
@FWuellhorst FWuellhorst changed the base branch from development to masterUpdate May 21, 2024 08:58
@FWuellhorst FWuellhorst changed the base branch from masterUpdate to development May 21, 2024 14:12
@FWuellhorst FWuellhorst changed the base branch from development to master May 23, 2024 12:31
@FWuellhorst FWuellhorst changed the base branch from master to development May 23, 2024 12:31
@FWuellhorst
Merge branch 'development' into issue745_AddKfWArchetypes
b90c5bd 
# Conflicts:
#	teaser/data/output/aixlib_output.py
#	teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone
FWuellhorst
FWuellhorst requested changes May 23, 2024
View reviewed changes
Copy link
Contributor

@FWuellhorst FWuellhorst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonas0902 Thanks for the really cools features! I have some minor comments you can address / change.
Afterwards, maybe @DaJansenGit wants to have a look into the changes, else we are good to go.

@DaJansenGit DaJansenGit self-requested a review June 18, 2024 14:59
DaJansenGit
DaJansenGit previously requested changes Jul 16, 2024
View reviewed changes
Copy link
Member

@DaJansenGit DaJansenGit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor changes requested, thanks for the good work :)

teaser/data/input/inputdata/MaterialTemplates.json Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version = 0.7: shouldn't we update these as well to 1.0? The question is why we have a version in the .json files anyway? We can discuss this in our meeting today. If we do changes, we need to do them in all .json files and in the code for loading functions of the .json files.

teaser/examples/e1_generate_archetype.py Outdated
@@ -20,7 +20,7 @@ def example_generate_archetype():
# used data base). Be careful: Dymola does not like whitespaces in names and
# filenames, thus we will delete them anyway in TEASER.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this documentation needs to be revised as we don't set load_data=True

teaser/examples/e6_generate_building.py Outdated
@@ -15,14 +15,17 @@ def example_create_building():
# First step: Import the TEASER API (called Project) into your Python module

from teaser.project import Project
from teaser.data.utilities import ConstructionData
from teaser.data.dataclass import DataClass

# To use the API instantiate the Project class and rename the Project. The
# parameter load_data=True indicates that we load data into our
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this documentation needs to be revised as we don't set load_data=True

@DaJansenGit DaJansenGit mentioned this pull request Jul 16, 2024
Merged
FWuellhorst
FWuellhorst reviewed Jul 23, 2024
View reviewed changes
Copy link
Contributor

@FWuellhorst FWuellhorst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check my comments regarding the docs in the example file. If you agree, change the .py files.

docs/source/examples/e1_generate_archetype.md Outdated
Comment on lines 15 to 17
As a default, the 'iwu' archetype data will be loaded into our Project
via DataClass(construction_data=ConstructionData.iwu_heavy) (e.g. for material properties
and typical wall constructions. This can take a few seconds depending on the size of the used database).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the data is not loaded anymore? At least I don't see it in project.py

docs/source/examples/e6_generate_building.md Outdated
Project (e.g. for Material properties and typical wall constructions.
This can take a few seconds, depending on the size of the used data base.
To use the API, instantiate the Project class and rename the project.
As a default, the 'iwu' archetype data will be loaded into our Project
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

@jonas0902 jonas0902 requested a review from FWuellhorst July 23, 2024 13:40
FWuellhorst
FWuellhorst previously approved these changes Jul 23, 2024
View reviewed changes
Copy link
Contributor

@FWuellhorst FWuellhorst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, looks good! Let's wait for CI and push of new examples. Then you can merge.

@FWuellhorst FWuellhorst dismissed DaJansenGit’s stale review July 23, 2024 13:45

Already reviewed again

FWuellhorst
FWuellhorst approved these changes Jul 24, 2024
View reviewed changes
Copy link
Contributor

@FWuellhorst FWuellhorst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI looks good, you can go ahead and merge @jonas0902

@jonas0902 jonas0902 merged commit d6db3d5 into development Jul 24, 2024
1 check passed
@jonas0902 jonas0902 deleted the issue745_AddKfWArchetypes branch July 24, 2024 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FWuellhorst FWuellhorst FWuellhorst approved these changes

@DaJansenGit DaJansenGit Awaiting requested review from DaJansenGit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jonas0902 @FWuellhorst @DaJansenGit