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

BSM2-P Effluent Metrics w/ Flowsheet Constraints #1503

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

BSM2-P Effluent Metrics w/ Flowsheet Constraints #1503

wants to merge 60 commits into from

Commits on Sep 12, 2024

  1. Add effluent metrics to prop pack

    @MarcusHolly
    MarcusHolly committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    0ed0d42 View commit details
    Browse the repository at this point in the history

  2. Add preliminary effluent violations to the BSM2-P flowsheet

    @MarcusHolly
    MarcusHolly committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9541a6a View commit details
    Browse the repository at this point in the history

  3. Revert TSS change

    @MarcusHolly
    MarcusHolly committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    07ea01a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Make BOD5_factor a parameter

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    56b5145 View commit details
    Browse the repository at this point in the history

  2. Update BSM2 GUI images

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    e2ac3b0 View commit details
    Browse the repository at this point in the history

  3. Define effluent metrics as expressions (as done in ASM1) rather than … 

    …constraints
    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    4d05c61 View commit details
    Browse the repository at this point in the history

  4. Initial attempt at adding optimization to BSM2-P

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    a09c691 View commit details
    Browse the repository at this point in the history

  5. Disable phosphorus effluent violation

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    a19f1c6 View commit details
    Browse the repository at this point in the history

  6. Solves to Acceptable Level

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    26df31e View commit details
    Browse the repository at this point in the history

  7. Update unit model tests

    @MarcusHolly
    MarcusHolly committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ef4f5e6 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Touch effluent metrics before scaling

    @MarcusHolly
    MarcusHolly committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c2ee4ac View commit details
    Browse the repository at this point in the history

  2. minor updates

    @MarcusHolly
    MarcusHolly committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    ec483ba View commit details
    Browse the repository at this point in the history

  3. Modify tear guess

    @MarcusHolly
    MarcusHolly committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    dc28584 View commit details
    Browse the repository at this point in the history

  4. Remove optimization functions

    @MarcusHolly
    MarcusHolly committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    520d01a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Revert changes to BSM2

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    229bcc8 View commit details
    Browse the repository at this point in the history

  2. Clean up files

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    3b12b77 View commit details
    Browse the repository at this point in the history

  3. Add scaling for metrics

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    b3fcf2e View commit details
    Browse the repository at this point in the history

  4. Add scaling factors for effluent metrics

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    08473d6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into bsm2_P_metrics

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    63408ac View commit details
    Browse the repository at this point in the history

  6. Touch SNOX property

    @MarcusHolly
    MarcusHolly committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9d30168 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Add SNOX to custom properties

    @MarcusHolly
    MarcusHolly committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0390d43 View commit details
    Browse the repository at this point in the history

  2. Try reverting some changes

    @MarcusHolly
    MarcusHolly committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e3b6f8b View commit details
    Browse the repository at this point in the history

  3. Re-add scaling

    @MarcusHolly
    MarcusHolly committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6877407 View commit details
    Browse the repository at this point in the history

  4. Re-add SNOX

    @MarcusHolly
    MarcusHolly committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    4354d5a View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Effluent properties don't need to be touched anymore

    @MarcusHolly
    MarcusHolly committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a2f512a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Add effluent metrics to BSM2-P documentation

    @MarcusHolly
    MarcusHolly committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    043a544 View commit details
    Browse the repository at this point in the history

  2. Tune effluent metric scaling factors for the bio_P=True case

    @MarcusHolly
    MarcusHolly committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6c450b4 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Try removing all scaling factors for effluent concentrations

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4282759 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into myfork-watertap-bsm2_P_metrics

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    d61ffc9 View commit details
    Browse the repository at this point in the history

  3. Minor adjustments to AD scaling factors

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    845cead View commit details
    Browse the repository at this point in the history

  4. Try more AD scaling changes

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    6e215d0 View commit details
    Browse the repository at this point in the history

  5. Revert AD scaling changes

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c957bb6 View commit details
    Browse the repository at this point in the history

  6. Another attempt at modifying AD scaling

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    bb7db6e View commit details
    Browse the repository at this point in the history

  7. Resolve remaining test failures

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    fc505ad View commit details
    Browse the repository at this point in the history

  8. Clean up modified asm2d thermo test

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    daaefa9 View commit details
    Browse the repository at this point in the history

  9. Address pylint issue

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    f6a7cb6 View commit details
    Browse the repository at this point in the history

  10. Initial implementation for effluent constraints

    @MarcusHolly
    MarcusHolly committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    399ba95 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Address merge conflicts

    @MarcusHolly
    MarcusHolly committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    65f20fb View commit details
    Browse the repository at this point in the history

  2. Fix pylint issue

    @MarcusHolly
    MarcusHolly committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    f8c5366 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Bio_P=True solving to acceptable level

    @MarcusHolly
    MarcusHolly committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    410b6b7 View commit details
    Browse the repository at this point in the history

  2. Clean up BSM2-P flowsheet

    @MarcusHolly
    MarcusHolly committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    aab4dcc View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Update BSM2-P test

    @MarcusHolly
    MarcusHolly committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    69d48d4 View commit details
    Browse the repository at this point in the history

  2. Add config option for enabling effluent constraints

    @MarcusHolly
    MarcusHolly committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2c06edc View commit details
    Browse the repository at this point in the history

  3. Try applying new IDAES constraint scaling to bio_P=False

    @MarcusHolly
    MarcusHolly committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    748f619 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. temporarily point to IDAES main to access autoscaling tools

    @adam-a-a
    adam-a-a committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    473ca0a View commit details
    Browse the repository at this point in the history

  2. Revert changes to BSM2

    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f1d3257 View commit details
    Browse the repository at this point in the history

  3. Re-add tests for BSM2-P optimization

    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    4e1e83f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bsm2_P_metrics_constraints' of https://github.com/Marcu… 

    …sHolly/watertap into bsm2_P_metrics_constraints
    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    fdea237 View commit details
    Browse the repository at this point in the history

  5. Add ScalerBase import to testing

    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6de5d3c View commit details
    Browse the repository at this point in the history

  6. update idaes-pse dependency to tag with autoscaling

    @adam-a-a
    adam-a-a committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    4484a59 View commit details
    Browse the repository at this point in the history

  7. try dependency on tag again

    @adam-a-a
    adam-a-a committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ed8d42c View commit details
    Browse the repository at this point in the history

  8. Minor flowsheet cleanup

    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    fdf252b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'bsm2_P_metrics_constraints' of https://github.com/Marcu… 

    …sHolly/watertap into bsm2_P_metrics_constraints
    @MarcusHolly
    MarcusHolly committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    54182d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge branch 'main' into bsm2_P_metrics_constraints

    @MarcusHolly
    MarcusHolly committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    c74c6d3 View commit details
    Browse the repository at this point in the history

  2. Address typo in thickener

    @MarcusHolly
    MarcusHolly committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d0745e3 View commit details
    Browse the repository at this point in the history

  3. Address typo in dewatering unit

    @MarcusHolly
    MarcusHolly committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    3268c23 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Test changes to BSM2-P flowsheet

    @MarcusHolly
    MarcusHolly committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d555946 View commit details
    Browse the repository at this point in the history

  2. Correct import in BSM2_P testing

    @MarcusHolly
    MarcusHolly committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    3fef663 View commit details
    Browse the repository at this point in the history

  3. Add try/except to AD initialization

    @MarcusHolly
    MarcusHolly committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    c114991 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. Test improvements made to bio_P = False configuration

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