-
Notifications
You must be signed in to change notification settings - Fork 4
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
Use weighted distributions for "condensity" and heating logic #225
Open
spahrenk
wants to merge
348
commits into
main
Choose a base branch
from
use-weighted-dist
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
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.
This branch incorporates weighted distributions of the form
{{height0, height1, ..., height_final},{weight0, weight1, ..., weight_final}}
into HPWHsim. These replace std::vector arrays for expressing heating-power distributions and logic nodes. (The tank temperature profile remains expressed by a std::vector representing a fixed number of tank node temperatures.) The notation for weighted distributions is generally more flexible and compact than the previous forms, and is amenable to JSON data-model format. Normalization is automatic. The height range is taken as [0., height_final]. Heights are scaled upon export so that height_final = 1. Weights are scaled upon export to give a maximum weight of unity.
Existing distributions in Preset and File models are immediately converted to weighted form during loading. Most internal calculations for applying heat or checking logic temperatures are now performed using weighted logic. The transition is mostly obvious and will produce the same results for existing models. But additional conditions are enforced by the internal construction of these models that are not enforced directly when loading from a JSON data model. The distribution is assumed to be peaked about a certain heating or logic node in certain cases. Specifying a different distribution may produce unpredictable behavior:
TempBasedHeatingLogic::getFractToMeetComparisonExternal
is used for single-pass external condensers to prevent exceeding the shut-off condition during heating, but assumes the heating logic refers to a single node out of a fixed 12-node logic structure, which is enforced during initialization of these models. Specifying a different distribution will produce unpredictable behavior.ResistanceFunctionsTest
, but no cases were found that affect simulations.