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

Issue1123 partial hom models #1229

Merged
merged 86 commits into from
Mar 24, 2022
Merged

Issue1123 partial hom models #1229

merged 86 commits into from
Mar 24, 2022

Conversation

FWuellhorst
Copy link
Contributor

Closes #1123

Alexander and others added 30 commits October 22, 2019 10:00
#784 first version of ahu
642e28c
Merge branch 'issue785_SteamHumidifier_u' of https://github.com/RWTH-…
7e3a931 
…EBC/AixLib into issue784_AhuWithHydraulicModules
#784 steam humidifier pulled
7bf15f9
#784 GenericahuBus added
cb27a82
Merge branch 'issue677_HydraulicModulesForAHU' of https://github.com/…
c4859fd 
…RWTH-EBC/AixLib into issue784_AhuWithHydraulicModules

# Conflicts:
#	AixLib/Systems/ModularAHU/BaseClasses/package.order
#784 parameter defined
29b3986
#784 Example/GenericAHU.mo added and work on parameter definition
a5bfee2
#784 selectable approach with bypass models
55f3253
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
01828ba 
… issue784_AhuWithHydraulicModules
Merge branch 'issue677_HydraulicModulesForAHU' of https://github.com/…
dbe4fe8 
…RWTH-EBC/AixLib into issue784_AhuWithHydraulicModules

# Conflicts:
#	AixLib/Systems/ModularAHU/package.order
#784 controller and ahu2 added
8ac7a54
#784 controller modified
d22821e
#784 conditional input in Controller/CtrRegBasic.mo
d4ae6fb
#784 ahu Controller/CtrAHUBasic.mo improved an bug fixed.
03cf67c
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
9b27a0e 
… issue784_AhuWithHydraulicModules
#784 generic ahu modified according to changes in development
d22678c
Merge branch 'issue677_HydraulicModulesForAHU' of https://github.com/…
3c87038 
…RWTH-EBC/AixLib into issue784_AhuWithHydraulicModules

# Conflicts:
#	AixLib/Systems/ModularAHU/Controller/CtrRegBasic.mo
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
57406b7 
… issue784_AhuWithHydraulicModules

# Conflicts:
#	AixLib/Systems/ModularAHU/Controller/CtrRegBasic.mo
#784 bug fix
b60be5d
#784 bug fixes caused by merge
bec5396
@alexanderAKU
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
0071660 
… issue784_AhuWithHydraulicModules
@alexanderAKU
#784 example renamed and info section for CtrAHUBasic.mo added.
bd501f2
@alexanderAKU
#784 documentation added
232f215
@alexanderAKU
#784 connection layout modified
af60837
@alexanderAKU
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
722b818 
… issue784_AhuWithHydraulicModules
@alexanderAKU
#784 bug fixes from development merge ind GenericAHU
07a7814
@alexanderAKU
#784 initial Type in Controller/CtrAHUBasic.mo added
bb09064
@alexanderAKU
#784 energyDynamics final in GenericAHU.mo
ce6178b
Merge remote-tracking branch 'remotes/origin/development' into issue7…
f88f343 
…84_AhuWithHydraulicModules
#784 reworked according to review
ccf759e
@ebc-aixlib-bot
Copy link
Contributor

Errors in regression test. Compare the results on the following page
https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots

KremerMartin
KremerMartin previously approved these changes Feb 25, 2022
View reviewed changes
@ebc-aixlib-bot
Copy link
Contributor

Errors in regression test. Compare the results on the following page
https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots

@FWuellhorst
Copy link
Contributor Author

@martinkremer : I checked all results, the are all the same. Check as well, afterwards we could delete the results and create new ones. Then, we can review and merge.

KremerMartin
KremerMartin previously approved these changes Mar 16, 2022
View reviewed changes
Copy link
Contributor

@KremerMartin KremerMartin left a comment

Choose a reason for hiding this comment

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

Thanks for your effort, @FWuellhorst . Looks fine. All checks of the HOM work at my device.

KremerMartin
KremerMartin previously approved these changes Mar 16, 2022
View reviewed changes
@ebc-aixlib-bot
Copy link
Contributor

Errors in regression test. Compare the results on the following page
https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots

@FWuellhorst FWuellhorst merged commit 7449b7b into development Mar 24, 2022
@FWuellhorst FWuellhorst deleted the issue1123_partialHOMModels branch March 24, 2022 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KremerMartin KremerMartin KremerMartin approved these changes

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

Successfully merging this pull request may close these issues.

Increase usability of HOM by introducing new partial models
6 participants
@FWuellhorst @KremerMartin @ebc-aixlib-bot @alexanderAKU @DaJansenGit @martinkremer