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 Dye Desal Flowsheet Parameters #1528

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

Update Dye Desal Flowsheet Parameters #1528

wants to merge 35 commits into from
+154 −96

Commits on Sep 3, 2024

  1. Correct costing in dye desalination flowsheet

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

  2. Remove negative signs from costs in the results display

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

Commits on Sep 4, 2024

  1. Address Adam's comment and a few minor issues

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

  2. Address failure

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

  3. Merge branch 'main' into dye_desal_update

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

Commits on Sep 10, 2024

  1. Correct typo in nanofiltration ZO costing

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

  2. Minor changes to parameter values

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

  3. Merge branch 'main' into dye_desal_update

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

Commits on Sep 11, 2024

  1. Update dye desal sweep

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

Commits on Sep 20, 2024

  1. Update dye desal tests

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

  2. Merge branch 'main' into dye_desal_update

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

  3. Remove visualization from dye sweep

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

Commits on Sep 22, 2024

  1. Update NF ZO test

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

Commits on Sep 23, 2024

  1. Address pylint issue

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

  2. Have GAC use regular dye disposal cost

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

  3. Update test based on last commit

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

Commits on Sep 24, 2024

  1. Add config options for dye revenue and brine revenue

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

Commits on Sep 25, 2024

  1. Comment out print statements

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

  2. Update dye desal sweep

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

Commits on Sep 26, 2024

  1. Update how LCOT_no_revenue is calculated

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

Commits on Oct 4, 2024

  1. Clean up flowsheet

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

  2. Merge branch 'main' into dye_desal_update

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

Commits on Oct 11, 2024

  1. Merge branch 'main' into dye_desal_update

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

Commits on Oct 25, 2024

  1. Merge branch 'main' into dye_desal_update

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

  2. Update capital recovery factor for RO_costing

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

  3. Add scaling factors for costing variables

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

Commits on Oct 31, 2024

  1. Remove badly scaled var list from flowsheet

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

  2. Merge branch 'main' into dye_desal_update

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

Commits on Nov 13, 2024

  1. Merge branch 'main' into dye_desal_update

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

Commits on Nov 15, 2024

  1. Update rHGO NF parameter values

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

  2. Change cost units from USD_2020 to USD_2023

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

Commits on Nov 18, 2024

  1. Add calculations for dye removal and adsorption capacity into flowsheet

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

Commits on Nov 19, 2024

  1. Update testing

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

Commits on Nov 20, 2024

  1. Update nanofiltration ZO tests

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

Commits on Nov 25, 2024

  1. Address merge conflicts

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