Skip to content

Bsm generic np for comparison#2

Draft
dalyw wants to merge 18 commits intomainfrom
bsm_generic_np
Draft

Bsm generic np for comparison#2
dalyw wants to merge 18 commits intomainfrom
bsm_generic_np

Conversation

@dalyw
Copy link
Owner

@dalyw dalyw commented Jan 6, 2026

Fixes/Resolves:

(replace this with the issue # fixed or resolved, if no issue exists then a brief statement of what this PR does)

Summary/Motivation:

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

dalyw and others added 18 commits May 6, 2025 13:06
…ack changes

- unit model
- flowsheet
- costing model
- mass vs mole basis for specifying flows. (will use moles for IX, mass for this flowsheet)
- separately breaking out removal factors and electricity consumption for "S_PO4", "S_NH4", "S_NO3", "S_NO2" and updating functions like electricity_consumption accordingly
- adding molar mass parameters (there might be a better way to svae this)

Adding to genericNP.py costing
- ammonia_recovery_value
- cost_ammonia_flow argument and equation

BSM2_genericNP_no_bioP.py
- adding costing method (still debugging infeasibility errors)
- debugging print statements (temporary)
- specifying mass basis for genericNP
- adding parameter sweep on both NH4 removal and P removal, and helper functions (build_model, build outputs, run_analysis, etc)

Also adding create_dash_app function for visualization
Adding costing after initialization similar to BSM2.py. Updating multi_sweep.py to match

Making full WWTP unit model capex OPTIONAL in BSM2_genericNP_no_bioP.py

Applying recovery value of N and P products

Allowing either nh4_removal or n to p ratio for n removal fraction

Debugging multiprocessing in multi_sweep.py
* remove python 3.9
from ci workflow and setup.py

* add pylint fix

* pin to earlier numpy to fix compat issues

---------

Co-authored-by: Sufi Kaur <sufikaur@lbl.gov>
* align reshape arguments with new numpy version to fix pylint failure

* assign newshape to shape instead of removing

* pull parameter sweep from adjusted branch on fork

* Update parameter_sweep_demo.ipynb

* Update parameter_sweep_demo.ipynb

* Update parameter_sweep_demo.ipynb

fix dumb shitbook error.

* Update setup.py

Switch to install lates ps tool instead of pip version till a new release is made.

---------

Co-authored-by: Sufi Kaur <sufikaur@lbl.gov>
Co-authored-by: avdudchenko <33663878+avdudchenko@users.noreply.github.com>
Co-authored-by: Sufi Kaur <56102473+sufikaur@users.noreply.github.com>
* Add contact info to ReadMe and ReadTheDocs

* Update message so that Adam's email is directly outward facing

* Update docs/index.rst

Co-authored-by: Sufi Kaur <56102473+sufikaur@users.noreply.github.com>

* Update README.md

Co-authored-by: Sufi Kaur <56102473+sufikaur@users.noreply.github.com>

---------

Co-authored-by: Sufi Kaur <56102473+sufikaur@users.noreply.github.com>
* fix set_markdown issue

* revise typo

---------

Co-authored-by: Keith Beattie <ksbeattie@lbl.gov>
Co-authored-by: Adam Atia <aatia@keylogic.com>
…amics (watertap-org#1717)

* Bring WaterTap in line with changes in IDAES scaling

* pylint

* Relative error

* breakdown by platform

* 1711 got merged

* trying to install prommis

* that didn't work

* pull from the IDAES release candidate

* fix requirement

* ...

* scaling

* document condition numbers

* condition number improving

* Forgot to commit final set of changes

* black

* linux

* change note

* Update idaes-pse dependency in requirements-dev.txt

* Update idaes-pse dependency to specific version

* Update requirements-dev.txt

Co-authored-by: Ludovico Bianchi <lbianchi@lbl.gov>

* Change idaes-pse requirement to allow newer versions past 2.10.0rc0

* holdup and state vars

* zero dimensional scaling

* tests and run black

---------

Co-authored-by: Sufi Kaur <56102473+sufikaur@users.noreply.github.com>
Co-authored-by: Ludovico Bianchi <lbianchi@lbl.gov>
Co-authored-by: Adam Atia <aatia@keylogic.com>
* Fix NF applied pressure

* Update test

* Update NF ZO test

---------

Co-authored-by: Adam Atia <aatia@keylogic.com>
WIP debuggin multi-N-limit sweep with optimize_design.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments