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

Revert most of the changes from #1782 #1795

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Conversation

AntoineGautier
Copy link
Contributor

This addresses #1794.
From PR #1782, we just keep the modification described at #1782 (comment).

This is done manually as git apply with diff from d2edb0c fails.
error: IBPSA/Fluid/Interfaces/PartialTwoPort.mo: patch does not apply
@mwetter
Copy link
Contributor

mwetter commented Sep 20, 2023

@AntoineGautier @FWuellhorst :
Can you please review my latest changes, in which I introduced a base class so the tank ports remain at the top and bottom, and also checked out the examples and validations from the master branch in which the connection lines have been placed accordingly.
I place the new class in Fluid.Storage.BaseClasses as I would think once this tool limitations are corrected, it can be removed again and the original implementation that is cleaner be added back.

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.

Looks good, only one question.

IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo Outdated Show resolved Hide resolved
Copy link
Contributor Author

@AntoineGautier AntoineGautier left a comment

Choose a reason for hiding this comment

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

See my inline comments.
I also added a commit (89217fb) to reroute some connections and increase the size of the diagram layer in StratifiedEnhancedInternalHex (now that it is no longer horizontally constrained).

@mwetter mwetter merged commit 4f6e0df into master Sep 22, 2023
3 checks passed
@mwetter mwetter deleted the issue1794_revertPortPlacement branch September 22, 2023 14:50
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.

3 participants