Merge updates in conventional wastewater configurations #103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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).
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.
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.
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.
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.
Updated charge balance to include inorganic phosphorous on the ADM1 side.
Started modifying ADM1-ASM2d interface
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
Changed step 2 to include P balance
Modified step 1(a) and 1(b) to include P balance.
Made several changes for ADM1-ASM2d interface to accommodate COD, TN, and TP balance.
Completed transitions and checks on ADM1-ASM2d interface. COD, TN, and TP balance holds.
Modified charge balance to accommodate ADM1 and ASM2d.
Corrected typo
Design of Primary clarifier
Added design function to secondary clarifier. For the same purpose, added new property 'height'.
Adding default F_BM and lifetime values for pump, and metals.
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.
Added cost of pump, and pumping.
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'.
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'.
Corrected typos
1. Updated design and cost functions of SC. 2. Added user-defined parameters for fixed design variables such as upflow_velocity, cylinderical_depth.
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.
Changed the order of import statements to use pump in clarifier. Co-Authored-By: Yalin <[email protected]>
Changed order of import statements to use pump in clarifier Co-Authored-By: Yalin <[email protected]>
Fixed typo (cylinderical to cylindrical). Made changes in design_pump() function of secondary clarifier.
Changed order of import statements to use pump in primary clarifier.
Changed design_pump() function to allow use of pump (based on discussion with Yalin). Changed typo (cylinderical to cylindrical).
minor changes for temperature correction
Soluble and particulate inert are now directly mapped.
Minor updates where I have added functions for uncertainty analysis for Gates
Made this change to debug an error related to dynamic pH calculation.
This reverts commit 2f84afd.
Adding separate categories for emission sources for uncertainty analysis.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@RaiSaumitra I'm making this a draft PR so we can discuss any needed updates, some of my changes could be style-related for easier understanding/improve in speed