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

Add GUI for RO flowsheet #1159

Merged
merged 67 commits into from
Oct 26, 2023
Merged

Add GUI for RO flowsheet #1159

merged 67 commits into from
Oct 26, 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. 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

Commits on May 19, 2023

  1. 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

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

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. 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

Commits on Jun 12, 2023

  1. 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

Commits on Jun 13, 2023

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

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

Commits on Jun 14, 2023

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

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

Commits on Jun 20, 2023

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

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

Commits on Jun 22, 2023

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

    @luohezhiming
    luohezhiming committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    0754d21 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 22, 2023
    Configuration menu
    Copy the full SHA
    9dcece1 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

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

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

Commits on Jul 5, 2023

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

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

Commits on Jul 7, 2023

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

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

Commits on Jul 11, 2023

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

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

Commits on Jul 12, 2023

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

    @luohezhiming
    luohezhiming committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    35ecf79 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

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

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

Commits on Jul 19, 2023

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

    @luohezhiming
    luohezhiming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    40b4de5 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

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

    @luohezhiming
    luohezhiming committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    72f6f25 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

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

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

Commits on Aug 7, 2023

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

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

Commits on Aug 9, 2023

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

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

Commits on Aug 19, 2023

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

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

Commits on Aug 23, 2023

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

    @luohezhiming
    luohezhiming committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    acfd9f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

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

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

Commits on Aug 25, 2023

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

    @luohezhiming
    luohezhiming committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    2fc2425 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

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

    @luohezhiming
    luohezhiming committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    581dec0 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

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

    @luohezhiming
    luohezhiming committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    3202970 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

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

    @luohezhiming
    luohezhiming committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    625e610 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. add ro gui

    @luohezhiming
    luohezhiming committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    1c69484 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. reivse conc output

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

  2. revision

    @luohezhiming
    luohezhiming committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    2123a3d View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. WIP

    @luohezhiming
    luohezhiming committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    36c8065 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 Oct 2, 2023
    Configuration menu
    Copy the full SHA
    2a37aca View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into RO_gui

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

  4. add GUI for RO

    @luohezhiming
    luohezhiming committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    2975a1e View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Revise export variables

    @luohezhiming
    luohezhiming committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    efa6fd1 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 Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1fa9316 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into RO_gui

    @luohezhiming
    luohezhiming committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    0a04f6f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. code linting

    @luohezhiming
    luohezhiming committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    f392ce8 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

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

    @luohezhiming
    luohezhiming committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    74811ea 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 Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a89268c View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

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

    @luohezhiming
    luohezhiming committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    09cf01e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

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

    @luohezhiming
    luohezhiming committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    4070fa1 View commit details
    Browse the repository at this point in the history

  2. Rename GUI files so that sweep functionality works

    @MarcusHolly
    MarcusHolly committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    52a0ee3 View commit details
    Browse the repository at this point in the history

  3. Update setup file with new name

    @MarcusHolly
    MarcusHolly committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    d1890b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

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

    @luohezhiming
    luohezhiming committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    0d6fe1a View commit details
    Browse the repository at this point in the history

  2. update figure

    @luohezhiming
    luohezhiming committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    ee7710a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into RO_gui

    @luohezhiming
    luohezhiming committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    39851da View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge branch 'main' into RO_gui

    @ksbeattie
    ksbeattie authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    34ea1af View commit details
    Browse the repository at this point in the history