-
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
Update nf scaling. #1145
Merged
Merged
Update nf scaling. #1145
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
14b0274
Update nanofiltration_DSPMDE_0D.py
avdudchenko e8d8df2
Update nf_with_bypass.py
avdudchenko 6339842
Relaxed hardness constraint in jupyer notebook, and fixed test
avdudchenko 498cda2
Fixing black formating?
avdudchenko 7dbe1ca
Update nanofiltration_DSPMDE_0D.py
avdudchenko 1ea8928
Merge branch 'main' into nf_scailing_update
avdudchenko 9e2615f
update scaiing
avdudchenko a8ec4c7
Merge branch 'nf_scailing_update' of https://github.com/avdudchenko/w…
avdudchenko c8f8315
updated scailing/major patch
avdudchenko 50d5de4
Update nanofiltration_DSPMDE_0D.py
avdudchenko 17e4d18
fixed formating and removed prints
avdudchenko 54fefd1
Update nanofiltration_DSPMDE_0D.py
avdudchenko 2c4d4aa
Update nanofiltration_DSPMDE_0D.py
avdudchenko 740c772
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
adam-a-a 5e8f95d
Update watertap/unit_models/tests/test_nanofiltration_DSPMDE_0D.py
adam-a-a be85e4f
Merge remote-tracking branch 'upstream/main' into nf_scailing_update
avdudchenko 6cc035b
updarted partioning scailign
avdudchenko 17291e3
Update nanofiltration_DSPMDE_0D.py
avdudchenko cd7e6e7
Update test_nf.py
avdudchenko 608af7a
Update nanofiltration_DSPMDE_0D.py
avdudchenko fbc8617
Update nawi_spring_meeting2023.ipynb
avdudchenko c647ea9
Update nawi_spring_meeting2023.ipynb
avdudchenko 1b599d1
Update nanofiltration_DSPMDE_0D.py
avdudchenko 02f00db
Update nanofiltration_DSPMDE_0D.py
avdudchenko 281a992
Update nawi_spring_meeting2023.ipynb
avdudchenko 1644dfc
Update nawi_spring_meeting2023.ipynb
avdudchenko 5ba4974
removed duplicate calc scailign
avdudchenko 6ea0e3e
Merge branch 'main' into nf_scailing_update
avdudchenko ce6f865
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
avdudchenko 7857c71
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
avdudchenko 8771da9
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
avdudchenko 18c5574
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
avdudchenko 4b6ebae
Update nanofiltration_DSPMDE_0D.py
avdudchenko f89e036
Update nanofiltration_DSPMDE_0D.py
avdudchenko b1fea16
Revert "Update multicomp_aq_sol_prop_pack.py"
avdudchenko 0e22f60
Update nanofiltration_DSPMDE_0D.py
avdudchenko 5918800
Update nawi_spring_meeting2023.ipynb
avdudchenko 3be712a
Update watertap/unit_models/nanofiltration_DSPMDE_0D.py
avdudchenko ee46fb6
Merge branch 'main' into nf_scailing_update
avdudchenko 632d997
Apply suggestions from code review
adam-a-a 9df6623
pylint<3 (for now)
bknueven 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
black==22.3.0 | ||
pre-commit | ||
# TODO pin exact version for pylint and astroid | ||
pylint | ||
pylint<3 | ||
astroid | ||
# Defer to setup.py contents | ||
-e .[dev,notebooks] |
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
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.
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.
Does this still break if you fix to 90% after scale refinement (considering all the latest changes with all checks passing)?
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.
I still would prefer fixing recovery rate here simply for the sake of avoiding future test failures due to recov rate riding up to the upper bound and subtle variations that could occur from that, but going to approve this anyway and leave the choice to you