Commit Graph

1098 Commits

Author SHA1 Message Date
Bård Skaflestad
dda3effdb3 Merge pull request #3570 from svenn-t/ppcwmax
Implementation of PPCWMAX
2023-06-16 15:04:03 +02:00
Svenn Tveit
af3f44423b Changed from std::tuple to std::pair 2023-06-15 14:59:42 +02:00
Tor Harald Sandve
c270dc2ff3 Minor clean-up and fixes of the WAG hysteresis model 2023-06-15 12:31:27 +02:00
Ove Sævareid
34a9d9c949 Some support for WAG hysteresis (material). 2023-06-15 11:22:44 +02:00
Bård Skaflestad
fdfbecc742 Merge pull request #3572 from hnil/ecldefault
-- added function need to test solver without multiplexer
2023-06-14 16:26:44 +02:00
hnil
3b06ff2757 -- added function need to test solver without multiplexer 2023-06-14 14:37:07 +02:00
Bård Skaflestad
e6590f2169 Fix A Couple of Compiler and Static Code Analysis Warnings
In particular

  * Tag a single argument constructor as 'explicit',
  * Remove an unused private function
  * Fix mismatched tags (struct vs. class) in forward declaration
  * Return 'false' in an impossible updateHyst() case

While here, also use a real UnitSystem object instead of creating
a METRIC system just to infer unit strings.
2023-06-14 13:31:41 +02:00
hnil
12da4dbe02 --changed for bska comments. All tests ok locally 2023-06-14 09:31:20 +02:00
Svenn Tveit
de814bc577 Apply PPCWMAX in SWATINIT calculations.
Note that re-calculation of initial water saturation (after PPCWMAX is applied) is currently done in opm-simulators.
2023-06-14 08:33:51 +02:00
hnil
b50cef1af2 added fix based on review 2023-06-13 14:39:42 +02:00
hnil
f8d652f758 - fixed missing return after adding change 2023-06-13 14:39:42 +02:00
hnil
d0422bfc74 -- added bool return value of hysteresis update.
-- this make it possible to localy update intensive quanities if something changed.
2023-06-13 14:39:42 +02:00
Arne Morten Kvarving
39006ecd71 added: setters for the vappars in pvt classes 2023-06-01 11:03:20 +02:00
Tor Harald Sandve
a456c36a31 Merge pull request #3513 from goncalvesmachadoc/gasvisct
Implement GASVISCT for black-oil [Bug fix]
2023-05-30 08:37:46 +02:00
Arne Morten Kvarving
3e4146030e checkFluidSystem: improve output
as this is called multiple times for a fluidsystem
we get duplicate output. improve by also including the
other template parameters in the output.
2023-05-24 22:04:39 +02:00
Arne Morten Kvarving
9ba304f5cf BrineH2Pvt: include prerequisite headers
in particular the missing header broke build with -DNDEBUG
2023-05-22 22:01:54 +02:00
Tor Harald Sandve
005ff3e982 Merge pull request #3445 from svenn-t/h2store
Hydrogen-brine simulations - H2STORE
2023-05-22 11:23:48 +02:00
Bård Skaflestad
c000ad101a Merge pull request #3517 from totto82/outputhyst
Add method to get trapped saturation for output
2023-05-19 09:56:36 +02:00
Bård Skaflestad
4308305421 Merge pull request #3433 from totto82/brine_co2store
Combine brine + co2store
2023-05-16 10:25:32 +02:00
Tor Harald Sandve
1aff5fc604 add test that compares Brine and BrineDynamic 2023-05-12 09:07:55 +02:00
Bård Skaflestad
6895568a21 Merge pull request #3507 from akva2/fix_dyneval_format
fixed: handle dynamically sized evaluations in {fmt} formatter
2023-05-11 21:27:32 +02:00
Arne Morten Kvarving
d599c6874d EclThermalConductionApproach: convert to enum class 2023-05-11 08:46:25 +02:00
Arne Morten Kvarving
7d38661810 EclSolidEnergyApproach: convert to enum class 2023-05-11 08:40:44 +02:00
Tor Harald Sandve
c3a3d894df Add method to get trapped saturation for output 2023-05-10 15:25:47 +02:00
goncalvesmachadoc
abaa1074ff implement gasvisct 2023-05-09 10:48:25 +02:00
Arne Morten Kvarving
392d57d02a fixed: handle dynamically sized evaluations in {fmt} formatter 2023-05-05 11:01:13 +02:00
Tor Harald Sandve
4f3b67fa77 use 58.44 as molar mass of salt 2023-05-04 09:48:03 +02:00
Tor Harald Sandve
46f5558b59 Combine brine and the co2store module
This commit allows for dynamically changes in salinity in the co2 storage module

