Reorganzing the WaterTAP Costing Package #835
Merged
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
Codecov Report
@@ Coverage Diff @@
## main #835 +/- ##
==========================================
+ Coverage 95.44% 95.46% +0.01%
==========================================
Files 261 273 +12
Lines 25334 25399 +65
==========================================
+ Hits 24181 24246 +65
Misses 1153 1153
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
267aff9 to
95e9e2e
Compare
TimBartholomew
approved these changes
Nov 21, 2022
| @@ -930,13 +930,13 @@ def obj_rule(m): | |||
| results = solver.solve(m, tee=False) | |||
| assert_optimal_termination(results) | |||
|
|
|||
| assert pytest.approx(440372.278, rel=1e-5) == value( | |||
| assert pytest.approx(453807.598, rel=1e-5) == value( | |||
There was a problem hiding this comment.
Why are the ion exchange costs changing? Was a bug fixed?
There was a problem hiding this comment.
Yes, look at f3473c3. There were some uncaught issue with units.
|
@OOAmusat @lbibl this seems like a big PR, however, it is essentially moving the costing methods for each unit out of the WaterTAP costing package into a separate file. Could one of you review this, you don't need to go through it line by line. Just see one example of the unit model costing methods now interacts with the costing package |
lbibl
approved these changes
Nov 30, 2022
lbibl
pushed a commit
to lbibl/watertap
that referenced
this pull request
Dec 1, 2022
* adding working proof-of-concept * using attribute * better error handling * better example * hard coding year * separating remaining units * costing flows on costing package * adding init to new dir * fixing simple erros * cleaning up imports * fixing flowsheets * a few more imports * setting up to move flows in with units * fixing import * moving non-electricity flow definition * fixing bug in cost_reverse_osmosis * fixing costing module tests * fixing electrodialysis 0D tests * fixing bug in dye_desalination_ui * cleanup * testing _DefinedFlowsDict * adding test for register_costing_parameter_block * ensuring unit-level costs are convert to base currency * doing conversions correctly * removing base_currency update * fixing units in ion_exchange * updating ion exchange baselines * updating UV AOP baselines * fixing merge conflict mistake
bknueven
pushed a commit
that referenced
this pull request
Dec 14, 2022
* save work * save unfinished work- nonohmic, diffusion layer in places * save work * save work, initial solvable version! * save work * membrane diffusion and water osmosis under polarizaiontion refined * save work, all working property * first finalized ed1d refinement with tests * typo correction * improve fs opt * test opt bound * rename i_lim configvalue * typo fix and rename set * all pressure drop dimensionless quantity and friction methods added * fix impacts on existing ed fs * fix doc building bug * test opt in win * test opt numps solver * save work, add pressure changes in 1d-cv * save work, modify init routine * added and tested cv1d deltaP, addressed comments * add a configerror test * fixed a missing sf to improve solving for mumps * change a var name * added two additional i_lim methods * improved model structure and scaling * Add CITATION file for GitHub * Fix date released * Add text to use for reference * Use entity name for WaterTAP authors * Isothermal 0DRO (#846) * changing 0DRO to be isothermal like 1DRO * updating tests * updating OARO * updating RO default configuration yaml * update seawater RO baselines * update dye desal baselines * update NF bypass twostage baseline * update dye desal baselines; again * OARO Modeling & Initialization (#841) * setting constraint scaling transform for small membrane channel constraints * adjusting RO initialization * restoring custom interface initialization * fixing bug in new initializer * updating test_Pdrop_calculated * fixing cp modulus guess * updating testing baseline * tweaking initialization * move dens_solvent scaling to base class * fixing bug with MC initialization * Revert "tweaking initialization" This reverts commit e015406. * updating baselines, again * removing enthalpy from OARO * removing unneeded import * undoing membrane channel constraint scaling * replacing explicit calls to properties_in/properties_out with 1D versions * Seawater Ion Generic Documentation (#808) * Test that each ZO model has a ZO doc * Adds files that were missed in original commit * Incorporates Ludovico's suggestions * Minor changes to address comments * Excel updatted properly now * Constructed wetlands rst update * revert changes made in last commit * Revert "revert changes made in last commit" This reverts commit 91711ed. * hardcoding list place * Preliminary documentation for seawater_ion_generic * Cl_1- changed to Cl\_- * Gets rid of extra properties table * Update index * Scaling description revised * Update prop pack description * Adds additional properties * Fixes syntax error * Fixes another syntax error * Updates introduction to further explain the connection with IDAES * Updates introduction to further explain the connection with IDAES Co-authored-by: Bernard Knueven <Bernard.Knueven@nrel.gov> Co-authored-by: Keith Beattie <ksbeattie@lbl.gov> * OARO flowsheet (#829) * Add gui * delete redundant GLSD UI code * Draft PR for OARO flowsheet * troubleshoot OARO flowsheet * DOF = 0 resolved; solving flowsheet unsuccessful; issue related to OARO or pump/ERDs * troubleshooting flowsheet * modify test file * half flowsheet * Revise code * Revise OARO model * Add test * Revise OARO * testing main for coverage Co-authored-by: adam-a-a <aatia@keylogic.com> Co-authored-by: Bernard Knueven <Bernard.Knueven@nrel.gov> * fixing getting started links (#852) This addresses #844 by changing them from "latest" to "stable". I also when doing this changed our ReadTheDocs config so that the default is to point to "stable" (which will be the most recent tagged release) rather than "latest" (which is whatever is on the main branch at the time). * Remove idaes solver directives (#836) * removing solver requirement from zero order models * removing in units and full_treatment_train * Differential Parameter Sweep Sampling (#806) * Property Package Constraint Indexing & Utility Function Update (#837) * Update constraint indexing in water prop pack * Initial seawater prop pack changes * Change utility function of seawater prop pack * Updates indexing and utility functions for prop packs * Addresses issues with parameters in the utility function * Makes utility function for transforming property constraints * Update watertap/core/util/scaling.py Co-authored-by: bknueven <30801372+bknueven@users.noreply.github.com> * Update scaling.py * fixing import * rebase main, resolve conflicts * resolve conflicts * Reorganzing the WaterTAP Costing Package (#835) * adding working proof-of-concept * using attribute * better error handling * better example * hard coding year * separating remaining units * costing flows on costing package * adding init to new dir * fixing simple erros * cleaning up imports * fixing flowsheets * a few more imports * setting up to move flows in with units * fixing import * moving non-electricity flow definition * fixing bug in cost_reverse_osmosis * fixing costing module tests * fixing electrodialysis 0D tests * fixing bug in dye_desalination_ui * cleanup * testing _DefinedFlowsDict * adding test for register_costing_parameter_block * ensuring unit-level costs are convert to base currency * doing conversions correctly * removing base_currency update * fixing units in ion_exchange * updating ion exchange baselines * updating UV AOP baselines * fixing merge conflict mistake * modify var bound in optmizaiton * modify var bound in optmizaiton * modify upper bounds of some vars * remove upper bounds and format * Empty commit to trigger CI
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.
Fixes/Resolves: Part of #676
Summary/Motivation:
The WaterTAP costing package was too big. This breaks out all its costing methods and associated parameters into their own files.
Changes proposed in this PR:
watertap/costing/util.pyQuestions:
Legal Acknowledgement
By contributing to this software project, I agree to the following terms and conditions for my contribution: