Code

Permian FO treatment train#147

Code

Draft

Zhuoran29 wants to merge 110 commits intowatertap-org:mainwatertap-org/watertap-reflo:mainfrom Zhuoran29:permian_foZhuoran29/watertap-reflo:permian_foCopy head branch name to clipboard

+29,877-176

Commits

Commits on Oct 23, 2024

• create permian dir

  kurbansitterley

  committed
  4625282

  Copy full SHA for 4625282

• create oxidation unit

  kurbansitterley

  committed
  ae55393

  Copy full SHA for ae55393

Commits on Oct 24, 2024

• add electrocoagulation

  kurbansitterley

  committed
  9359b26

  Copy full SHA for 9359b26

• clean up

  kurbansitterley

  committed
  2bd557f

  Copy full SHA for 2bd557f

• stash costing changes

  kurbansitterley

  committed
  117db50

  Copy full SHA for 117db50

Commits on Oct 25, 2024

• add cart filt

  kurbansitterley

  committed
  5b7ffb6

  Copy full SHA for 5b7ffb6

• updates to costing

  kurbansitterley

  committed
  2b6b6c1

  Copy full SHA for 2b6b6c1

• add generic path for permian case study file

  kurbansitterley

  committed
  9b66784

  Copy full SHA for 9b66784

• add cart filt yaml; checkpoint

  kurbansitterley

  committed
  09024b7

  Copy full SHA for 09024b7

• black

  kurbansitterley

  committed
  e826fe0

  Copy full SHA for e826fe0

• add case study yaml to component files

  kurbansitterley

  committed
  6b08702

  Copy full SHA for 6b08702

• fix permian EC

  kurbansitterley

  committed
  dcd05c3

  Copy full SHA for dcd05c3

• fix KBHDP ec

  kurbansitterley

  committed
  f6e13aa

  Copy full SHA for f6e13aa

• add ec yaml; add kbhdp case study yaml

  kurbansitterley

  committed
  999da5f

  Copy full SHA for 999da5f

• similar structure

  kurbansitterley

  committed
  34e9bef

  Copy full SHA for 34e9bef

Commits on Oct 27, 2024

• add mvc

  kurbansitterley

  committed
  05be75e

  Copy full SHA for 05be75e

• make importable; clean up

  kurbansitterley

  committed
  0cd1790

  Copy full SHA for 0cd1790

• draft permian SOA started

  kurbansitterley

  committed
  e0a726a

  Copy full SHA for e0a726a

• blackify

  kurbansitterley

  committed
  201315b

  Copy full SHA for 201315b

Commits on Oct 28, 2024

• add DWI component file

  kurbansitterley

  committed
  76b4bf1

  Copy full SHA for 76b4bf1

• add translators; make importable

  kurbansitterley

  committed
  132e30b

  Copy full SHA for 132e30b

• permian SOA case study checkpoint

  kurbansitterley

  committed
  7de1e99

  Copy full SHA for 7de1e99

• conductivity via constr

  kurbansitterley

  committed
  9ef94db

  Copy full SHA for 9ef94db

• set unit operating conditions

  kurbansitterley

  committed
  df0c8b1

  Copy full SHA for df0c8b1

• add flowsheet_costing_block arg

  kurbansitterley

  committed
  a4ece11

  Copy full SHA for a4ece11

• add costing for SOA

  kurbansitterley

  committed
  c2ed31a

  Copy full SHA for c2ed31a

Commits on Oct 29, 2024

• import init func

  kurbansitterley

  committed
  95e2341

  Copy full SHA for 95e2341

• passing fs not unit

  kurbansitterley

  committed
  b974416

  Copy full SHA for b974416

Commits on Nov 1, 2024

• black

  kurbansitterley

  committed
  1e235d0

  Copy full SHA for 1e235d0

Commits on Nov 2, 2024

• sw to water tb

  kurbansitterley

  committed
  905c024

  Copy full SHA for 905c024

Commits on Nov 3, 2024

• improve MVC build

  kurbansitterley

  committed
  8b993ba

  Copy full SHA for 8b993ba

• MVC working optimization and design

  kurbansitterley

  committed
  0882bf2

  Copy full SHA for 0882bf2

• MVC design/operating functions

  kurbansitterley

  committed
  a5672f7

  Copy full SHA for a5672f7

Commits on Nov 10, 2024

• use generic MVC

  kurbansitterley

  committed
  6e1ef5e

  Copy full SHA for 6e1ef5e

• SOA initializing

  kurbansitterley

  committed
  2be7008

  Copy full SHA for 2be7008

Commits on Nov 11, 2024

• 0 TDS removal for EC

  kurbansitterley

  committed
  22b4c5a

  Copy full SHA for 22b4c5a

• permian SOA checkpoint

  kurbansitterley

  committed
  5996ac5

  Copy full SHA for 5996ac5

Commits on Nov 15, 2024

• Merge branch 'main' of https://github.com/kurbansitterley/watertap-seto into permian_case_study

  kurbansitterley

  committed
  f2d215f

  Copy full SHA for f2d215f

Commits on Nov 18, 2024

• update data yamls for permian

  kurbansitterley

  committed
  9a84483

  Copy full SHA for 9a84483

• add pretreatment flowsheet

  kurbansitterley

  committed
  16ef25e

  Copy full SHA for 16ef25e

Commits on Nov 19, 2024

• permian pretreatment flowsheet mod

  kurbansitterley

  committed
  a649a63

  Copy full SHA for a649a63

• blackify

  kurbansitterley

  committed
  2c81da5

  Copy full SHA for 2c81da5

Commits on Nov 21, 2024

• Merge branch 'main' into permian_case_study

  kurbansitterley

  authored
  0b0c274

  Copy full SHA for 0b0c274

Commits on Nov 22, 2024

• Merge branch 'main' into permian_case_study

  kurbansitterley

  authored
  13704cf

  Copy full SHA for 13704cf

• add kwargs

  kurbansitterley

  committed
  c003357

  Copy full SHA for c003357

• add SOA temp

  kurbansitterley

  committed
  651fd91

  Copy full SHA for 651fd91

Commits on Nov 24, 2024

• save change

  Zhuoran29

  committed
  0cf6b22

  Copy full SHA for 0cf6b22

Commits on Dec 2, 2024

• FO-dwi finshied,cryst pending

  Zhuoran29

  committed
  cc51244

  Copy full SHA for cc51244

Commits on Dec 4, 2024

• upload a working version

  Zhuoran29

  committed
  99616b2

  Copy full SHA for 99616b2

• add EC TDS removal frac, base currency = 2023 to yamls

  kurbansitterley

  committed
  3ca4251

  Copy full SHA for 3ca4251

Commits on Dec 7, 2024

• Merge branch 'main' into permian_case_study

  kurbansitterley

  authored
  d388765

  Copy full SHA for d388765

Commits on Dec 9, 2024

• Merge branch 'main' of https://github.com/kurbansitterley/watertap-seto into permian_case_study

  kurbansitterley

  committed
  29316c3

  Copy full SHA for 29316c3

Commits on Dec 15, 2024

• save progress

  Zhuoran29

  committed
  d0674c4

  Copy full SHA for d0674c4

• merge main

  Zhuoran29

  committed
  038220e

  Copy full SHA for 038220e

Commits on Dec 16, 2024

• update

  Zhuoran29

  committed
  9b89a8b

  Copy full SHA for 9b89a8b

• Merge branch 'main' of https://github.com/watertap-org/watertap-reflo into permian_fo

  Zhuoran29

  committed
  2f1113c

  Copy full SHA for 2f1113c

• Merge branch 'permian_case_study' of https://github.com/kurbansitterley/watertap-seto into permian_case_study

  kurbansitterley

  committed
  c6e4725

  Copy full SHA for c6e4725

• Merge branch 'main' of https://github.com/kurbansitterley/watertap-seto into permian_case_study

  kurbansitterley

  committed
  f701e5a

  Copy full SHA for f701e5a

• black of course

  kurbansitterley

  committed
  48c8730

  Copy full SHA for 48c8730

• remove conductivity constraint

  kurbansitterley

  committed
  0c8cc93

  Copy full SHA for 0c8cc93

Commits on Dec 19, 2024

• Merge branch 'main' of https://github.com/kurbansitterley/watertap-reflo into permian_case_study

  kurbansitterley

  committed
  c3c66c2

  Copy full SHA for c3c66c2

Commits on Dec 23, 2024

• update gitignore

  kurbansitterley

  committed
  f28606e

  Copy full SHA for f28606e

• create data dir; add carlsbad NM weather for permian case study

  kurbansitterley

  committed
  da6536c

  Copy full SHA for da6536c

Commits on Dec 30, 2024

• pretreatment changes

  MuktaHardikar

  committed
  2c9c079

  Copy full SHA for 2c9c079

• update ec yaml and add costing back to pretreatment

  MuktaHardikar

  committed
  c7e9e32

  Copy full SHA for c7e9e32

• pretreatment solving with DOF = 1

  MuktaHardikar

  committed
  e9e193b

  Copy full SHA for e9e193b

• pretreatment solving with DOF=0. Need to verify values

  MuktaHardikar

  committed
  b02a560

  Copy full SHA for b02a560

• updated rho_water density

  MuktaHardikar

  committed
  a1e301c

  Copy full SHA for a1e301c

• Fixing the disposal_SW_mixer.mixed_state temperature after initialization. DOF =0

  MuktaHardikar

  committed
  00bc7a1

  Copy full SHA for 00bc7a1

Commits on Dec 31, 2024

• improve EC scaling

  kurbansitterley

  committed
  214a256

  Copy full SHA for 214a256

• improve CF scaling

  kurbansitterley

  committed
  0976822

  Copy full SHA for 0976822

• add chem addition scaling

  kurbansitterley

  committed
  cb23edb

  Copy full SHA for cb23edb

• unify pretreatment scaling

  kurbansitterley

  committed
  90c1aaa

  Copy full SHA for 90c1aaa

• HX split fraction is always 0.5; update scaling part 1

  kurbansitterley

  committed
  252fb06

  Copy full SHA for 252fb06

• add constant to prop_out tds mass flow to fix conc issue

  kurbansitterley

  committed
  7422b9e

  Copy full SHA for 7422b9e

• move constant

  kurbansitterley

  committed
  d7e15bc

  Copy full SHA for d7e15bc

• correct system recovery calc

  kurbansitterley

  committed
  142f975

  Copy full SHA for 142f975

Commits on Jan 3, 2025

• dwi use lcow costing method

  kurbansitterley

  committed
  179e690

  Copy full SHA for 179e690

• add build_and_run to permian pretreatment

  kurbansitterley

  committed
  0935a4b

  Copy full SHA for 0935a4b

• MVC working mostly

  kurbansitterley

  committed
  75d3c7a

  Copy full SHA for 75d3c7a

• keeping old permian SOA file for now

  kurbansitterley

  committed
  0632ae8

  Copy full SHA for 0632ae8

• hacky way to run permian SOA

  kurbansitterley

  committed
  d84caa2

  Copy full SHA for d84caa2

• Permian Subtheme 1 MD flowsheet added and black

  MuktaHardikar

  committed
  2891741

  Copy full SHA for 2891741

• matching density in ZO and SW packages

  MuktaHardikar

  committed
  af77e2b

  Copy full SHA for af77e2b

• fix pressure ratio in solve func

  kurbansitterley

  committed
  7a175b3

  Copy full SHA for 7a175b3

• update __all__

  kurbansitterley

  committed
  cc38977

  Copy full SHA for cc38977

• Merge branch 'permian' of https://github.com/watertap-org/watertap-reflo into permian

  kurbansitterley

  committed
  e6abce3

  Copy full SHA for e6abce3

• change feed_to_mvc tds source

  kurbansitterley

  committed
  d2b55e4

  Copy full SHA for d2b55e4

• rever TDS calc

  kurbansitterley

  committed
  8ddf606

  Copy full SHA for 8ddf606

• fix zo_to_sw translator block, black

  MuktaHardikar

  committed
  72ec29b

  Copy full SHA for 72ec29b

Commits on Jan 4, 2025

• pretreatment checkpoint before attempt at sweep

  kurbansitterley

  committed
  1084081

  Copy full SHA for 1084081

Commits on Jan 6, 2025

• SOA checkpoint

  kurbansitterley

  committed
  c62b689

  Copy full SHA for c62b689

Commits on Jan 7, 2025

• linking constraints on main unit model self rather than effect models

  kurbansitterley

  committed
  954a5b0

  Copy full SHA for 954a5b0

• update test

  kurbansitterley

  committed
  70ad476

  Copy full SHA for 70ad476

• Merge branch 'main' into mec_modift

  kurbansitterley

  authored
  40ada25

  Copy full SHA for 40ada25

• Merge branch 'main' of https://github.com/kurbansitterley/watertap-reflo into permian

  kurbansitterley

  committed
  f27d226

  Copy full SHA for f27d226

• Merge branch 'mec_modift' of https://github.com/kurbansitterley/watertap-reflo into permian

  kurbansitterley

  committed
  06d221a

  Copy full SHA for 06d221a

Commits on Jan 9, 2025

• save progress

  Zhuoran29

  committed
  e6de647

  Copy full SHA for e6de647

• kbhdp md component fix, permian st1 md fix

  MuktaHardikar

  committed
  42253be

  Copy full SHA for 42253be

Commits on Jan 10, 2025

• CST updates with permian pkl and json heat 1-50

  MuktaHardikar

  committed
  061aee4

  Copy full SHA for 061aee4

• update filepaths in pysam_run_permian trough

  MuktaHardikar

  committed
  b3731d1

  Copy full SHA for b3731d1

Commits on Jan 13, 2025

• Adding trough surrogate files

  MuktaHardikar

  committed
  306004e

  Copy full SHA for 306004e

• Add trough pkl

  MuktaHardikar

  committed
  6042e3a

  Copy full SHA for 6042e3a

Commits on Jan 16, 2025

• merge

  Zhuoran29

  committed
  0134f23

  Copy full SHA for 0134f23

• update cost

  Zhuoran29

  committed
  dce9c9d

  Copy full SHA for dce9c9d

Commits on Jan 20, 2025

• save changes

  Zhuoran29

  committed
  2eb0fa8

  Copy full SHA for 2eb0fa8

Commits on Jan 27, 2025

• add jupyter note

  Zhuoran29

  committed
  49a9daa

  Copy full SHA for 49a9daa

• Merge branch 'permian_fo' of https://github.com/Zhuoran29/watertap-reflo into permian_fo

  Zhuoran29

  committed
  bd3c21a

  Copy full SHA for bd3c21a

• add figs

  Zhuoran29

  committed
  aa6028e

  Copy full SHA for aa6028e

• update path

  Zhuoran29

  committed
  93b3598

  Copy full SHA for 93b3598