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.

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

Merge updates in conventional wastewater configurations #103

Closed
wants to merge 393 commits into from
Closed
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 28, 2023

  1. Simplified Step 4 (ASM2d-ADM1)

    Simplified step 4 of ASM2d-ADM1 interface. Case II/III/IV, all need the same if else conditions.
    
    Also rectified an error message in Step 5(a).
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    cc178e3 View commit details
    Browse the repository at this point in the history
  2. Correct checks for modified ASM2d-ADM1

    X_S in ASM1 did not have N content, as it was taken care of by X_ND. However, in ASM2d X_S has non-zero N content, which we use as 'X_ND_asm1' in the code. Therefore, we no longer need the check (same with S_F). On the other hand N/P content in S_A now needs a check.
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    5ff4130 View commit details
    Browse the repository at this point in the history
  3. Added check for P content in SI (ASM2d-ADM1)

    Since in step 5(b) soluble inert P is assumed to be 0, a check needs to be put in place. Other changes made with regard to documentation.
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    5294702 View commit details
    Browse the repository at this point in the history
  4. Updated check on COD/TKN/TP balance

    Modified the function which checks simultaneous balance of nutrients. In ASM1-ADM1 only COD, and TKN were checked. Now the simultaneous balanced of COD, TKN, and TP would be verified.
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    ff16555 View commit details
    Browse the repository at this point in the history
  5. Checks for direct mapping of X_PAO, X_PHA, and X_PP

    Deployed checks for N and P content in PAO across ASM2d and ADM1, since PAO is mapped directly. Similar checks were not deemed necessary for PHA, and PP.
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    7c52573 View commit details
    Browse the repository at this point in the history
  6. Updated charge balance (ASM2d-ADM1)

    Updated charge balance to include inorganic phosphorous on the ADM1 side.
    RaiSaumitra committed May 28, 2023
    Configuration menu
    Copy the full SHA
    1eb91c8 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. ADM1-ASM2d interface

    Started modifying ADM1-ASM2d interface
    RaiSaumitra committed May 29, 2023
    Configuration menu
    Copy the full SHA
    4b61c19 View commit details
    Browse the repository at this point in the history
  2. Updated checks and step 1(a) (ADM1-ASM2d)

    Modified the function which checks simultaneous balance of nutrients. In ADM1-ASM1 only COD, and TKN were checked. Now the simultaneous balanced of COD, TKN, and TP would be verified.
    
    Also modified step 1(a) to update N balance
    RaiSaumitra committed May 29, 2023
    Configuration menu
    Copy the full SHA
    23fbb1c View commit details
    Browse the repository at this point in the history
  3. Step 2 ADM1-ASM2d now includes TP balance

    Changed step 2 to include P balance
    RaiSaumitra committed May 29, 2023
    Configuration menu
    Copy the full SHA
    b2fb6b0 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Step 1(a) and 1(b): ADM1-ASM2d interface

    Modified step 1(a) and 1(b) to include P balance.
    RaiSaumitra committed May 30, 2023
    Configuration menu
    Copy the full SHA
    638067a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Made changes in ADM1-ASM2d interface

    Made several changes for ADM1-ASM2d interface to accommodate COD, TN, and TP balance.
    RaiSaumitra committed May 31, 2023
    Configuration menu
    Copy the full SHA
    1ad0f24 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. ADM1-ASM2d interface completed

    Completed transitions and checks on ADM1-ASM2d interface.
    
    COD, TN, and TP balance holds.
    RaiSaumitra committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    67a8a40 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Modified charge balance (ADM1-ASM2d)

    Modified charge balance to accommodate ADM1 and ASM2d.
    RaiSaumitra committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    1fbe3f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Typo in design function of primary clarifier

    Corrected typo
    RaiSaumitra committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    9f0128d View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. Design of clarifier

    Design of Primary clarifier
    RaiSaumitra committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    c8af3e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ceb6317 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Secondary clarifier design function

    Added design function to secondary clarifier. For the same purpose, added new property 'height'.
    RaiSaumitra committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    80252f1 View commit details
    Browse the repository at this point in the history
  2. TEA default parameters (clarifier)

    Adding default F_BM and lifetime values for pump, and metals.
    RaiSaumitra committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    35eb24c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Design_pump added

    Added design_pump function for pumping of influents. Used it in the main design function.
    
    The edits may seem weird as they were made in another desktop and copied here.
    RaiSaumitra committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    6bac054 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Enhanced design of PC

    Added cost of pump, and pumping.
    RaiSaumitra committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    524f826 View commit details
    Browse the repository at this point in the history
  2. Adding mADM1toASM2d to junction

    Adding the new junction class mADM1toASM2d, which acts as an interface between modified ADM1 and ASM2d.
    
    A copy of this class exists in 'junction_copy'.
    RaiSaumitra committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    3d67e7e View commit details
    Browse the repository at this point in the history
  3. Adding ASM2dtomADM1 to junction

    Adding the new junction class ASM2dtomADM1, which acts as an interface between ASM2d and modified ADM1.
    
    A copy of this class exists in 'junction_copy'.
    RaiSaumitra committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    032cb40 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Spotted typos

    Corrected typos
    RaiSaumitra committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5ddce72 View commit details
    Browse the repository at this point in the history
  2. Updated design and cost (Clarifier)

    1. Updated design and cost functions of SC.
    
    2. Added user-defined parameters for fixed design variables such as upflow_velocity, cylinderical_depth.
    RaiSaumitra committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    094d478 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Design and cost function of thickener

    Updated design and cost function of thickener. Diameter is based on solid loading rate. Otherwise the design and cost is similar to that of clarifier.
    RaiSaumitra committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6c482ed View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Changed order of import statements

    Changed the order of import statements to use pump in clarifier.
    
    Co-Authored-By: Yalin <mailto.yalin.li@gmail.com>
    RaiSaumitra and yalinli2 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    9754338 View commit details
    Browse the repository at this point in the history
  2. Changed dependency of SanUnits

    Changed order of import statements to use pump in clarifier
    
    Co-Authored-By: Yalin <mailto.yalin.li@gmail.com>
    RaiSaumitra and yalinli2 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    8492d0d View commit details
    Browse the repository at this point in the history
  3. Updated design of secondary clarifier

    Fixed typo (cylinderical to cylindrical).
    
    Made changes in design_pump() function of secondary clarifier.
    RaiSaumitra committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    356abf8 View commit details
    Browse the repository at this point in the history
  4. Changed dependency among SanUnits

    Changed order of import statements to use pump in primary clarifier.
    RaiSaumitra committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    29552ba View commit details
    Browse the repository at this point in the history
  5. Design function of thickener

    Changed design_pump() function to allow use of pump (based on discussion with Yalin).
    
    Changed typo (cylinderical to cylindrical).
    RaiSaumitra committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    7063ea9 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Configuration menu
    Copy the full SHA
    f550667 View commit details
    Browse the repository at this point in the history
  2. fix pump inf setting in SecondaryClarifier

    Now the 'design_pump' function has a influent stream which is copied from self._mixed, and its properties are updated accordingly.
    
    (Adapted based on Yalin's change to Primary clarifier)
    RaiSaumitra committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b4dd959 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Design and cost of dewatering unit

    In progress
    RaiSaumitra committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e626f8d View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Configuration menu
    Copy the full SHA
    769ab53 View commit details
    Browse the repository at this point in the history
  2. To be checked later (self._mixed definition)

    Added the design and cost of screw conveyor to dewatering unit.
    
    Along with changes in the definition of self._mixed stream. Not sure about these changes, to be checked at a later date.
    RaiSaumitra committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    01066e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Correct deployment of pump

    Utility power consumption now included.
    
    Co-Authored-By: Yalin <mailto.yalin.li@gmail.com>
    RaiSaumitra and yalinli2 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    9229e3b View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Updated thickness of concrete wall

    Based on Brian's code
    RaiSaumitra committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    f3b7903 View commit details
    Browse the repository at this point in the history
  2. Updated pump setting in PC

    Primary clarifier has just one pump (of type 'sludge') that is used to pump the waste sludge out of the unit. Usually no pump is employed for the influent and gravity is relied upon.
    RaiSaumitra committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    b9e9534 View commit details
    Browse the repository at this point in the history
  3. Updated pump setting in secondary clarifier

    Secondary clarifier would have two sludge pumps for RAS and WAS respectively. No pump required for influent.
    RaiSaumitra committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    470d15e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    766dd36 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c5bfbb6 View commit details
    Browse the repository at this point in the history
  6. Set bare module factor for pumps

    In both Primary and Secondary clarifier.
    RaiSaumitra committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    159e689 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Added equipment (V notch weir)

    Added V notch to both PC and SC. Added scraper to SC as well.
    RaiSaumitra committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    5701c04 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5f79892 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    942d58e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6d6eaf8 View commit details
    Browse the repository at this point in the history
  5. Updated cost of mechanical thickener

    Allowing multiple thickener units, and added cost of equipment (scraper).
    RaiSaumitra committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4c4b9c4 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Updated number of clarifiers

    Updated number of clarifiers based on design flow which in turn is based on total flow
    RaiSaumitra committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    b58f78c View commit details
    Browse the repository at this point in the history
  2. # clarifiers (SC)

    Made changes related to number of clarifiers for secondary sedimentation too
    RaiSaumitra committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    956398b View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. # pumps updated in PC

    Cost of multiple pumps included based on number of clarifiers. The 'Q_mgd' argument in the WWTpump is changed.
    RaiSaumitra committed Aug 7, 2023
    1 Configuration menu
    Copy the full SHA
    c0c6f06 View commit details
    Browse the repository at this point in the history
  2. Changes in thickener

    Made changes related to number of pumps in thickener, also added weir in equipments, and changed the default design flow based on metroWWTP.
    RaiSaumitra committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    9818f4c View commit details
    Browse the repository at this point in the history
  3. BM factor for thickeners

    Set bare module factors for thickener and dewatering unit
    RaiSaumitra committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    7582a09 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5c8d327 View commit details
    Browse the repository at this point in the history
  5. 16 Configuration menu
    Copy the full SHA
    d3ab528 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    74e0e6e View commit details
    Browse the repository at this point in the history
  7. Updated name of DU

    Changed name of 'DewateringUnit' to 'Centrifuge'
    RaiSaumitra committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    1c84268 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Changed name of SanUnit

    RaiSaumitra committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    02afcf3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3558014 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Made necessary changes to centrifuge

    Changed pump settings and using exponent scaling for equipments in dewatering unit.
    RaiSaumitra committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    c980302 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Changed pump settings in SC and undo some changes made by Yalin

    1. Changed WWTpump settings in secondary clarifier based on Joy's suggestion.
    
    2. Undo changes made by Yalin w.r.t. uf, of. uf is underflow (sludge), and of is overflow (treated effluent).
    RaiSaumitra committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    ec73111 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Added functions for estimation of aeration energy

    Added functions to calculate oxygen demand for heterotrophs, autotrophs, and required airflow.
    RaiSaumitra committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    bf555fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfd299f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Updated calculation of O2 demand

    Added TKN as the correct parameter while calculating oxygen demand in autotrophs
    RaiSaumitra committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    1c00564 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Added required power for blower

    Added function to calculate required power for aeration.
    RaiSaumitra committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    f343d36 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Added references to functions

    Added references
    RaiSaumitra committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    0e7253d View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. remove redundancy

    joyxyz1994 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    992e8fe View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Updated Primary Clarifier

    In process of changing primary clarifier
    RaiSaumitra committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    222971c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    29bf299 View commit details
    Browse the repository at this point in the history
  3. Update wwt_design.py

    joyxyz1994 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    9c4270d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e5791a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Configuration menu
    Copy the full SHA
    02db58b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. No change

    RaiSaumitra committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    91a042f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca1f607 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Added 'PrimaryClarifierBSM2'

    'PrimaryClarifierBSM2' is the design of primary clarifier based on BSM2.
    
    While 'PrimaryClarifier' is the PC design we use in our centralized WRRFs.
    RaiSaumitra committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    712544f View commit details
    Browse the repository at this point in the history
  2. Updated check in PC

    The lower limit of check on center feed depth has been modified to 10% based on advised range of upflow velocity
    RaiSaumitra committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    59f62c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Updated clarifier design and cost estimates

    Made several changes to secondary clarifier design, and added checks on calculated parameters based on MOP 8.
    
    Replicated few minor changes to PC as well.
    RaiSaumitra committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    4ec5df0 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Updated SC design

    Updates in design of SC:
    
    Area of clarifier either given by the user, or calculated from user defined influent TSS, influent flow, and SLR.
    
    A SLR is calculated based on simulation conditions, and the deviation is checked with design_SLR given by user.
    RaiSaumitra committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    ae1f913 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. Added concrete slab to clarifiers

    Include the design and cost of concrete slab in both clarifiers. In secondary clarifier, the slab forms the bottom of the tank. In primary clarifier, the slab forms the conical portion of the tank.
    RaiSaumitra committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ad1af10 View commit details
    Browse the repository at this point in the history
  2. Updated thickener (MOP-8)

    Updated design of gravity thickener (based on MOP 8)
    
    Have made several changes accordingly. Primarily, the diameter of the tank is limited to 22 m, and a design SLR is used to determine the surface area. The surface area governs the diameter.
    
    Changes in incinerator are commented for now.
    RaiSaumitra committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2126e58 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. Configuration menu
    Copy the full SHA
    7b4afd0 View commit details
    Browse the repository at this point in the history
  2. remove not useful file

    yalinli2 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    c3cc0be View commit details
    Browse the repository at this point in the history
  3. fix bugs

    yalinli2 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    cb8a746 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8235506 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2023

  1. Configuration menu
    Copy the full SHA
    5e51dc6 View commit details
    Browse the repository at this point in the history
  2. fix typo

    yalinli2 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    ba98dc7 View commit details
    Browse the repository at this point in the history
  3. fix typo

    yalinli2 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    729da06 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Added citation for PC_BSM2

    Added bare module factor for slab concrete. Also added specific citation for primary clarifier.
    RaiSaumitra committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a6c7a24 View commit details
    Browse the repository at this point in the history
  2. Updated thickener based on MOP-8

    Updated thickener based on MOP-8.
    RaiSaumitra committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    3b0d097 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b8fbe17 View commit details
    Browse the repository at this point in the history
  4. blank comment

    blank comment
    RaiSaumitra committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    8415ce0 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. fix typos

    yalinli2 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    ed22bcf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    38b82a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Configuration menu
    Copy the full SHA
    7695a1e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Added BM factors to centrifuge

    Added missing bare module factors to centrifuge.
    RaiSaumitra committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    88dd407 View commit details
    Browse the repository at this point in the history
  2. Design and cost of centrifuge

    Update design, cost, and default design parameters for centrifuge.
    RaiSaumitra committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    08b4ae1 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Design and cost of tanks

    Started adding design components for aeration tank.
    RaiSaumitra committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    d57a78d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Design and cost of ASP

    A dummy unit to account for the design and cost of treatment chain in ASP.
    RaiSaumitra committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    787a4a5 View commit details
    Browse the repository at this point in the history
  2. Added blower and pipe design

    Assumed design Q_air (in m3/hr) for individual treatment chain as a user input.
    RaiSaumitra committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    f699ac5 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Included pump design to treatment chain

    Added a design recirculation flow, and a 'design_pump' function to facilitate the working of pump in treatment chain.
    RaiSaumitra committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    b132edd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4731a1c View commit details
    Browse the repository at this point in the history
  3. Minor adjustments in treatment chain

    Minor adjustments with documentation and debugging, made while integrating the unit with a centralized WRRF.
    RaiSaumitra committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    042dfe1 View commit details
    Browse the repository at this point in the history
  4. Debugging changes

    Edits during debugging
    RaiSaumitra committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    7f4dee0 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Configuration menu
    Copy the full SHA
    363c452 View commit details
    Browse the repository at this point in the history
  2. Minor edit

    RaiSaumitra committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    a2ca350 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Configuration menu
    Copy the full SHA
    42507c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a439ce View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. very minor typo fix

    yalinli2 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    4a59887 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Configuration menu
    Copy the full SHA
    7764343 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    349bcec View commit details
    Browse the repository at this point in the history
  2. Revert "Merge branch 'main' of https://github.com/QSD-Group/QSDsan in…

    …to metro"
    
    This reverts commit 42507c8, reversing
    changes made to a2ca350.
    RaiSaumitra committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    105eb63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    15a61f9 View commit details
    Browse the repository at this point in the history
  4. Revert "Revert "Merge branch 'main' of https://github.com/QSD-Group/Q…

    …SDsan into metro""
    
    This reverts commit 105eb63.
    RaiSaumitra committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    6e329a1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cccb4eb View commit details
    Browse the repository at this point in the history
  6. debug CSTR design

    joyxyz1994 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    a88287e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    29eff84 View commit details
    Browse the repository at this point in the history
  8. debug thickener

    joyxyz1994 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    82832fd View commit details
    Browse the repository at this point in the history
  9. Update _clarifier.py

    joyxyz1994 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    52cb8c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Discarding scraper

    Discarding scraper capital cost because not sure whether the base flow is flow of sludge or effluent.
    
    Discarding scraper power because the scaling exponent is not correct.
    RaiSaumitra committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c948da4 View commit details
    Browse the repository at this point in the history
  2. Removed scraper, edited capital of centrifuge

    Removed scraper from thickener.
    
    Changed design of centrifuge since it is an equipment.
    RaiSaumitra committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    5479df5 View commit details
    Browse the repository at this point in the history
  3. Scaling centrifuge motor power

    scaling the motor power in the centrifuge linearly w.r.t influent mass flowrate.
    RaiSaumitra committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c2d5da0 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Coded function to compile pumping power demand in WRRF

    New function to retrieve the pumping costs and other motor costs of all units involve in sludge management is coded.
    RaiSaumitra committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    6ee1c36 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Scaling motor power linearly

    Scaling the power of motor deployed in centrifuge linearly with respect to mass flowrate.
    RaiSaumitra committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    093ed31 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Change in default total static head

    Changing H_ts based on Jeremy's recommendation.
    RaiSaumitra committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    b2498bd View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Corrected logic flow, and modified ANSI dictionary

    Made changes to select_pipe function to make sure that the selected inner diameter from ANSI is actually less than the calculated maximum diameter.
    RaiSaumitra committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    90f3585 View commit details
    Browse the repository at this point in the history
  2. Update documentation (select_pipe)

    Changed documentation of select-pipe
    RaiSaumitra committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    fe70818 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Added thermo to wastestream

    Added thermo argument to waste stream to debug an error related to ASM1-ADM1 interface.
    RaiSaumitra committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    61de934 View commit details
    Browse the repository at this point in the history
  2. Added thermo to pump

    to debug error related to using interfaces
    RaiSaumitra committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    9ffb606 View commit details
    Browse the repository at this point in the history
  3. Changing default value

    Changing default head from 1 foot to 5 foot.
    RaiSaumitra committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    9a6977e View commit details
    Browse the repository at this point in the history
  4. Added authorship

    For creating treatment train SanUnit
    RaiSaumitra committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    e11e3f6 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Added thermo to pumps in thickeners

    Added thermo to pump in thickener and centrifuge to debug an error related to use of ASM-ADM interface.
    RaiSaumitra committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    9374411 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Function to determine GHG emission in secondary treatment

    Added new function that calculates GHG emission associated with secondary treatment processes like ASP.
    RaiSaumitra committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    c08375b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7043390 View commit details
    Browse the repository at this point in the history
  3. Function to determine GHG emission in secondary treatment

    Added new function that calculates GHG emission associated with secondary treatment processes like ASP.
    RaiSaumitra committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    682f55c View commit details
    Browse the repository at this point in the history
  4. Function to determine GHG emission during discharge

    Added new function that calculates GHG emission associated with discharge of wastewater to natural waters.
    RaiSaumitra committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    41aed57 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. More flexible GHG emission functions

    Made the sludge and effluent wastestreams an iterable to make the GHG emission functions more flexible.
    RaiSaumitra committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    8b03d62 View commit details
    Browse the repository at this point in the history
  2. Function to calculate CO2 emissions due to electricity consumption

    Added new function that calculates GHG emission associated with consumption of electricity.
    RaiSaumitra committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    95e2032 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Added function to quantify GHG emission from sludge disposal

    The function calculates methane emission from sludge disposal using a first-order decay equation.
    RaiSaumitra committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8c88799 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. updated sludge disposal GHG function

    Changed function to calculate GHG emissions from sludge disposal to include emissions over project lifetime. Also using a more accurate proxy for W*DOC
    RaiSaumitra committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    5ae2b18 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Added GHG function

    Added new functions that return normalized energy consumption, and GHG emissions at WRRF.
    RaiSaumitra committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    feb9f99 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c670163 View commit details
    Browse the repository at this point in the history
  3. Optimized the code that calculates GHG emission from sludge disposal

    Optimized the code to a less computationally demanding
    RaiSaumitra committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    b4f8ff3 View commit details
    Browse the repository at this point in the history
  4. Updated secondary treatment GHG

    Changed variables names to be consistent with IPCC norms.
    RaiSaumitra committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    491bb3b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Updated GHG emission function

    The function now gives the breakdown of GHG emissions into type of gas (methane, nitrous oxide, carbon-di-oxide) for each of the five sources.
    RaiSaumitra committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    a2d949d View commit details
    Browse the repository at this point in the history
  2. Quantifying operational costs

    Added function which calculates the sludge treatment and disposal costs, and another which compiles all operational costs.
    RaiSaumitra committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    68da59c View commit details
    Browse the repository at this point in the history
  3. Updated wwt_design functions

    System is not required as an input to either of the functions.
    RaiSaumitra committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    026cc11 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Updated estimated range of sludge disposal costs

    Updated the estimated range of sludge disposal costs based on new suggested reference.
    RaiSaumitra committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    d648db5 View commit details
    Browse the repository at this point in the history
  2. Updated GHG emissions from electricity

    The equivalent GHG emissions are updated assuming medium voltage.
    RaiSaumitra committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    2c5fb7e View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Updated sludge management costs

    Updated sludge management costs.
    RaiSaumitra committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    62e7311 View commit details
    Browse the repository at this point in the history
  2. Accounted for methane emission from leftover sludge

    Also added methane emissions due to leftover sludge at the end of project lifetime.
    RaiSaumitra committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0800ffd View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Satisfy mass balance

    Changed the limits of analysis to satisfy mass balance.
    RaiSaumitra committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    603bff9 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Updated junction from bsm2

    Copied changes made by @joyxyz1994 on the bsm2 branch.
    RaiSaumitra committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    3bb7e52 View commit details
    Browse the repository at this point in the history
  2. Null

    Null
    RaiSaumitra committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    49aa0b4 View commit details
    Browse the repository at this point in the history
  3. Updated cost estimates due to unit

    Changed cost estimates based on unit correction.
    RaiSaumitra committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    8dd776c View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Facilitating uncertainty analysis

    1. Added functions to facilitate uncertainty analysis on total operational cost and GHG emissions.
    
    2. Corrected EFs for discharge based on IPCC report.
    
    3. Made other minor changes.
    RaiSaumitra committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    ace59ab View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Corrected typos in documentation

    Edited out typos in documentation.
    RaiSaumitra committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    18259f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Configuration menu
    Copy the full SHA
    235025f View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Configuration menu
    Copy the full SHA
    098018e View commit details
    Browse the repository at this point in the history
  2. Revert "Adding file with initial conditions"

    This reverts commit 098018e.
    RaiSaumitra committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    5ce9fa5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    754fbe3 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    8788a40 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Configuration menu
    Copy the full SHA
    f3c3e07 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. ASM2d-ADM1

    Adding ASM2d-ADM1 junction. ADM1 is not modified.
    RaiSaumitra committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    029ceaa View commit details
    Browse the repository at this point in the history
  2. Charge balance in junction

    Charge balance in ASM2d-ADM1 interface.
    RaiSaumitra committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    3579c8b View commit details
    Browse the repository at this point in the history
  3. ASM2d-ADM1

    Finalizing ASM2d-ADM1
    RaiSaumitra committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    f559493 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. ADM1-ASM2d junction

    Added ADM1-ASM2d junction.
    RaiSaumitra committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    6e8caaf View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Update junction

    no significant changes
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    2d83249 View commit details
    Browse the repository at this point in the history
  2. ASM2d-mADM1 interface

    Step 5(b) deployed to match S_I was incorrect. Corrections, and corresponding check have been made.
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    2760d7f View commit details
    Browse the repository at this point in the history
  3. Checks for N/P in PAO

    ASM2d-mADM1 interface: check for direct mapping of PAO
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    759cf6a View commit details
    Browse the repository at this point in the history
  4. Understanding charge balance

    Added comments to enhance my understanding of charge balance.
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    49bfcb9 View commit details
    Browse the repository at this point in the history
  5. Changes to validate ASM2d-mADM1

    Minor changes to prevent problems while validating the ASM2d-mADM1 interface.
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    38c567c View commit details
    Browse the repository at this point in the history
  6. ASM2dtomADM1

    Added 'ASM2dtomADM1' to the file.
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    010d5d2 View commit details
    Browse the repository at this point in the history
  7. Added mADM1 junction class

    New class for enabling mADM1 interfaces
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    7531b13 View commit details
    Browse the repository at this point in the history
  8. mADM1 junction

    Added H3PO4, and HPO4 2- acid/base pair to the mADM1 junction
    RaiSaumitra committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    656bf80 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. TN balance check: ASM2d-mADM1

    Partially unresolved: When the ASM2d-mADM1 checks for TKN balance, it is not using updated value of ASM(X_I.i_N) even after I update while initializing the system. For now, I have made a modification in the interface itself.
    RaiSaumitra committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    47a78bb View commit details
    Browse the repository at this point in the history
  2. Update in mADM1 process

    Partially unresolved: I need enthalpy of formation for ‘H3PO4/H2PO4-’ which I couldn’t find reliably. Filled in a placeholder value of 5000 J/mol for now.
    RaiSaumitra committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    896c7ed View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Updated mADM1-ASM2d junction

    Added name for contribution, and removed an irrelevant comment.
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    db5bad8 View commit details
    Browse the repository at this point in the history
  2. Step 1 (mADM1-ASM2d)

    Updated part of Step 1 of mADM1-ASM2d junction. Mapping of biomass to X_S.
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    8e5a7b0 View commit details
    Browse the repository at this point in the history
  3. Step 1: mADM1-ASM2d

    Updated part of Step 1 of mADM1-ASM2d junction. Mapping of particulate inert and biomass to X_I.
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    b01ea4b View commit details
    Browse the repository at this point in the history
  4. Step 1 (b) mADM1-ASM2d

    Mapped particulate substrates into X_S.
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    49d8745 View commit details
    Browse the repository at this point in the history
  5. mADM1-ASM2d interface

    Deleting some incorrect steps
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    601df97 View commit details
    Browse the repository at this point in the history
  6. Mapped soluble substrates: mADM1-ASM2d

    Mapped soluble substrates while conserving COD, TKN, and TP.
    RaiSaumitra committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    cc417d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. mADM1-ASM2d: Mapping of soluble inert

    Mapping of soluble inert
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ced062b View commit details
    Browse the repository at this point in the history
  2. Charge balance: mADM1-ASM2d

    Tried to complete charge balance.
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    94b7936 View commit details
    Browse the repository at this point in the history
  3. Minor debugging

    mADM1-ASM2d interface.
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    6e3e99b View commit details
    Browse the repository at this point in the history
  4. Important debugging changes

    mADM1-ASM2d
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    0a1540a View commit details
    Browse the repository at this point in the history
  5. mADM1-ASM2d interface

    Corrected N balance
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    984a1b9 View commit details
    Browse the repository at this point in the history
  6. N balance: mADM1-ASM2d

    Corrected N balance.
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f11a41a View commit details
    Browse the repository at this point in the history
  7. Editing unnecessary part

    This is not required.
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    5d91439 View commit details
    Browse the repository at this point in the history
  8. Update pKa used to calculate delta of S_IP

    pKa2 (7.20) should be used to calculate delta of S_IP, since it would be the reaction forming dominant specie between pH 5-8.
    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    afbab65 View commit details
    Browse the repository at this point in the history
  9. Removed unnecessary edits

    RaiSaumitra committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    30eb0cb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Updated constant: mADM1

    Replaced placeholder value for Delta H for dissociation of H2PO4- with correct enthalpy of formation.
    RaiSaumitra committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f5ac2ad View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Modified Ks

    Used correct position for substrates
    RaiSaumitra committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    da5a12e View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Minor edit

    Not needed
    RaiSaumitra committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9ee94cf View commit details
    Browse the repository at this point in the history
  2. resolve conflict

    joyxyz1994 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1547d16 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Changed Step 2 (ASM2d-mADM1)

    I noticed that according to Flores Alsina et al. 2016 only SF is translated to amino acids and sugars, while acetate is directly mapped.
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8addf41 View commit details
    Browse the repository at this point in the history
  2. Step 5: mapping of X_I

    According to Flores Alsina et al. 2016, X_I should be directly mapped by ensuring N and P content is same across ASM-ADM models
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7f90521 View commit details
    Browse the repository at this point in the history
  3. Revert "Step 5: mapping of X_I"

    This reverts commit 7f90521.
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fcca157 View commit details
    Browse the repository at this point in the history
  4. Mapping XI

    According to Flores Alsina et al. 2016, X_I should be directly mapped by ensuring N and P content is same across ASM-ADM models.
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e74b1c0 View commit details
    Browse the repository at this point in the history
  5. Mapping SI

    According to Flores Alsina et al. 2016 soluble inerts are also directly mapped.
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    326fb0d View commit details
    Browse the repository at this point in the history
  6. Substrate inhibition ADM1

    Reframing calling the function to avoid zero error.
    RaiSaumitra committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c2e7467 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Correcting stoichiometry

    Updating stoichiometry of new processes in P extension to ADM1.
    RaiSaumitra committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b692141 View commit details
    Browse the repository at this point in the history
  2. Minor rewriting

    Removing X_PAO from denominator.
    RaiSaumitra committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    63c25db View commit details
    Browse the repository at this point in the history
  3. Defined stoichiometry

    Defined stoichiometric coefficients for associated with K and Mg in P extension processes.
    RaiSaumitra committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    23b5abd View commit details
    Browse the repository at this point in the history
  4. Conserving C, N, and P

    Added mechanisms to conserve C, N, and P in process 23 and 25.
    RaiSaumitra committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    40b9a2c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Rate eqn in process description

    Added rate equations to the description of processes.
    RaiSaumitra committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e155857 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Configuration menu
    Copy the full SHA
    ef4d7b8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70456d4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4ffba69 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1001c57 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9678f04 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. clean up code

    joyxyz1994 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    37c4b77 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    c305118 View commit details
    Browse the repository at this point in the history
  2. Removing rate equations

    Removing rate equations description from ADM1 processes since they are not entirely correct.
    RaiSaumitra committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2f97d21 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dc04664 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Merge pull request #121 from QSD-Group/metro-bsm2

    Minor updates to `metro`
    yalinli2 authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    bfb6a60 View commit details
    Browse the repository at this point in the history
  2. clean up CSTR ODEs

    joyxyz1994 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5d68c2a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6cac36a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7cdb3de View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    0fb746a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    03599d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    20dfe18 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Configuration menu
    Copy the full SHA
    adac018 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Configuration menu
    Copy the full SHA
    0e7abff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1c474a4 View commit details
    Browse the repository at this point in the history
  3. minor bug fix

    joyxyz1994 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    6f5a518 View commit details
    Browse the repository at this point in the history
  4. Update _clarifier.py

    joyxyz1994 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    121c3c1 View commit details
    Browse the repository at this point in the history
  5. minor bug fix

    joyxyz1994 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    fea7d31 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f316d8a View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Configuration menu
    Copy the full SHA
    9af9b06 View commit details
    Browse the repository at this point in the history
  2. add S_h2 algebraic solver

    joyxyz1994 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    76260c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Configuration menu
    Copy the full SHA
    9fb8659 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. minor bug fix

    joyxyz1994 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    61cd5ec View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Updated ADM1_P_extension

    minor changes for temperature correction
    RaiSaumitra committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a897206 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e13472 View commit details
    Browse the repository at this point in the history
  3. mADM1-ASM2d

    Soluble and particulate inert are now directly mapped.
    RaiSaumitra committed May 10, 2024
    Configuration menu
    Copy the full SHA
    297ebe3 View commit details
    Browse the repository at this point in the history
  4. Functions for Gates work

    Minor updates where I have added functions for uncertainty analysis for Gates
    RaiSaumitra committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d5b26ba View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e05a275 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Dynamic pH calculation

    Made this change to debug an error related to dynamic pH calculation.
    RaiSaumitra committed May 13, 2024
    Configuration menu
    Copy the full SHA
    2f84afd View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Revert "Merge branch 'metro-bsm2' into metro"

    This reverts commit e05a275, reversing
    changes made to d5b26ba.
    RaiSaumitra committed May 15, 2024
    Configuration menu
    Copy the full SHA
    82784a4 View commit details
    Browse the repository at this point in the history
  2. Revert "Dynamic pH calculation"

    This reverts commit 2f84afd.
    RaiSaumitra committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f5a5272 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. null

    RaiSaumitra committed May 21, 2024
    Configuration menu
    Copy the full SHA
    d4b0c67 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. GHG emission category wise

    Adding separate categories for emission sources for uncertainty analysis.
    RaiSaumitra committed May 30, 2024
    Configuration menu
    Copy the full SHA
    d86141a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eac45ed View commit details
    Browse the repository at this point in the history
  3. Last GHG metric

    RaiSaumitra committed May 30, 2024
    Configuration menu
    Copy the full SHA
    0cdef29 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    299306c View commit details
    Browse the repository at this point in the history
  5. All new system metrics

    RaiSaumitra committed May 30, 2024
    Configuration menu
    Copy the full SHA
    eb4fa6f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Minor changes

    RaiSaumitra committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    f3fbeb7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Update

    RaiSaumitra committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    682a841 View commit details
    Browse the repository at this point in the history
  2. Suggestions

    RaiSaumitra committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    09d62da View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3db40fe View commit details
    Browse the repository at this point in the history