Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Issue929 #1

Draft
wants to merge 61 commits into
base: main
Choose a base branch
from
Draft

Issue929 #1

wants to merge 61 commits into from

Commits on Mar 30, 2023

  1. Revert "switch to nl_v1 (for now)" 

    This reverts commit f062086.
    @bknueven
    bknueven committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    57eea20 View commit details
    Browse the repository at this point in the history

  2. doing some debugging

    @bknueven
    bknueven committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    c02dec2 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Merge branch 'main' into issue929

    @bknueven
    bknueven authored May 17, 2023
    Configuration menu
    Copy the full SHA
    e321ead View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Modify and rescaled following vars and constraints for chemistry test… 

    …s, passed

log_k_eq_constraint
equilibrium_constraint for both solubility product and common eqbm
mole_frac_phase_comp
    Xinhong Liu committed May 26, 2023
    Configuration menu
    Copy the full SHA
    6a209fd View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Update tests for chem_scaling_utils modifications

    Xinhong Liu committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    9c41335 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Enthalpy unit corrected for EDB data

    Liu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    09ac4c8 View commit details
    Browse the repository at this point in the history

  2. chem_scaling_utils updated for corrected enthalpy

    Xinhong Liu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    c31cd09 View commit details
    Browse the repository at this point in the history

  3. Temperature bound modified to avoid breaking out the solvent critical… 

    … temprature

Enthalpy unit corrected
    Xinhong Liu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    d16fc70 View commit details
    Browse the repository at this point in the history

  4. Correct enthalpy units and update assertion in all tests, all pass

    Xinhong Liu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    21b5c69 View commit details
    Browse the repository at this point in the history

  5. Revert "switch to nl_v1 (for now)" 

    This reverts commit f062086.
    @bknueven
    bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    15b4f09 View commit details
    Browse the repository at this point in the history

  6. doing some debugging

    @bknueven
    bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    4ca862c View commit details
    Browse the repository at this point in the history

  7. Modify and rescaled following vars and constraints for chemistry test… 

    …s, passed

log_k_eq_constraint
equilibrium_constraint for both solubility product and common eqbm
mole_frac_phase_comp
    @bknueven
    Xinhong Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    4ed5c2e View commit details
    Browse the repository at this point in the history

  8. Update tests for chem_scaling_utils modifications

    @bknueven
    Xinhong Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    216f7f4 View commit details
    Browse the repository at this point in the history

  9. Enthalpy unit corrected for EDB data

    @bknueven
    Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    c6011bc View commit details
    Browse the repository at this point in the history

  10. chem_scaling_utils updated for corrected enthalpy

    @bknueven
    Xinhong Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    ae9a156 View commit details
    Browse the repository at this point in the history

  11. Temperature bound modified to avoid breaking out the solvent critical… 

    … temprature

Enthalpy unit corrected
    @bknueven
    Xinhong Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f358836 View commit details
    Browse the repository at this point in the history

  12. Correct enthalpy units and update assertion in all tests, all pass

    @bknueven
    Xinhong Liu authored and bknueven committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    a54427c View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Chemistry tests updated after adding mutable parameters to reformulat… 

    …ed solubility_product
    Xinhong Liu committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    4be6732 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Correct TNK to use components updated in anaerobic environment, break… 

    … down as an additional variable