I.e. It allows for modeling salt precipition for co2 storage cases.
2023-05-03 15:09:06 +02:00
Svenn Tveit
cf185442b9 Accommodate new Rvw input 2023-04-12 14:50:34 +02:00
Svenn Tveit
e8119e7adb Fix narrowing warnings 2023-04-12 14:28:02 +02:00
Svenn Tveit
620008ac06 Throw runtime error and comment out unused input.
Should fix return-type and unused-parameter warnings.
2023-04-12 14:28:02 +02:00
Svenn Tveit
451a4d7657 Enable GAS/WATER with DISGASW in H2-brine PVT 2023-04-12 14:28:02 +02:00
Svenn Tveit
fb70d31ba0 Update to restructure and latest developments. 2023-04-12 14:28:02 +02:00
Svenn Tveit
423141eb30 Re-add information lost in rebase 2023-04-12 14:28:02 +02:00
Svenn Tveit
9ae33902f1 rsSat=0 when DISGAS is disabled.
See commit: d546a8bb9c2fb4ed1697dab1878b8de3a81a26bc
2023-04-12 14:28:02 +02:00
Svenn Tveit
816300e8f2 Lookup table for density instead of calculating it
Significant speed-up since we don't need to run bisection anymore!
2023-04-12 14:28:02 +02:00
Svenn Tveit
11ff66a4bd Accommodate for Rvw implementation.
See commit: 3a25016eb09b8c87d11ca172d5170b935c675bd2
2023-04-12 14:28:01 +02:00
Svenn Tveit
9d54988d14 Diffusion coefficient for H2.
NOTE: while the diffusion in pure water is based on experimental data, diffusion in brine is dubious at best (no experimental basis).
2023-04-12 14:28:01 +02:00
Svenn Tveit
c2e0ea5721 Accommodate for implementation of vaporized water.
See commit: e74901b63f5e5db938dfa5760c5ed72116d4451e
2023-04-12 14:28:01 +02:00
Svenn Tveit
1fe37f7b60 Correction in volume factor calculations.
See commit: 8c2f3f6f37c57f3d772f0ee4d4332f6a6f19f3bf
2023-04-12 14:28:01 +02:00
Svenn Tveit
066601ae52 Improved H2 property calculations.
Most H2 properties are calculated using Helmholtz free energy EOS.
Moved Helmholtz equations from Brine_H2 to H2 class.
New file with simple H2 property calculations based on ideal gas.
2023-04-12 14:28:01 +02:00
Svenn Tveit
ef94fb8896 Corrected unit errors.
Pressure in MPa and apparent molar volume in m3/mol.
2023-04-12 14:28:01 +02:00
Svenn Tveit
437ff4691d Calculate H2 mole fractions directly.
More robust bisection method to get reduced density.
Erroneous T_red (it was supposed to be the reciprocal red. temp.)
2023-04-12 14:28:01 +02:00
Svenn Tveit
4eaf199dbe Minor fixes to make it compile 2023-04-12 14:28:01 +02:00
Svenn Tveit
fa12917a6c Added missing conversion function 2023-04-12 14:28:01 +02:00
Svenn Tveit
f5d02c8049 Remove duplex gasViscosity 2023-04-12 14:28:01 +02:00
Svenn Tveit
f400b3b189 Brine-H2 PVT model To be used with H2STORE
Mostly copied CO2STORE and added specifications for brine-H2.
2023-04-12 14:28:01 +02:00
Svenn Tveit
337b24de87 Added hydrogen component.
Most of this is copied from Dumux with some additions and modifications.
2023-04-12 14:28:01 +02:00
Arne Morten Kvarving
dcd5ecf0d1 Merge pull request #3414 from akva2/require_dune_2.7
minimum dune version required is now 2.7
2023-04-12 09:19:14 +02:00
Kai Bao
548881395e add const for WaterPvtMultiplexer::waterReferenceDensity(unsigned) 2023-04-03 12:59:43 +02:00