Markus Blatt
83e05e7ba3
Effort to make the code documentation better.
2023-04-12 16:48:48 +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
c498234879
Re-added deleted code
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
6cb0070d8d
Bug fix: check for H2STORE keyword not CO2STORE
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
Svenn Tveit
2502e05a6f
Move H2STORE test below CO2STORE tests
2023-04-12 14:28:01 +02:00
Svenn Tveit
c7713c41f5
Added H2STORE keyword.
...
Activates H2-Brine PVT models in opm-material.
2023-04-12 14:28:01 +02:00
Bård Skaflestad
8473d9b8ec
Merge pull request #3469 from GitPaean/reverting_aquct_commit
...
checking all the instances of AQUCT and AQUFETP keywords
2023-04-12 14:26:15 +02:00
Bård Skaflestad
9bf9f65f63
Merge pull request #3466 from blattms/fix-compiler-warnings
...
Fix compiler warnings
2023-04-12 14:03:20 +02:00
Kai Bao
32e4384109
checking all the instances of AQUCT and AQUFETP keywords
...
with master branch, only the last instance will be caught for these two
keywords.
2023-04-12 13:37:18 +02:00
Bård Skaflestad
b9c1b39a61
Merge pull request #3468 from GitPaean/reverting_aquct_commit
...
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
2023-04-12 13:24:34 +02:00
Kai Bao
0eea937f3f
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
...
This reverts commit a89136f1f2
.
2023-04-12 12:39:24 +02:00
Markus Blatt
1bb2cbd646
Addressed review comments.
2023-04-12 12:26:39 +02:00
Arne Morten Kvarving
25da109206
bump version to 2023.10-pre
2023-04-12 11:31:55 +02:00
Markus Blatt
9f6122938d
Keep all NNCs when processing EDITNNCR.
...
Those might still be needed to correctly construct the connections
between cells in the grid. Skipping them will produce wrong grids.
2023-04-12 10:22:35 +02:00
Markus Blatt
1ff9100bdc
Fixed NNCTests.
2023-04-12 10:22:35 +02:00
Markus Blatt
5a19bcc4d0
Remove NNC entries that correcpond to EDITNNCR
...
No need to keep those as they will be overwritten anyway.
2023-04-12 10:22:35 +02:00
Markus Blatt
55a0078b3e
Simplify code by keeping track of insertion order of EDITNNCR imlicitly.
...
std::unique will keep the first occurrence and std::sort will keep
the order of equal elements. Hence we use a deque with the EDITNNCR
entries in reverse order (last one specified comes first). The we sort
this and make unique it unique.
2023-04-12 10:22:34 +02:00
Markus Blatt
f2ffebc814
Internalize EDITNNCR and make it available with the NNC information.
...
If there is an EDITNNCR entry and a NNC entry for the same cell pair
then the EDITNNCR entry is not be represented inernally but we simply
overwrite the transmissibility of the corresponding NNC entry.
If there is an EDITNNC entry and an EDITNNCR entry for the same cell
pair then the EDITNNC entry is removed while internalizing EDITNNCR.
Order matters for EDITNNCR entries in the sense that later specified
values will overwrite previous entries when we internalize.
Note that similar to EDITNNC only the first 7 options are represented
and the rest is ignored by OPM flow.
Note that EDITNNCR entries for neighboring cells are ignored (like for
EDITNNC).
2023-04-12 10:22:34 +02:00
Markus Blatt
fb3c2ab5a1
Removed unimplemented declaration of NNC::update_nnc.
2023-04-12 10:22:34 +02:00
Markus Blatt
c24aeceb96
Fixed EDITNNCR specification.
...
Item 7 is of dimension transmissibility.
Also added item numbers to all and comments about being unused where
it seemed appropriate.
2023-04-12 10:22:34 +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
Markus Blatt
888f3644f7
Fixed warning about muliline comment.
2023-04-11 17:42:17 +02:00
Markus Blatt
adc11caf99
Fixes warning about set but unused variable.
2023-04-11 17:42:17 +02:00
Markus Blatt
db1c823cbb
Fixes warnings about initialization order.
2023-04-11 17:42:17 +02:00
Markus Blatt
580bb30f8e
Fixes shadowed variable warning.
2023-04-11 17:35:13 +02:00
Markus Blatt
24d25f7be7
Merge pull request #3384 from plgbrts/well-traj
...
Grid independent well specification
2023-04-10 07:40:08 +02:00
Paul Egberts
694bb016a7
Two more small fixes
2023-04-05 15:58:17 +02:00
Kai Bao
9fdcfa3751
not forbidding WELOPEN wells with zero rate and disallowing crossflow
...
other keywords might change the control to make it openable.
2023-04-04 22:19:52 +02:00
Paul Egberts
e781a99ce4
update of license to only gplv3
2023-04-04 22:02:18 +02:00
Paul Egberts
a6d39275c7
code improvements following suggestions of Markus
2023-04-04 21:49:03 +02:00
Markus Blatt
df4c92a8d7
Merge pull request #3461 from blattms/MINPVFIL
...
Minpvfi
2023-04-03 17:45:46 +02:00