Use smooth_max from idaes utility and other minor improvements
    Xinhong Liu committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    f1035c4 View commit details
    Browse the repository at this point in the history

  2. Update documentation for asm1_adm1 translator

    Xinhong Liu committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    7cd9b05 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Typo/equations corrected for asm1_adm1 translator documentation

    Xinhong Liu committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b207563 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge remote-tracking branch 'upstream/main' into issue929

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    bc2e2a7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into lxhowl_issue929

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    0aab640 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'lxhowl_issue929' into issue929

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1f64faa View commit details
    Browse the repository at this point in the history

  4. black

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    564104e View commit details
    Browse the repository at this point in the history

  5. remove errant merge conflict

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    c84efd3 View commit details
    Browse the repository at this point in the history

  6. pylint

    @bknueven
    bknueven committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    d83dc38 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge branch 'main' into issue929

    @bknueven
    bknueven authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    4907892 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. using idaes-pse with Xinhong's fixes

    @bknueven
    bknueven committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    72d4f16 View commit details
    Browse the repository at this point in the history

  2. pylint

    Xinhong Liu committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    7b74ae0 View commit details
    Browse the repository at this point in the history

  3. Fix NaOCl flowsheet

    Xinhong Liu committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    90dd26c View commit details
    Browse the repository at this point in the history

  4. Remode model.clone in gac test

    Xinhong Liu committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    494faa9 View commit details
    Browse the repository at this point in the history

  5. Update scaling in ion exchange test

    Xinhong Liu committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    c5af80b View commit details
    Browse the repository at this point in the history

  6. Merge pull request watertap-org#3 from lxhowl/issue929 

    Fix Issue929 tests
    @bknueven
    bknueven authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    debc6cd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Update IDAES requirement to 2.2.0.dev0.watertap.23.08.03 tag

    @lbianchi-lbl
    lbianchi-lbl committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    37718f5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'lbianchi-lbl/update-idaes-2.2.0.dev0' i… 

    …nto issue929
    @bknueven
    bknueven committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    9160ef1 View commit details
    Browse the repository at this point in the history

  3. Test NaOCl flowsheet on linux

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    bd39f51 View commit details
    Browse the repository at this point in the history

  4. Relax the bounds of dP_dx (watertap-org#1094) 

    * add

* delete redundant files

* Relax bounds of dP_dx
    @luohezhiming
    luohezhiming authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    cf5ec25 View commit details
    Browse the repository at this point in the history

  5. Test 2 NaOCl flowsheet on linux

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a5fe549 View commit details
    Browse the repository at this point in the history

  6. NF w/ bypass flosheet test

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    868abb4 View commit details
    Browse the repository at this point in the history

  7. Add scaling option

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    b8d1d89 View commit details
    Browse the repository at this point in the history

  8. Merge pull request watertap-org#4 from lxhowl/issue929 

    Fix linux test failures
    @bknueven
    bknueven authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    1a74626 View commit details
    Browse the repository at this point in the history

  9. run black

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a5be500 View commit details
    Browse the repository at this point in the history

  10. Merge pull request watertap-org#5 from lxhowl/issue929 

    run black
    @bknueven
    bknueven authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    25617a4 View commit details
    Browse the repository at this point in the history

  11. Fix pylint

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    06db0a9 View commit details
    Browse the repository at this point in the history

  12. Fix docs test

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    83f4a1e View commit details
    Browse the repository at this point in the history

  13. Update monte carlo flowsheet and documentation to use new parameter s… 

    …weep API (watertap-org#1093)

* Update parameter sweep standalone function args and docstring

* Updated monte carlo flowsheet example to use new non-deprecated parameter sweep api

* Update documentation to reflect new api for parameter sweep

* Remove unnecessary solve() from monte carlo example

* Update watertap/examples/flowsheets/RO_with_energy_recovery/monte_carlo_sampling_RO_ERD.py

Co-authored-by: Kinshuk Panda <kinshukpanda@gmail.com>

* Lint fix: removed unused import

---------

Co-authored-by: Sam Helman <shelman@nrel.gov>
Co-authored-by: Kinshuk Panda <kinshukpanda@gmail.com>
    @shelman @k1nshuk
    3 people authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    6b6cf66 View commit details
    Browse the repository at this point in the history

  14. Remove skip for nf flowsheet notebook

    Xinhong Liu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    259ea4a View commit details
    Browse the repository at this point in the history

  15. Merge pull request watertap-org#6 from lxhowl/issue929 

    Fix pylint and docs
    @bknueven
    bknueven authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    55c846e View commit details
    Browse the repository at this point in the history

  16. Merge branch 'main' into issue929

    @bknueven
    bknueven authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    427f56f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Skip macOS failed tests

    Xinhong Liu committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e59323c View commit details
    Browse the repository at this point in the history

  2. Import pytest to skip ui tests for macOS

    Xinhong Liu committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    cfd3805 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. test ui tests

    Xinhong Liu committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    0305d01 View commit details
    Browse the repository at this point in the history

  2. run black

    Xinhong Liu committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    28c7d88 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Update parameter_sweep.py (watertap-org#1097)

    @avdudchenko
    avdudchenko authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    82c37b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Fix a warning in ED costing (watertap-org#1096) 

    * add rectifier cost to ed

* modify fs test to reflect changes

* correct capitcal cost

* correct capitcal cost

* Adapt testing

* redo ED costing profile

* format

* fix neglected tests

* costing itemization

* address failure in experimental macos

* fix a warning of implicit replacement of costing component

* delete commented codes

* delete commented codes

* Changed costing to safer implementaton

Avoids deleting capital cost and captial cost constraints, simply checks if rectfier costing exists.

* Fixed typo.

* Update test_electrodialysis_1D.py

* fix a costing err and update tests, update performance report of ED

---------

Co-authored-by: Keith Beattie <ksbeattie@lbl.gov>
Co-authored-by: avdudchenko <33663878+avdudchenko@users.noreply.github.com>
    @lbibl @ksbeattie @avdudchenko
    3 people authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    7dcff56 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Allow passing build_outputs=None to parameter sweep (watertap-org#1099)

    @shelman
    shelman authored Aug 8, 2023
    Configuration menu
    Copy the full SHA
    e2ae67e View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge pull request watertap-org#7 from lxhowl/issue929

    @bknueven
    bknueven authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1b8b04b View commit details
    Browse the repository at this point in the history

  2. cleanup nf_with_bypass_ui

    @bknueven
    bknueven committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ddde7f7 View commit details
    Browse the repository at this point in the history

  3. skip nf_with_bypass_ui test on macOS

    @bknueven
    bknueven committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f86506d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into issue929

    @bknueven
    bknueven committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    3d90146 View commit details
    Browse the repository at this point in the history