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

Update idaes-pse requirement in preparation to 2.1 release #1034

Merged
merged 48 commits into from
Jun 30, 2023
Merged

Update idaes-pse requirement in preparation to 2.1 release #1034

merged 48 commits into from
Jun 30, 2023

Commits on May 30, 2023

  1. Try updating idaes-pse requirement to watertap-org/idaes-pse:main

    @lbianchi-lbl
    lbianchi-lbl committed May 30, 2023
    Configuration menu
    Copy the full SHA
    b56f0df View commit details
    Browse the repository at this point in the history

  2. Try pyomo from current Pyomo/pyomo:main

    @lbianchi-lbl
    lbianchi-lbl committed May 30, 2023
    Configuration menu
    Copy the full SHA
    f9dbbc9 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Use 2.1.0rc0 for IDAES requirement

    @lbianchi-lbl
    lbianchi-lbl committed May 31, 2023
    Configuration menu
    Copy the full SHA
    32dca48 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Try the combination IDAES 2.0, Pyomo 6.6.1

    @lbianchi-lbl
    lbianchi-lbl committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    ee84bc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. dummy commit fixing a typo

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

  2. dummy commit for demonstration

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

  3. fixing unit and prop test

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

  4. running black

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

  5. Update setup.py 

    Co-authored-by: Ludovico Bianchi <[email protected]>
    @agarciadiego @lbianchi-lbl
    agarciadiego and lbianchi-lbl authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    c062d94 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. property intialize error

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    be32768 View commit details
    Browse the repository at this point in the history

  2. amo 1690 add initialize

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a42a8a4 View commit details
    Browse the repository at this point in the history

  3. scaling asm2d

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    230a283 View commit details
    Browse the repository at this point in the history

  4. scaling for linux

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    3eaa200 View commit details
    Browse the repository at this point in the history

  5. turning off tee

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    cf8424e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into idaes-2.1

    @agarciadiego
    agarciadiego authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    688efe6 View commit details
    Browse the repository at this point in the history

  7. electronP scaling

    @agarciadiego
    agarciadiego committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    bd91cdd View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. asm2d scaling

    @agarciadiego
    agarciadiego committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    9a2c8f3 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. changing units of aggragate

    @agarciadiego
    agarciadiego committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ca25f95 View commit details
    Browse the repository at this point in the history

  2. run black

    @agarciadiego
    agarciadiego committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1e27615 View commit details
    Browse the repository at this point in the history

  3. lssro units

    @agarciadiego
    agarciadiego committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1f64525 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. electronP deactivating constraints

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

  2. electronP deactivating constraints

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

  3. electronP check

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

  4. for loop

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

  5. new set

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

  6. asm2d

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

  7. asm2d rescale

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

  8. solution 2

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

  9. rescaling testing linux

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

  10. rescaling equation

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

  11. reversing

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

  12. asm2d model solve

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

Commits on Jun 21, 2023

  1. Add nbconvert as a testing requirement

    @lbianchi-lbl
    lbianchi-lbl committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    b5d096e View commit details
    Browse the repository at this point in the history

  2. mac test skip

    @agarciadiego
    agarciadiego committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    9e9490c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'idaes-2.1' of https://github.com/lbianchi-lbl/watertap … 

    …into idaes-2.1
    @agarciadiego
    agarciadiego committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    3463dd1 View commit details
    Browse the repository at this point in the history

  4. running black

    @agarciadiego
    agarciadiego committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    1f08db8 View commit details
    Browse the repository at this point in the history

  5. test skip

    @agarciadiego
    agarciadiego committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    81c309e View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    bafad62 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    c28f436 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2b925dc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    5d1aa7b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    7093184 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Add fix_initialization_states() for new NaCl_T_dep prop model

    @lbianchi-lbl
    lbianchi-lbl committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    35eaab4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    5c957d2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into idaes-2.1

    @lbianchi-lbl
    lbianchi-lbl authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7e3c9c8 View commit details
    Browse the repository at this point in the history

  4. Add ad-hoc temporary workaround for solver inconsistencies on WIndows

    @lbianchi-lbl
    lbianchi-lbl committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    528ff66 View commit details
    Browse the repository at this point in the history

  5. Remove notebook with failures on Windows

    @lbianchi-lbl
    lbianchi-lbl committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    bb67779 View commit details
    Browse the repository at this point in the history

  6. Update IDAES requirement to 2.1.0

    @lbianchi-lbl
    lbianchi-lbl committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    700b024 View commit details
    Browse the repository at this point in the history