Integrate desalination models #311

Sakshi21299 · 2024-03-18T20:58:13Z

Summary:

This PR adds integrated optimization formulation for the MEE-MVR process along with jupyter notebooks with examples

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my
contribution:

I agree my contributions are submitted under the license terms described in the LICENSE.md file
at the top level of this directory.
I represent I am authorized to make the contributions and grant the license. If my employer has
rights to intellectual property that includes these contributions, I represent that I have
received permission to make contributions and grant the required license on behalf of that
employer.

Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

…project-pareto into integrate_desal

Sakshi21299 · 2024-04-30T20:36:33Z

@tarnold17 The files for the MD unit are necessary for the jupyter notebook with integrated MD at desalination sites. When 307 gets merged I think they don't need to be here

tarnold17

I have a few questions and comments. I've also just pushed a few commits cleaning some things up. Namely, I have removed the files MD_PARETO.ipynb and MD_single_stage_continuous_recirculation.py from the repo, as these will be contributed in #307. This does mean that #307 now needs to be merged before this PR can merge.

pareto/case_studies/integrated_desalination_demo.xlsx

pareto/strategic_water_management/strategic_optimization_results.xlsx

pareto/tests/test_cm_qcp.py

pareto/models_extra/Integrate_desal/models/qcp_desal.py

pareto/models_extra/Integrate_desal/integrated_models/integrated_optimization_mvr.py

pareto/tests/test_integrated_optimization_mvr.py

pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter_notebook.ipynb

Sakshi21299 · 2024-05-23T03:42:33Z

I have a few questions and comments. I've also just pushed a few commits cleaning some things up. Namely, I have removed the files MD_PARETO.ipynb and MD_single_stage_continuous_recirculation.py from the repo, as these will be contributed in #307. This does mean that #307 now needs to be merged before this PR can merge.

Yes that means #307 needs to merge before this

tarnold17 · 2024-05-23T16:07:34Z

I have a few questions and comments. I've also just pushed a few commits cleaning some things up. Namely, I have removed the files MD_PARETO.ipynb and MD_single_stage_continuous_recirculation.py from the repo, as these will be contributed in #307. This does mean that #307 now needs to be merged before this PR can merge.

Yes that means #307 needs to merge before this

#307 was merged earlier this week, so we are good there!

.../integrated_desalination_jupyter_notebooks/integrated_optimization_md_jupyter_notebook.ipynb

…e other CM module input files

JavalVyas2000

Looks good to me

Sakshi21299 and others added 30 commits January 1, 2024 15:56

mee-mvr model with heat integration

3f5654e

tests for mee-mvr model

5da725b

add tests to check dof

0c5fb06

made max compression ratio a mutable parameter

c6b0006

Merge branch 'main' into desalination_models

9ea3ee4

Updated evap cost to consider nickel

ea5ff9a

updated test

7f39206

Moved desalination models into models_extra

ca6e1b7

moved desalination tests into the common tests folder

1333aaa

deleted folder

7a563ab

Jupyter notebook for mee-mvr

3761751

add headers

0e8f256

add headers

f4eb1a5

run black

ee9a88e

run black on jupyter file

551ba50

Update pareto/models_extra/desalination_models/mee_mvr.py

38e2a5d

Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/models_extra/desalination_models/mee_mvr.py

e7a2fa2

Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

794dce2

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

a047baa

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

c0a2caf

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

4d4605d

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

ff513ea

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

Update pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter…

9ff8d54

…_notebook.ipynb Co-authored-by: Travis Arnold <travis.arnold17@gmail.com>

revert recent commits to make the notebook work

78444ba

cleaned comments and made parameters mutable

50f396d

added citation and loosened bounds

0fa9da0

add instructions for updating temperature and other parameters

f5659cf

Run black

2dc9c03

file changed ids in markdown cells

d20f969

Merge branch 'desalination_models' of https://github.com/Sakshi21299/…

255df99

…project-pareto into integrate_desal

Sakshi21299 added 4 commits April 30, 2024 16:18

Addrssing PR comments

37a7a31

Addressing PR comments for MD

3627a71

remove files

04bdc6c

Merge branch 'main' into integrate_desal

6489a2c

JavalVyas2000 and others added 9 commits April 30, 2024 17:43

applying black

5ddd40c

apply black

6356d0e

Merge branch 'main' into sakshi-integrate_desal

c1b1b6d

Run black

db83e4f

Remove files that are contributed in separate PR

60d1383

Update headers

ef4d80b

Add copyright headers to Jupyter notebooks

a021fc8

Remove strategic_optimization_results.xlsx

5ddfc55

Restore test_cm_qcp.py

e0eda9a

tarnold17 reviewed May 20, 2024

View reviewed changes

tarnold17 and others added 2 commits May 21, 2024 13:38

Merge branch 'main' into integrate_desal

cd77258

Fix import path for MD model

30da5d1

tarnold17 reviewed May 21, 2024

View reviewed changes

pareto/examples/desalination_jupyter_notebooks/mee_mvr_jupyter_notebook.ipynb Outdated Show resolved Hide resolved

Remove unneeded newlines

06cc8e6

Remove TODO notes from code

03d6074

tarnold17 reviewed May 31, 2024

View reviewed changes

.../integrated_desalination_jupyter_notebooks/integrated_optimization_md_jupyter_notebook.ipynb Outdated Show resolved Hide resolved

tarnold17 and others added 4 commits June 3, 2024 09:17

Merge branch 'main' into integrate_desal

6df9bb4

Clean up spreadsheets

1d4bb33

Use new version of get_data()

e4bb9b3

Rename integrated desalination demo input file and move it next to th…

713258e

…e other CM module input files

tarnold17 approved these changes Jun 3, 2024

View reviewed changes

JavalVyas2000 approved these changes Jun 4, 2024

View reviewed changes

tarnold17 merged commit 37e64e5 into project-pareto:main Jun 4, 2024
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate desalination models #311

Integrate desalination models #311

Sakshi21299 commented Mar 18, 2024 •

edited

Sakshi21299 commented Apr 30, 2024

tarnold17 left a comment

Sakshi21299 commented May 23, 2024

tarnold17 commented May 23, 2024

JavalVyas2000 left a comment

Integrate desalination models #311

Integrate desalination models #311

Conversation

Sakshi21299 commented Mar 18, 2024 • edited

Summary:

Legal Acknowledgement

Sakshi21299 commented Apr 30, 2024

tarnold17 left a comment

Choose a reason for hiding this comment

Sakshi21299 commented May 23, 2024

tarnold17 commented May 23, 2024

JavalVyas2000 left a comment

Choose a reason for hiding this comment

Sakshi21299 commented Mar 18, 2024 •

edited