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

1D Membrane Model for CO2 Capture and Utilization #1378

Merged
merged 43 commits into from
Nov 27, 2024
Merged

1D Membrane Model for CO2 Capture and Utilization #1378

merged 43 commits into from
Nov 27, 2024

Commits on Mar 18, 2024

  1. Add CCUS file structure

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    2affa77 View commit details
    Browse the repository at this point in the history

  2. One-dimensional membrane model

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    b0a336a View commit details
    Browse the repository at this point in the history

  3. add the unit test file

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    775b27a View commit details
    Browse the repository at this point in the history

  4. reformatted by black

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    dd437b7 View commit details
    Browse the repository at this point in the history

  5. reformat using black

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    693fd68 View commit details
    Browse the repository at this point in the history

  6. fixed the path issue in testing

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    5505b1f View commit details
    Browse the repository at this point in the history

  7. added the missing heading

    @Morgan88888888
    Morgan88888888 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    f91e825 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. refined the workspace name

    @Morgan88888888
    Morgan88888888 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    446951b View commit details
    Browse the repository at this point in the history

  2. formatting issue resolved for GitHub test

    @Morgan88888888
    Morgan88888888 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    db77a65 View commit details
    Browse the repository at this point in the history

  3. fixed typo

    @Morgan88888888
    Morgan88888888 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    508f10c View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. fixed the unit model importing issue

    @Morgan88888888
    Morgan88888888 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d31a4cb View commit details
    Browse the repository at this point in the history

  2. fixed linter warnings

    @Morgan88888888
    Morgan88888888 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    e228592 View commit details
    Browse the repository at this point in the history

  3. resolved the comments

    @Morgan88888888
    Morgan88888888 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    feda25c View commit details
    Browse the repository at this point in the history

  4. fix linter issues

    @Morgan88888888
    Morgan88888888 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    054808f View commit details
    Browse the repository at this point in the history

  5. formated

    @Morgan88888888
    Morgan88888888 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f6dc03b View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'IDAES:main' into co2_membrane

    @Morgan88888888
    Morgan88888888 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    a6c9697 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. remove the unit level property config

    @Morgan88888888
    Morgan88888888 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    14d3856 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. save changes

    @Morgan88888888
    Morgan88888888 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    e8bc928 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge branch 'IDAES:main' into co2_membrane

    @Morgan88888888
    Morgan88888888 authored May 28, 2024
    Configuration menu
    Copy the full SHA
    3d8e068 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge branch 'IDAES:main' into co2_membrane

    @Morgan88888888
    Morgan88888888 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    81c3fa3 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge branch 'IDAES:main' into co2_membrane

    @Morgan88888888
    Morgan88888888 authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    35a8ee4 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge branch 'co2_membrane' of https://github.com/Morgan88888888/idae… 

    …s-pse into co2_membrane
    @Morgan88888888
    Morgan88888888 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    53a17b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'IDAES:main' into co2_membrane

    @Morgan88888888
    Morgan88888888 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    97abbe7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'co2_membrane' of https://github.com/Morgan88888888/idae… 

    …s-pse into co2_membrane
    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    b795061 View commit details
    Browse the repository at this point in the history

  3. added test for different configs and added stream table display

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    e721692 View commit details
    Browse the repository at this point in the history

  4. added more docs to explain the models and settings

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    2cd61a4 View commit details
    Browse the repository at this point in the history

  5. Addressed the comments to support different property packages

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    3e3dda8 View commit details
    Browse the repository at this point in the history

  6. add linebreak

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    278345b View commit details
    Browse the repository at this point in the history

  7. corrected copyright info

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    c30f6f9 View commit details
    Browse the repository at this point in the history

  8. reformatted file to pass test

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    0b8a57d View commit details
    Browse the repository at this point in the history

  9. fixed copyright info

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    d826433 View commit details
    Browse the repository at this point in the history

  10. added material conservation test

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    093de8e View commit details
    Browse the repository at this point in the history

  11. reformatted

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    448394f View commit details
    Browse the repository at this point in the history

  12. address comments

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    d6a977c View commit details
    Browse the repository at this point in the history

  13. added basic documentation

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    75cfb24 View commit details
    Browse the repository at this point in the history

  14. fix pylint test

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    c6d3677 View commit details
    Browse the repository at this point in the history

  15. fix doc strings

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    83529cf View commit details
    Browse the repository at this point in the history

  16. fix the doc string

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    80befee View commit details
    Browse the repository at this point in the history

  17. added what the inputs/degrees of freedom

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    6f3f8a6 View commit details
    Browse the repository at this point in the history

  18. fix pytest

    @Morgan88888888
    Morgan88888888 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    93038d4 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Merge branch 'main' into co2_membrane

    @ksbeattie
    ksbeattie authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d44f95e View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Merge branch 'main' into co2_membrane

    @ksbeattie
    ksbeattie authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    410c036 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2024

  1. Merge branch 'main' into co2_membrane

    @lbianchi-lbl
    lbianchi-lbl authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    b1051bf View commit details
    Browse the repository at this point in the history