Merging latest master #94
Open
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
…odelica-buildings into issue3063_dhwLoaDisHea
…odelica-buildings into issue3063_dhwLoaDisHea
* Add multiple-configuration damper * Implement container for valves * Refactor coil w/ valve & OA section w/ damper * Refactor templates w/ container components * Fix enable expression, add doc * Update mos scripts and results * Clean package * Update results * Add vendor annotation (HACK for ctrl-flow-dev#360) * Use final assignments in interface * Doc * Remove unused classes * Corrected format --------- Co-authored-by: Michael Wetter <[email protected]>
* Merged IBPSA, issue1754_ATESmodel
…es (#3531) * removed coil valve position input connectors * added revision note and conversion script * added electric heating coil option * added 2-position relief damper position output * fixed singular error due to the choose of hardwired freezestat * corrected validation model * corrected condition for enabling returning air temperature input * improved validation model * changed pressure control enumeration name * added coil type enumeration, changed pressure control type enumeration name * added coil enumeration and removed the have_hotWatCoi or have_eleHeaCoi * added conditional cooling coil types [ci skip] * Differentiated heating and cooling coil enumeration * Refactor templates for new enumerations from OBC [ci skip] * corrected conditions enabled/disable blocks in freeze protection * added boolean parameter to constrain heating coil options --------- Co-authored-by: AntoineGautier <[email protected]>
This integrates the upstream change from ibpsa/modelica-ibpsa#1808
* Added new argument to DAT generation script for start time of DAT file * Implemented fixes to DAT generation script * Removed type declaration --------- Co-authored-by: Devaprasad <[email protected]> Co-authored-by: Michael Wetter <[email protected]>
…t dhw heat pump in ETS
…odelica-buildings into issue3063_dhwLoaDisHea
* Removed wrong parameter keyword For #3978
* merged from IBPSA
* Implemented support for EnergyPlus RunPeriod For #2926
Co-authored-by: Christian Winther <[email protected]>
* Changed actuator model to use slew rate limiter instead of 2nd order filter. For #3965
* Corrected dimension of actPos For #4004
* Corrected dimension of actPos For #4004 * Removed 'each' * Corrected assignment of time constant for SlewRateLimiter * Updated reference results for new parameterization of SlewRateLimiter * Merged documentation and formatting changes from IBPSA
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 #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
* added the flag * added extern prefix for global variables * updated linux library * reverted adding extern keyword * changed library file permission
This corrects an annotation that used a non-existent variable
This closes #4048. It also merges minor changes from IBPSA.
* Reduced number of time events for ETS model For #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
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.