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

Initial ElectroNP flowsheet #1032

Merged
merged 43 commits into from
Jun 13, 2023
Merged

Initial ElectroNP flowsheet #1032

merged 43 commits into from
Jun 13, 2023

Commits on Mar 16, 2023

  1. add

    @luohezhiming
    luohezhiming committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    7d35890 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4766c52 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    ef81bae View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    168bbaf View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

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

Commits on Mar 31, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    44a22e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    1c1a135 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    401f997 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. delete redundant files

    @luohezhiming
    luohezhiming committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    258f6fe View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    2c994c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    5b6baed View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    0afa551 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    479fb6d View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 9, 2023
    Configuration menu
    Copy the full SHA
    b393ed0 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 12, 2023
    Configuration menu
    Copy the full SHA
    708ad0a View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Add initial electroNP flowsheet

    @luohezhiming
    luohezhiming committed May 17, 2023
    Configuration menu
    Copy the full SHA
    7a2dde3 View commit details
    Browse the repository at this point in the history

  2. revise factors

    @luohezhiming
    luohezhiming committed May 17, 2023
    Configuration menu
    Copy the full SHA
    0d5a752 View commit details
    Browse the repository at this point in the history

  3. revise marks

    @luohezhiming
    luohezhiming committed May 17, 2023
    Configuration menu
    Copy the full SHA
    9f3f8bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 17, 2023
    Configuration menu
    Copy the full SHA
    5a69761 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into electroNP_flowsheet

    @luohezhiming
    luohezhiming committed May 17, 2023
    Configuration menu
    Copy the full SHA
    e41e933 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. adjust scaling

    @luohezhiming
    luohezhiming committed May 18, 2023
    Configuration menu
    Copy the full SHA
    8710cc2 View commit details
    Browse the repository at this point in the history

  2. add costing

    @luohezhiming
    luohezhiming committed May 18, 2023
    Configuration menu
    Copy the full SHA
    72705f2 View commit details
    Browse the repository at this point in the history

  3. adjust scaling

    @luohezhiming
    luohezhiming committed May 18, 2023
    Configuration menu
    Copy the full SHA
    6b0a72e View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. add costing method

    @luohezhiming
    luohezhiming committed May 19, 2023
    Configuration menu
    Copy the full SHA
    05fc7af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 19, 2023
    Configuration menu
    Copy the full SHA
    112415a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into electroNP_flowsheet

    @luohezhiming
    luohezhiming committed May 19, 2023
    Configuration menu
    Copy the full SHA
    82363bb View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 25, 2023
    Configuration menu
    Copy the full SHA
    93737c0 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 26, 2023
    Configuration menu
    Copy the full SHA
    3162e34 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed May 29, 2023
    Configuration menu
    Copy the full SHA
    637b32d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into electroNP_flowsheet

    @luohezhiming
    luohezhiming committed May 29, 2023
    Configuration menu
    Copy the full SHA
    c85a4ea View commit details
    Browse the repository at this point in the history

  3. add costing for electroNP

    @luohezhiming
    luohezhiming committed May 29, 2023
    Configuration menu
    Copy the full SHA
    e4c6d7c View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    ea4e066 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. revise errors

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

  2. adjust scaling

    @luohezhiming
    luohezhiming committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    2e96a12 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    84a2900 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into electroNP_flowsheet

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

Commits on Jun 8, 2023

  1. djusting scaling parameters

    @luohezhiming
    luohezhiming committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    fae71bf View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. revise flowsheet

    @luohezhiming
    luohezhiming committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7187ee7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/watertap-org/watertap

    @luohezhiming
    luohezhiming committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    17bc5e3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into electroNP_flowsheet

    @luohezhiming
    luohezhiming committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    8e484bc View commit details
    Browse the repository at this point in the history

  4. Revise test

    @luohezhiming
    luohezhiming committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    2f5498c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. remove automate_rescale_variables as it is unused

    @adam-a-a
    adam-a-a committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    6ee6f01 View commit details
    Browse the repository at this point in the history

  2. add assert_optimal_termination and remove bound push args even tho se… 

    …t to default val of 1e-2
    @adam-a-a
    adam-a-a committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    063e52d View commit details
    Browse the repository at this point in the history