Commit Graph
124 Commits
Author SHA1 Message Date
Arne Morten Kvarving 92fa9577da consistently use std::size_t 2023-08-15 09:32:10 +02:00
Svenn Tveit 161c895c63 Remove redundent check 2023-08-11 16:38:49 +02:00
Svenn Tveit b84837fc61 Moved water phase check outside loop 2023-08-11 15:34:31 +02:00
Svenn Tveit 8b6a504874 Enable aquifers in H2STORE oil/gas version 2023-08-11 13:23:57 +02:00
Arne Morten Kvarving a6aa80668a changed: explicitly instance with and without dune-fem
in preparation for making dune-fem typetag configurable
2023-08-10 13:44:08 +02:00
hnil 3442a549cd moved cd to xxx_impl.hh to avoid
this way we do not have to add explicit initiation of all
variants of grids and gridView iterators in the library
2023-08-08 15:36:08 +02:00
Bård Skaflestad 63d37bd6f2 Merge pull request #4723 from totto82/fixRvvd
Fix out of range rs/rv
2023-08-08 14:52:20 +02:00
Bård Skaflestad b39f2f20ee Merge pull request #4718 from vkip/num_pressure_points_equil
Adding --num-pressure-points-equil as a developer parameter
2023-06-30 12:45:39 +02:00
Tor Harald Sandve c72ae2c76c Fix out of range rs/rv/rvw 2023-06-27 12:41:35 +02:00
Bård Skaflestad a31f1cefd5 Merge pull request #4705 from totto82/guardAgainstinvalidRegions
Add guard against invalid satnum, pvtnum, imbnum, eqlnum
2023-06-26 14:29:01 +02:00
Tor Harald Sandve 40bd07a3b5 Add guard against invalid satnum, pvtnum, imbnum, eqlnum 2023-06-26 13:11:19 +02:00
Tor Harald Sandve bf5413d853 Use sqrt of numerical_limit epsilon instead of zero to check for non zero saturations
The reason is to make it more robust in terms of numerical noise.
2023-06-26 13:04:49 +02:00
Vegard Kippe 31ecb416be Adding default value to the InitialStateComputer constructor to avoid specifying the number of pressure points when using outside simulator (i.e., in testing..) 2023-06-22 16:53:08 +02:00
Vegard Kippe ea587d53b2 Adding --num-pressure-points-equil as a developer parameter (not visible to end users) 2023-06-22 14:58:09 +02:00
Svenn Tveit 264ac8e0c0 std::tuple to pair and revert unnecessary changes.
Minor changes according to review comments as well.
2023-06-15 15:03:03 +02:00
Svenn Tveit 745d8b5a97 Accommodate for PPCWMAX in SWATINIT equilibration 2023-06-14 08:35:14 +02:00
Tor Harald Sandve bbd65d8968 Merge pull request #4688 from plgbrts/equil-fix
Fix water evaporation initialization for two-phase gas-water system
2023-06-07 09:46:28 +02:00
Paul 2a668ec938 fix water evaporation initialization fo two-phase gas-water system 2023-06-06 10:39:26 +02:00
Tor Harald Sandve 4dcc655f4d Fix rvw and rv initialization 2023-06-02 15:27:03 +02:00
Tor Harald Sandve cd403e1ea0 initialize trivial rvw if no table is given 2023-05-11 12:50:24 +02:00
Arne Morten Kvarving 5f28175603 fix whitespace at eol
and some brace placements
2023-03-24 14:56:23 +01:00
hnil 3e1fe57e60 Refactoring to be able to use template class/methods even if they are not initiated 2023-03-15 16:46:42 +01:00
Atgeirr Flø Rasmussen 5979e34b9d Add explicit instantiation of cellZMinMax().
Otherwise one may have link problems on clang systems, the
reason for this is not quite clear.
2023-03-08 11:21:21 +01:00
Arne Morten Kvarving aaaf00f2fd adjust to timing macro header split 2023-03-01 13:18:16 +01:00
Arne Morten Kvarving 3745a4c02d clean up Units.hpp includes
include it where required instead of relying on other
headers to pull it in
2023-01-16 12:21:29 +01:00
Tor Harald Sandve 8d37ded703 Suppot EQUIL + WATER + GAS 2023-01-13 10:16:48 +01:00
Tor Harald Sandve 5854b8a7a1 Support gas dissolution in water (Rsw)
- adapt to interface change in waterPvt()
- add gas + water + disgasw simulator

Note
- MSW is not supported
- EQUIL initialization is not supported
2022-12-21 13:13:52 +01:00
Elyes Ahmed d6cbeb8b2b minor 2022-09-23 13:32:58 +02:00
Elyes Ahmed e05af09c43 cleaning 2022-09-23 13:28:04 +02:00
Elyes Ahmed 709a90b67d some fixes for flow_alugrid 2022-09-23 11:59:01 +02:00
Kai Bao 3bed5f41c1 for the cells having zero thickness
we use the cell center depth to do the equilibration
2022-09-23 09:59:52 +02:00
Paul Egberts 7ca6e2a25e Update equilibrationhelpers.hh
removed obsolete comment
2022-09-14 14:11:19 +02:00
Paul Egberts 29dec2686a Update initstateequil.hh
removed obsolete comment
2022-09-14 14:08:40 +02:00
Paul Egberts c2cac1b183 added equilibration option for water in gas 2022-09-13 18:02:33 +02:00
Paul Egberts a8aa12f0a2 added evaporated water dependency of gas density in equil calculations 2022-09-12 16:02:35 +02:00
Paul Egberts 1c70b5beea Equilibration with water-gas ratio vs depth (RVWVD) table 2022-09-05 09:59:16 +02:00
Arne Morten Kvarving 6ed8a38ba5 changed: consistently use std::array 2022-08-16 08:38:54 +02:00
Atgeirr Flø Rasmussen 03352ff0fc Fix missing angle bracket. 2022-08-15 11:29:26 +02:00
Arne Morten Kvarving f57383f416 initstateequil: make it a private template 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving 54cf35e821 equilibrationhelpers: make templates private 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving b399f72777 changed: avoid typetag dependence in equil initializer 2022-08-11 15:27:38 +02:00
Elyes Ahmed 5c2b60bcd0 rebasing 2022-07-28 20:40:34 +02:00
Kai Bao 26a9582ece Merge pull request #3911 from GitPaean/fixing_numerical_aquifer_equil
Fixing equilibration when having numerical aquifers.
2022-05-26 22:09:32 +02:00
Paul Egberts a255613452 Merge branch 'master' into vapoilwat 2022-05-11 11:55:54 +02:00
Kai Bao 78bd95c593 also update cellZSpan_ and cellZMinMax
when updating cell center depth due to numerical aquifer cells.
2022-05-05 15:01:09 +02:00
Tor Harald Sandve af95a3f22b fix density in initialization for case without DISGAS 2022-04-12 11:31:17 +02:00
Paul Egberts ab3be6dce4 adjustments to account for vaporized water 2022-04-08 22:36:39 +02:00
Tor Harald Sandve 0c9bb3990e Merge pull request #3830 from plgbrts/vapwat
Adding explicit input specification of water-gas ratio (RVW) and RVW output plus simulator gas-water system with salt precipitation and water evaporation for
2022-04-07 09:03:26 +02:00
Tor Harald Sandve 82099705ac fix initialization EQUIL + water and gas 2022-03-11 12:38:38 +01:00
Paul Egberts 797fdc278b water-gas ratio input and output plus simulator for salt precipitation and water evaporation 2022-03-01 20:52:43 +01:00