forked from lbl-srg/modelica-buildings
-
Notifications
You must be signed in to change notification settings - Fork 2
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
Merge latest master #163
Closed
karthikeyad-pnnl
wants to merge
91
commits into
issue3846_HeatPumpPlantControls_withPlantTemplates_122424
from
master
Closed
Merge latest master #163
karthikeyad-pnnl
wants to merge
91
commits into
issue3846_HeatPumpPlantControls_withPlantTemplates_122424
from
master
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Corrected display unit * Updated docker image * Updated reference results for Dymola 2024x Refresh1
This corrects a url
* updated sort block --------- Co-authored-by: Michael Wetter <[email protected]>
* Add load limit depending on operating mode
* merged from IBPSA * updated results
…3812) * Added seasonal geothermal storage models for zoned operation (lbl-srg#3804) --------- Co-authored-by: Massimo Cimmino <[email protected]>
…#3891) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.18 to 1.26.19. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/1.26.19/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.18...1.26.19) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…doc (lbl-srg#3892) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.18 to 1.26.19. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/1.26.19/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.18...1.26.19) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Replace hold with pre * Use full class name
This is for lbl-srg#3900
* Updated to omc 1.23.0
* Add moving average and flow sensor * Update results
) * Add pre block -------- Co-authored-by: Michael Wetter <[email protected]>
* Added additional validation cases
* added output, updating script for the scenario when exporting data is needed * updated python script, so to export data to file
* corrected efficiency equations if total power or eta provided sed -i 's/Added nominal curve specification to suppress warning./Specified <code>nominalValuesDefineDefaultPressureCurve=true<\/code>\nin the mover component to suppress a warning./g' $(find . -iname '*.mo') * added repleaceable keyword to suppress optimica warning --------- Co-authored-by: Michael Wetter <[email protected]>
* Checkout component from issue1374_template_CHW_final * Refactor chiller component w/ ElectricReformulatedEIR * Add HRC controls, refactor with LoadAverage block - In AirToWater validation model: fix wrong assignment of VChiWat_flow_nominal and use actual setpoint for supply temperature. * Integrate HRC component into template * Add HP failsafe staging conditions * Add pump failsafe staging condition - Add Edge block to trigger pump stage change command and remove minimum runtime in pump stage index block. This is needed because efficiency and failsafe conditions lead to different stage runtimes. If the pump availability is taken into account in the future, then the timers need to be reset when a lag pump become available so that the stage change command is triggered again (see the rationale in StageChangeCommand where an "if" condition is still used for this reason). * Add primary-only configuration * Add local ∆p reset block --------- Co-authored-by: JayHuLBL <[email protected]>
…#3933) Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4. - [Commits](certifi/python-certifi@2023.07.22...2024.07.04) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update shell script and GH workflow
…doc (lbl-srg#3937) Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4. - [Commits](certifi/python-certifi@2023.07.22...2024.07.04) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This has formatting changes, corrections to the documentation, and changes in instance names in Examples and Validation
This has changes to the documentation only
* adding plant enabling signal * added filter for the chilled water side isolation valve
* Merged IBPSA, issues1935_unprotectdhDiscretizedDoor This changes a protected parameter to an input, which is assinged by the extending class * Increased timeout. This is due to a recurring problem of this model on travis. The code change from this PR does not change the simulation statistics in OpenModelica
* Refactor to ensure passed=u if t=0 * Update checksum
* Merged IBPSA, issue1921_organicRankineCycle
* Merged IBPSA, issue1937_checkValve This merges the new implementation of the check valve
* Updated OpenModelica version For lbl-srg#4025 * Enabled option to recreated configuration file * Regenerated configuration file
* Merged IBPSA, issue1937_checkValve This merges the new implementation of the check valve This enables simulations that now work due to the new check valve implementation
Merging latest master from upstream
* added the flag * added extern prefix for global variables * updated linux library * reverted adding extern keyword * changed library file permission
* Implemented support for RunPeriod for lbl-srg#2926 * Updated EnergyPlus coupling to add EnergyPlus 24.2.0 for lbl-srg#3911
… Blocks (lbl-srg#4044) * Revised comment strings and formatting For lbl-srg#4038
This corrects an annotation that used a non-existent variable
This closes lbl-srg#4048. It also merges minor changes from IBPSA.
) * Reduced number of time events for ETS model For lbl-srg#4058 * Added pre block to break algebraic loop during initialization This is needed for OpenModelica * Removed duplicate connection * Increase minimum cycle time * Update results --------- Co-authored-by: Antoine Gautier <[email protected]>
* changed tolerance and updated references * reverted changes
* updated windows library * re-build the binary with VS2019
* Refactored Buildings.Occupants For lbl-srg#4069
* Made test case robust against rounding errors For lbl-srg#4074 * Updated checksum
Merging latest master
* Updated reference results for Dymola 2025x * Updated CI image
This updates the link to the build status
* Merged IBPSA, issue1707_iso13790 This merges new validation models and template models
* Merged IBPSA, issue1707_iso13790 and issue1944_cdl
Merging latest master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.