Computation of friction coefficient by replaceable model #21
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
…le function for friction factor; - implementation of external function for friction factor in Gas.Flow1DFV, Water.Flow1DFV, Water.Flow1DFEM, Water.Flow1DFV2ph and Water.Flow1DFEM2ph; - replaceable function Cfcorr for external friction factor in Gas.BaseClasses.Flow1DBase and Water.BaseClasses.Flow1DBase; - fixed wrong "assert(true)" with "assert(false)" in Water.Flow1DFEM2ph; - fixed wrong "HeatTransfer" with "HeatTransfer2" in Water.Flow1DFV2w, Water.Flow1DFV2ph2w and Gas.Flow1DFV2w; - added package for replaceable friction factor correlations; - fixed Thermal.HT_DHTVolumes, which used deprecated DHT connector instead of DHTVolumes (and did not work properly with Gas.Flow1DFV models).
….ClosedSystemInit)
…y balance equation
- conflict on Thermal.mo resolved using remote (change in HT_DHTVolumes integrated upstream in a slightly different fashion) - conflict on package.mo resolved using remote
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.
Introducing replaceable model for friction computation in place of the FFType enumeration, while keeping backwards-compatibility