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

add VMD, PGMD/CGMD #1466

Merged
merged 55 commits into from
Dec 18, 2024
Merged

add VMD, PGMD/CGMD #1466

merged 55 commits into from
Dec 18, 2024

Conversation

ElmiraShamlou
Copy link
Contributor

@ElmiraShamlou ElmiraShamlou commented Jul 15, 2024

add vmd, pgmd and cgmd for membrane distillation

Fixes/Resolves:

@ElmiraShamlou ElmiraShamlou self-assigned this Jul 15, 2024
@ElmiraShamlou ElmiraShamlou added the Priority:Normal Normal Priority Issue or PR label Jul 15, 2024
@ksbeattie
Copy link
Contributor

@ElmiraShamlou, any update on this?

@ElmiraShamlou
Copy link
Contributor Author

@ElmiraShamlou, any update on this?

I'll be pushing one more commit, and then it will be ready for review.

@ElmiraShamlou ElmiraShamlou marked this pull request as ready for review September 12, 2024 17:13
@avdudchenko avdudchenko self-requested a review October 2, 2024 16:39
@ksbeattie
Copy link
Contributor

@ElmiraShamlou, any update on this?

I'll be pushing one more commit, and then it will be ready for review.

What's the news here?

Copy link
Contributor

@adam-a-a adam-a-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've done a lot of great work. It is clear that a significant amount of effort went into this PR. I think we are close, but I do have one particularly painful ask--can you update the documentation on MD to cover the configuration types and 1D config? Perhaps you could point to 0d doc in the 1d doc for the equations and variables, but more importantly, I think that we should be describing DCMD, VMD, PGMD and CGMD for users so that these models can be more accessible and comprehensible.

@ElmiraShamlou
Copy link
Contributor Author

You've done a lot of great work. It is clear that a significant amount of effort went into this PR. I think we are close, but I do have one particularly painful ask--can you update the documentation on MD to cover the configuration types and 1D config? Perhaps you could point to 0d doc in the 1d doc for the equations and variables, but more importantly, I think that we should be describing DCMD, VMD, PGMD and CGMD for users so that these models can be more accessible and comprehensible.

@adam-a-a Thank you for the comment and feedback. The documentation has been updated to cover the new configuration types (DCMD, VMD, PGMD, and CGMD), and a separate file has been added for the 1D model.

Copy link
Contributor

@adam-a-a adam-a-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀🚀🚀🚀🚀

@adam-a-a adam-a-a enabled auto-merge (squash) December 17, 2024 23:16
@adam-a-a adam-a-a merged commit 9eb240e into watertap-org:main Dec 18, 2024
19 checks passed
lbianchi-lbl pushed a commit that referenced this pull request Dec 18, 2024
* add VMD, PGMD/CGMD

* modifies gap heat conduction

* black

* modifies scaling factor calculations

* VMD modifications

* modifications for PGMD

* black

* modifies VMD

* modifies PGMD

* Revert "updates"

This reverts commit 3792195, reversing
changes made to 8070194.

* Reapply "updates"

This reverts commit 42005cf.

* 1D VMD and PGMD

* resolve PGMD heat balance issue at inlet for 0D model. PGMD 1D was working as expected

* refine tests

* revise tests

* black

* linting

* resolve doc issue

* resolve doc issue

* refine tests

* resolve doc issue

* improve scaling

* Update watertap/unit_models/MD/membrane_distillation_1D.py

Co-authored-by: MarcusHolly <[email protected]>

* Update watertap/unit_models/tests/test_membrane_distillation_0D.py

Co-authored-by: Adam Atia <[email protected]>

* add docs for new configs and 1D MD

* resolve doc issue

* doc revise

* Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

Co-authored-by: MarcusHolly <[email protected]>

* Update docs/technical_reference/unit_models/membrane_distillation_0D.rst

Co-authored-by: MarcusHolly <[email protected]>

* Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

Co-authored-by: MarcusHolly <[email protected]>

* Update docs/technical_reference/unit_models/membrane_distillation_0D.rst

Co-authored-by: MarcusHolly <[email protected]>

* Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

Co-authored-by: MarcusHolly <[email protected]>

* rename PGMD_CGMD to GMD

* categorize equations based on MD config type

---------

Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: MarcusHolly <[email protected]>
Co-authored-by: Adam Atia <[email protected]>
(cherry picked from commit 9eb240e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 Merge to rel Merge commit(s) from this PR to release branch Priority:Normal Normal Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants