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 Anoxic CSTR Costing #1186

Merged
merged 32 commits into from
Dec 5, 2023
Merged

BSM2 Anoxic CSTR Costing #1186

merged 32 commits into from
Dec 5, 2023

Commits on Nov 7, 2023

  1. Add anoxic cstr costing

    @MarcusHolly
    MarcusHolly committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    1245716 View commit details
    Browse the repository at this point in the history

  2. Add costing to BSM2 flowsheet

    @MarcusHolly
    MarcusHolly committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    4fe4d9a View commit details
    Browse the repository at this point in the history

  3. Fix pylint issue

    @MarcusHolly
    MarcusHolly committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a21cb8e View commit details
    Browse the repository at this point in the history

  4. Add electricity intensity to system-level metrics in flowsheet

    @MarcusHolly
    MarcusHolly committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    94ec318 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Merge branch 'main' into anoxic_tank_cost

    @MarcusHolly
    MarcusHolly committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    e7a9539 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Add CSTR unit model based on IDAES CSTR

    @MarcusHolly
    MarcusHolly committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    6658fa9 View commit details
    Browse the repository at this point in the history

  2. Update CSTR costing method

    @MarcusHolly
    MarcusHolly committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    dbb3211 View commit details
    Browse the repository at this point in the history

  3. Use new CSTR model in BSM2 flowsheet

    @MarcusHolly
    MarcusHolly committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    e1477bf View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Add tests for CSTR unit model

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

  2. Ignore mixer costs in BSM2 flowsheet for now

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

  3. Merge branch 'main' into anoxic_tank_cost

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

  4. Remove unused imports

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

  5. Address pylint issue

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

  6. Add default costing method for cstr

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

  7. Add LCOW into cost testing

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

  8. Update init file

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

  9. Remove duplicate import

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

  10. Change HRT to a Var and add an HRT constraint in unit model

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

  11. Update costing test to use BSM2 flowsheet conditions

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

  12. Revert HRT back to a mutable parameter

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

  13. Treat HRT as a variable and modify costing appropriately

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

  14. Use cost_by_flow_volume utility function

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

Commits on Nov 21, 2023

  1. Revert changes made to BSM2 flowsheet

    @MarcusHolly
    MarcusHolly committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    390eb5a View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge branch 'main' into anoxic_tank_cost

    @adam-a-a
    adam-a-a authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    9e2b42b View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Address Adam's comments

    @MarcusHolly
    MarcusHolly committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    55c4503 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'anoxic_tank_cost' of https://github.com/MarcusHolly/wat… 

    …ertap into anoxic_tank_cost
    @MarcusHolly
    MarcusHolly committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    fb2a438 View commit details
    Browse the repository at this point in the history

  3. Update class name/import

    @MarcusHolly
    MarcusHolly committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b9d2c71 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Address merge conflict

    @MarcusHolly
    MarcusHolly committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    5babe49 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Make units explicit in unit costing test

    @MarcusHolly
    MarcusHolly committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    fc56ef6 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Add check asserting units are consistent

    @MarcusHolly
    MarcusHolly committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    d49433b View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch 'main' into anoxic_tank_cost

    @MarcusHolly
    MarcusHolly authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c06f4a5 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'main' into anoxic_tank_cost

    @adam-a-a
    adam-a-a authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    e92f616 View commit details
    Browse the repository at this point in the history