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

1426 non standard annotation phe #1466

Merged
merged 18 commits into from
Jan 25, 2024

Conversation

TobiasSpratte
Copy link
Contributor

This pull request solves issue #1440. All instances of radioButtons in HOM are changed to enumerations. All hard-coded integer variables are changed to enumeration instances. There are more instances of radioButtons in the AixLib, which will be reworked in issue #1426.

TobiasSpratte and others added 9 commits June 6, 2023 13:58
changed CalcMethodRadiativeHeatTransfer.mo
Changed CalcMethodConvectiveHeatTransfer.mo, CalcMethodConvectiveHeatTransferInsideSurface.mo, CalcMethodLongwaveRadiationHeatTransfer.mo, SurfaceOrientation.mo
…tion_tsp' into 1426-non-standard-annotation-phe
Changed ThermalInsulationRegulation.mo
Changed all radioButtons in HOM
…ditions" #1426

change radioButtons to checkBoxes if number of choices equals two.
change radioButtons to enumerations if number of choices is greater than two.
…tion_tsp' into 1426-non-standard-annotation-phe
@TobiasSpratte TobiasSpratte linked an issue Sep 19, 2023 that may be closed by this pull request
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.

Thanks! Only minor comments.

@TobiasSpratte
Copy link
Contributor Author

implemented the required changes.

@TobiasSpratte TobiasSpratte linked an issue Sep 19, 2023 that may be closed by this pull request
FWuellhorst
FWuellhorst previously approved these changes Sep 19, 2023
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.

Thanks, looks nice :)

@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/1426-non-standard-annotation-phe/plots

@PatrickHenkel1
Copy link
Contributor

Tobias implemented the required changes from the last review, I fixed a wrong calculation method due to which the regression tests for HOM ASHRAE failed. I also changed the assignments in the pool model to enumerations

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.

@PatrickHenkel Thanks for the implementation.

I don't think conversion scripts work in this case (https://github.com/RWTH-EBC/AixLib/wiki/Conversion-Scripts) as the type changes from Integer to Enumeration. Thus, could you increase the version number of the AixLib (in AixLib\package.mo) to 1.4.0? This way, users will get a wrong version warning when loading the latest development.
They will get warnings like this, but the equality will still work.
image

@PatrickHenkel1 PatrickHenkel1 merged commit 26e999f into development Jan 25, 2024
1 check passed
@PatrickHenkel1 PatrickHenkel1 deleted the 1426-non-standard-annotation-phe branch January 25, 2024 10:03
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.

Non-standard annotation in HOM Non-standard annotation
5 participants