Code

add VMD, PGMD/CGMD#1466

Code

Merged

adam-a-a merged 55 commits intowatertap-org:mainwatertap-org/watertap:mainfrom ElmiraShamlou:VMDElmiraShamlou/watertap:VMDCopy head branch name to clipboardDec 18, 2024

+2,437-312

Commits

Commits on Jul 15, 2024

• add VMD, PGMD/CGMD

  ElmiraShamlou

  committed
  f9ae7b8

  Copy full SHA for f9ae7b8

Commits on Jul 16, 2024

• modifies gap heat conduction

  ElmiraShamlou

  committed
  6291813

  Copy full SHA for 6291813

• black

  ElmiraShamlou

  committed
  a94b817

  Copy full SHA for a94b817

• modifies scaling factor calculations

  ElmiraShamlou

  committed
  de6c8f4

  Copy full SHA for de6c8f4

• VMD modifications

  ElmiraShamlou

  committed
  8657840

  Copy full SHA for 8657840

Commits on Jul 18, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  593f91e

  Copy full SHA for 593f91e

• modifications for PGMD

  ElmiraShamlou

  committed
  c2671ab

  Copy full SHA for c2671ab

• black

  ElmiraShamlou

  committed
  9c191d7

  Copy full SHA for 9c191d7

Commits on Jul 19, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  8070194

  Copy full SHA for 8070194

Commits on Jul 24, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  6ddedc0

  Copy full SHA for 6ddedc0

Commits on Aug 4, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  0580009

  Copy full SHA for 0580009

• updates

  ElmiraShamlou

  committed
  3792195

  Copy full SHA for 3792195

• resolves conflict

  ElmiraShamlou

  committed
  d9e523c

  Copy full SHA for d9e523c

• modifies VMD

  ElmiraShamlou

  committed
  b6b845b

  Copy full SHA for b6b845b

Commits on Aug 5, 2024

• modifies PGMD

  ElmiraShamlou

  committed
  3cea0fb

  Copy full SHA for 3cea0fb

• Revert "updates"

  Show description for 42005cf
  ElmiraShamlou

  committed
  42005cf

  Copy full SHA for 42005cf

• Reapply "updates"

  Show description for c96ffa4
  ElmiraShamlou

  committed
  c96ffa4

  Copy full SHA for c96ffa4

Commits on Aug 6, 2024

• 1D VMD and PGMD

  ElmiraShamlou

  committed
  4420835

  Copy full SHA for 4420835

Commits on Aug 22, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  7645d3e

  Copy full SHA for 7645d3e

Commits on Sep 12, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  f2b6296

  Copy full SHA for f2b6296

Commits on Oct 31, 2024

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

  ElmiraShamlou

  committed
  1d5af2b

  Copy full SHA for 1d5af2b

• Merge branch 'VMD' of https://github.com/ElmiraShamlou/watertap into VMD

  ElmiraShamlou

  committed
  13f6ec2

  Copy full SHA for 13f6ec2

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  bf55fb3

  Copy full SHA for bf55fb3

Commits on Nov 5, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  c35900e

  Copy full SHA for c35900e

Commits on Dec 9, 2024

• refine tests

  ElmiraShamlou

  committed
  c225233

  Copy full SHA for c225233

• Merge branch 'VMD' of https://github.com/ElmiraShamlou/watertap into VMD

  ElmiraShamlou

  committed
  01f0519

  Copy full SHA for 01f0519

Commits on Dec 11, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  6d1d173

  Copy full SHA for 6d1d173

Commits on Dec 12, 2024

• revise tests

  ElmiraShamlou

  committed
  72acc64

  Copy full SHA for 72acc64

• black

  ElmiraShamlou

  committed
  b281ec7

  Copy full SHA for b281ec7

• linting

  ElmiraShamlou

  committed
  f74a7ce

  Copy full SHA for f74a7ce

• resolve doc issue

  ElmiraShamlou

  committed
  06cd2d7

  Copy full SHA for 06cd2d7

• resolve doc issue

  ElmiraShamlou

  committed
  7458ae0

  Copy full SHA for 7458ae0

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  23d999f

  Copy full SHA for 23d999f

Commits on Dec 13, 2024

• refine tests

  ElmiraShamlou

  committed
  b2b674a

  Copy full SHA for b2b674a

• Merge branch 'VMD' of https://github.com/ElmiraShamlou/watertap into VMD

  ElmiraShamlou

  committed
  8361953

  Copy full SHA for 8361953

• resolve doc issue

  ElmiraShamlou

  committed
  2029845

  Copy full SHA for 2029845

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  85f8226

  Copy full SHA for 85f8226

• improve scaling

  ElmiraShamlou

  committed
  fbb13a0

  Copy full SHA for fbb13a0

• Merge branch 'VMD' of https://github.com/ElmiraShamlou/watertap into VMD

  ElmiraShamlou

  committed
  ae24010

  Copy full SHA for ae24010

• Merge branch 'main' into VMD

  lbianchi-lbl

  authored
  64e292d

  Copy full SHA for 64e292d

• Update watertap/unit_models/MD/membrane_distillation_1D.py

  Show description for 8b56d1b
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  8b56d1b

  Copy full SHA for 8b56d1b

• Update watertap/unit_models/tests/test_membrane_distillation_0D.py

  Show description for 41a90c5
  

  ElmiraShamlou

  and

  adam-a-a

  authored
  41a90c5

  Copy full SHA for 41a90c5

Commits on Dec 14, 2024

• Merge branch 'main' into VMD

  ElmiraShamlou

  authored
  aaec7f5

  Copy full SHA for aaec7f5

Commits on Dec 17, 2024

• add docs for new configs and 1D MD

  ElmiraShamlou

  committed
  b4068e5

  Copy full SHA for b4068e5

• Merge branch 'VMD' of https://github.com/ElmiraShamlou/watertap into VMD

  ElmiraShamlou

  committed
  591f1fd

  Copy full SHA for 591f1fd

• resolve doc issue

  ElmiraShamlou

  committed
  24eaace

  Copy full SHA for 24eaace

• doc revise

  ElmiraShamlou

  committed
  79c4a22

  Copy full SHA for 79c4a22

• Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

  Show description for 6096819
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  6096819

  Copy full SHA for 6096819

• Update docs/technical_reference/unit_models/membrane_distillation_0D.rst

  Show description for b037cb7
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  b037cb7

  Copy full SHA for b037cb7

• Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

  Show description for 169e59d
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  169e59d

  Copy full SHA for 169e59d

• Update docs/technical_reference/unit_models/membrane_distillation_0D.rst

  Show description for 43d51f1
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  43d51f1

  Copy full SHA for 43d51f1

• Update docs/technical_reference/unit_models/membrane_distillation_1D.rst

  Show description for ea02752
  

  ElmiraShamlou

  and

  MarcusHolly

  authored
  ea02752

  Copy full SHA for ea02752

• rename PGMD_CGMD to GMD

  ElmiraShamlou

  committed
  f79a1c8

  Copy full SHA for f79a1c8

• resolve merge conflict

  ElmiraShamlou

  committed
  4773b4f

  Copy full SHA for 4773b4f

• categorize equations based on MD config type

  ElmiraShamlou

  committed
  8a0d201

  Copy full SHA for 8a0d201