-
Notifications
You must be signed in to change notification settings - Fork 57
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
Add influent/effluent quality metrics for ASM1 #1243
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
913ab74
add TSS, COD, BOD5 to asm1
adam-a-a 101166c
add TSS, COD, BOD5, TKN, total N to ASM1 with some tests
adam-a-a 51e92e8
Merge branch 'main' into add_aggs_asm1
adam-a-a b86c80f
settle params for TSS and BOD5
adam-a-a ffcae11
black
adam-a-a ae42b62
fix tests
adam-a-a b615123
delete import
adam-a-a be362f0
Merge branch 'main' into add_aggs_asm1
adam-a-a File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe I'm just not understanding, but is there a reason these two are bundled together as opposed to having a separate expression for each?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only difference between the two is that for treated effluent, the whole expression should be multiplied by one value (0.25), while for another stateblock in the flowsheet (e.g., influent, stream bypassing activated sludge process, etc.), the expression is multiplied by another value (0.65). I could've made them separate but chose to do it this way. Note the
BOD5_factor
that I added to the parameter block is also indexed by "raw" or "effluent". (This is the factor that is 0.65 for "raw" and 0.25 for "effluent".)