OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,350 Commits 24 Branches 102 Tags 84 MiB
36cec80269
Commit Graph

2740 Commits

Author SHA1 Message Date
Arne Morten Kvarving
9ebb315002 drop using statement for flowPhaseToEbosPhaseIdx 
rather qualify member function calls with this->
 2021-09-07 11:23:24 +02:00
Arne Morten Kvarving
35cc1b9a2a drop using statement for flowPhaseToEbosCompIdx 
rather qualify member function calls with this->
 2021-09-07 11:23:24 +02:00
Arne Morten Kvarving
48e282bd65 drop using statement for getAllowCrossFlow 
rather qualify member function calls with this->
 2021-09-07 11:23:24 +02:00
Markus Blatt
0aa60a6f7c
Merge pull request #3508 from akva2/drop_aliases 
drop aliases for Indices entries
 2021-09-07 11:22:26 +02:00
Tor Harald Sandve
adda160098 clean-up 2021-09-07 09:47:41 +02:00
Tor Harald Sandve
f497fa0fd7 add support for region = 0 i.e. field 2021-09-07 08:53:09 +02:00
Tor Harald Sandve
f9832d8830 split RateConverter 2021-09-07 08:53:09 +02:00
Tor Harald Sandve
9d2f26f7e8 Add support for gpmaint 2021-09-07 08:52:52 +02:00
Arne Morten Kvarving
a9b97d4286
Merge pull request #3507 from joakim-hove/add-runspec 
Add Runspec argument to restart loader
 2021-09-06 17:18:46 +02:00
Arne Morten Kvarving
86a3a1bac7 drop unused using statements 2021-09-06 15:48:41 +02:00
Arne Morten Kvarving
2b1ac22c99 drop aliases for Indices entries 
using Indices directly more clearly shows where the data comes
from without having to hop through hoops to do so.
 2021-09-06 12:49:01 +02:00
Joakim Hove
3e66fc9555 Add Runspec argument to restart loader 2021-09-04 19:35:53 +02:00
Joakim Hove
2b3f3bf630 Use Group instance to check for available controls 2021-09-02 22:23:21 +02:00
Arne Morten Kvarving
935ba190c9
Merge pull request #3503 from blattms/fix-seg-build 
[bugfix] Fix sequential run after #979
 2021-09-02 14:21:26 +02:00
Markus Blatt
598e9fa102 [bugfix] Fix sequential run after #979 
Definition of the communicator was moved inside a
`#if HAVE_MPI` there. This commit queries the
communicator again below to fix this.
 2021-09-02 13:12:23 +02:00
Bård Skaflestad
a8e8739feb
Merge pull request #3499 from blattms/fix-segfault-unknown-keyword-parallel 
[bugfix] Prevent segmentation fault for unkown keywords in parallel.
 2021-09-02 11:31:10 +02:00
Markus Blatt
edd6c6fe85 [bugfix] Prevent segmentation fault for unkown keywords in parallel. 
If there are unknown keywords and the parser throws an exception
then we nevertheless broadcasted the eclipseState and schedule.
Unfortunately, these might be null pointers in this case and
the serializer will run into a segmentation fault (e.g. when
serializing the non-existent TableManager)

Broadcasting is now only done if parsing was successful.
 2021-09-02 11:14:46 +02:00
Joakim Hove
bb23993556 Add GPMaint::State member to GroupState 2021-09-01 21:36:13 +02:00
Bård Skaflestad
fcdb4c33ea
Merge pull request #3496 from goncalvesmachadoc/radial 
add radial case to regression test
 2021-09-01 12:14:22 +02:00
Cintia Goncalves Machado
b675d86aa8 add radial to regression test 2021-09-01 00:13:02 +02:00
Joakim Hove
7bb3dba310 Special case wells with no open connections in ParallelWellInfo 2021-08-31 17:31:45 +02:00
Tor Harald Sandve
7c8a39fdb6 fix after rebase 2021-08-26 10:32:58 +02:00
Tor Harald Sandve
514c2a67a9 always compute potentials 2021-08-26 10:29:25 +02:00
Tor Harald Sandve
7e3cca1316 iterate to get more accurate potentials for stw wells 2021-08-26 10:29:25 +02:00
Tor Harald Sandve
c4c0173d2b
Merge pull request #3486 from totto82/handleTrivialGR 
always return fraction 1.0 if only one well is under group control
 2021-08-26 10:09:55 +02:00
Tor Harald Sandve
002256a045 return fraction 1.0 if only one well under group control even in cases where the guide rate is zero 2021-08-26 08:27:06 +02:00
Joakim Hove
1a02ac7bd5
Merge pull request #3487 from joakim-hove/single-well-state 
Single well state
 2021-08-25 14:27:41 +02:00
Arne Morten Kvarving
fc3e4ab5bc avoid unused variable warning 2021-08-25 08:28:57 +02:00
Joakim Hove
060eac4999 Add basic functionality for validating special case keywords 2021-08-24 13:50:40 +02:00
Joakim Hove
94d12e1230 Remove unused variable 2021-08-24 13:25:02 +02:00
Joakim Hove
5a721b8cd2 Remove WellMap from WellState 2021-08-24 13:25:02 +02:00
Joakim Hove
8f9e7d8e96 Add method PerfData::empty() 2021-08-24 12:46:24 +02:00
Joakim Hove
579aba8d08 Include perforation data in SingleWellState 2021-08-24 12:46:24 +02:00
Joakim Hove
46f45e3999 Add PerfData member to SingleWellState 2021-08-24 12:46:24 +02:00
Joakim Hove
8b652c821b Use SingleWellState for reservoir rates 2021-08-24 12:46:24 +02:00
Joakim Hove
755de65eb4 Use SingleWellState to manage well surface rates 2021-08-24 12:46:24 +02:00
Joakim Hove
8937c9cba9 Refactor sumWellRates to accept bool argument 2021-08-24 12:46:24 +02:00
Bård Skaflestad
725800cec7
Merge pull request #3488 from totto82/fixOnePhase 
guards for one-phase flow
 2021-08-24 12:20:52 +02:00
Tor Harald Sandve
0b1a909ee2 guards for one-phase flow 2021-08-24 12:06:03 +02:00
Tor Harald Sandve
8e23a2b88d
Merge pull request #3476 from totto82/changeDefaultInner 
Change default MaxNewtonIterationsWithInnerWellIterations to 8
 2021-08-24 10:29:03 +02:00
Joakim Hove
77a9fd352b Add SegmentState member to SingleWellState 2021-08-23 13:17:24 +02:00
Joakim Hove
67bd2fd333 Add productivity_index to SingleWellState 2021-08-23 12:05:26 +02:00
Joakim Hove
2f504536f4 Add well potentials to SingleWellState 2021-08-23 12:05:26 +02:00
Joakim Hove
e84eaa3179 Add dissolved_gas_rate and vaporized_oil_rate to SingleWellState 2021-08-23 12:05:26 +02:00
Joakim Hove
baeeb34508 Merge two perforation data members in WellState 2021-08-23 12:05:26 +02:00
Tor Harald Sandve
97d82cb97a
Merge pull request #3481 from totto82/fixTracer 
fix case where wells are shut behind our back
 2021-08-20 09:00:17 +02:00
Bård Skaflestad
ec264159b1 Load Analytical Aquifers from Restart File 
This commit activates the restart support for analytical aquifers.
Analytic aquifer keywords do not exist in the input file for
restarted runs since the 'SOLUTION' section is empty apart from from
the 'RESTART' specification.

We use the 'RestartIO::Aquifer' class to load the information from
the restart file and then assign this information to the
AquiferConfig object hosted by the EclipseState.  Loading Schedule
information from the restart file is still contingent on the
'--sched-restart=false' command line setting.
 2021-08-19 21:07:05 +02:00
Bård Skaflestad
bbb0c7f263 Add Restart Support for Numerical Aquifers 
We assign cumulative production only on the process that connects to
the reservoir model.  As a tiny optimisation, we return 0.0 early
as the aquifer flux on processes that do not connect to the
reservoir.
 2021-08-19 21:07:05 +02:00
Bård Skaflestad
a0af111bd8 Reduce Restarted Cumulative Volume if Aquifer Split 
If, in a restarted run, a single analytical aquifer object happens
to connect to the reservoir model from multiple separate MPI
processes we must not attribute the full historic cumulative water
production from the aquifer to each process.

This commit makes a rough estimate based on the connection areas of
how much of the total cumulative production is attributable to each
process and reduces the restart value using that fraction.  This is,
at best, a hack but it is currently the best we can do with the
information available in the restart files.  Complete fidelity will
entail tracking cumulative production at the connection level.
 2021-08-19 21:07:05 +02:00
Bård Skaflestad
913033b78f Add Restart Support to Carter-Tracy Analytical Aquifer 2021-08-19 21:07:05 +02:00
Bård Skaflestad
fde505562d Fetkovich: Load Water Density From Restart Source 
Needed to get proper gravity contributions in restarted runs.
 2021-08-19 21:07:05 +02:00
Tor Harald Sandve
295f41ba2b
Merge pull request #3464 from totto82/fixGEFF 
Fixes related to GEFAC
 2021-08-19 19:06:55 +02:00
Tor Harald Sandve
31ac5378cf fix case where wells are shut behind our back 2021-08-19 13:08:33 +02:00
Bård Skaflestad
bee8ee1c00
Merge pull request #3461 from GitPaean/RateConverter_singlewater_phase 
consindering the situation of single water phase for RateConverter

Closes #3463.
 2021-08-19 10:52:01 +02:00
Tor Harald Sandve
bc70fd5540 This basically reverts changes applied in PR 3095. 
With this gefac is only applied with accumulating rates from the level below
 2021-08-19 08:16:25 +02:00
Tor Harald Sandve
0f58343c48 Change default MaxNewtonIterationsWithInnerWellIterations to 8 2021-08-18 08:41:37 +02:00
Bård Skaflestad
517db198f8 Report Guiderate Values in Strict SI Units 
The output layer expects its input values to be strictly SI, but we
know that the GuideRate container's values are in output units.
 2021-08-17 16:07:45 +02:00
Bård Skaflestad
6da47344a3 Record New Supported Keywords 
We recently added support for

  * RPTONLY
  * RPTONLYO
  * SUMTHIN
 2021-08-17 10:29:36 +02:00
Joakim Hove
581f571c9d Use SingleWellState for production and injection control 2021-08-15 09:07:39 +02:00
Joakim Hove
c381459804 Add Events member to SingleWellState 2021-08-15 09:03:14 +02:00
Joakim Hove
379e938ee1 Add status to SingleWellState 2021-08-15 09:03:14 +02:00
Joakim Hove
75eb65efb7 Use WellState::wells_ to infer well name 2021-08-15 09:01:21 +02:00
Joakim Hove
d5ab308fbd Add temperature to SingleWellState 2021-08-15 09:01:21 +02:00
Joakim Hove
1dd9b91ad3 Add member "bool producer" to SingleWellState 2021-08-15 09:01:21 +02:00
Joakim Hove
a54daf75e8 Add trivial class SingleWellState with bhp and thp 2021-08-15 09:01:21 +02:00
Arne Morten Kvarving
1ef981f35c use RAII for MPI initialization 2021-08-12 13:20:59 +02:00
Arne Morten Kvarving
d99f642dff add collective communication to generic vanguard 2021-08-12 12:08:43 +02:00
Tor Harald Sandve
ac4ee51a5f
Merge pull request #3465 from totto82/updateWTS 
Make sure potentials are computed in some corner cases
 2021-08-10 14:15:22 +02:00
Tor Harald Sandve
a8fa2d74ef
Merge pull request #3420 from totto82/removeDerivate 
remove derivatives from well rate computations
 2021-08-09 15:48:38 +02:00
Tor Harald Sandve
5cb81d36c9 re-compute potentials for pressure controlled wells with trivial rates 2021-08-09 13:41:50 +02:00
Tor Harald Sandve
cf61417b6d move update well test state to after potentials are calculated 2021-08-09 13:21:10 +02:00
Joakim Hove
2ac65d97d2
Merge pull request #3457 from akva2/janitoring 
mark variables [[maybe_unused]]
 2021-08-07 16:36:03 +02:00
Kai Bao
c85bc24f54 consindering the situation of single water phase for RateConverter 2021-08-05 00:13:13 +02:00
Joakim Hove
f01cf74591 Merge two perforation data members in WellState 2021-08-04 16:48:18 +02:00
Tor Harald Sandve
153cd678c6 Add a derivative free version of the well rate calculations 2021-08-04 11:32:50 +02:00
Arne Morten Kvarving
08e950686f use .empty() instead of .size() comparisons 2021-08-04 09:19:03 +02:00
Arne Morten Kvarving
8d40860b0b mark variables [[maybe_unused]] 2021-08-04 08:44:03 +02:00
Joakim Hove
1cbc096d20
Merge pull request #3450 from joakim-hove/small 
Small
 2021-08-03 18:08:33 +02:00
Joakim Hove
d5f2b02716 Check production and injection constraints separately 2021-08-03 14:39:39 +02:00
Joakim Hove
6542a62cc0
Merge pull request #3452 from joakim-hove/constraint-bug 
BUG? Make sure WellState injection control is updated
 2021-08-03 14:38:20 +02:00
Joakim Hove
ea4cf8d28f
Merge pull request #3428 from akva2/remove_altidx 
remove ebos_altidx
 2021-08-03 14:10:00 +02:00
Joakim Hove
c70f63b99b Make sure WellState injection control is updated 2021-08-03 13:54:59 +02:00
Tor Harald Sandve
43d129861f
Merge pull request #3454 from plgbrts/gw1 
adjustments needed for gas-water system
 2021-08-03 12:01:34 +02:00
Kai Bao
5e74466aed
Merge pull request #3445 from plgbrts/rateconvfixed 
Rateconvfixed
 2021-08-03 00:07:19 +02:00
Arne Morten Kvarving
78c5675daf changed: get rid of OPM_UNUSED macro usages 
prefer anonymous parameters or c++17 [[maybe_unused]]
 2021-08-02 14:55:41 +02:00
Paul Egberts
a80894d679 using if constexpr () 2021-08-02 13:39:55 +02:00
Paul Egberts
8e8f6c5ff2 fix compositionSwitchEnabled declaration. For gas-water it is disabled 2021-08-01 21:02:07 +02:00
Paul Egberts
70d43fbefc using has_wfrac(gfrac)_variable logic, In case of gas-water system GFrac is primary variable index 2021-08-01 20:51:28 +02:00
Paul Egberts
5be63a59e0 Introduction of has_wfrac(gfrac)_variables analogue to multisegmentwell implementation 2021-08-01 20:40:04 +02:00
Paul Egberts
367c762a06 moved WFrac, GFrac definition to StandardWellEval.hpp 2021-08-01 20:36:05 +02:00
Paul Egberts
d5653d9ca2 removed exit failure for gas-water system 2021-08-01 18:11:56 +02:00
Paul Egberts
e25b78f106 fix for relative change calculation for gas-water system 2021-08-01 18:09:54 +02:00
Joakim Hove
e01910adc2 Add methods WellState::size() and WellState::producer() 2021-07-26 14:21:50 +02:00
Joakim Hove
a39fcc9708 Set WellState::thp when loading restart file 2021-07-26 13:07:12 +02:00
Joakim Hove
057db0ec0e Add method WellState::name() 2021-07-26 13:07:12 +02:00
Paul Egberts
0efe03497a some clean up 2021-07-23 16:41:50 +02:00
Paul Egberts
92f7b19594 delete head message 2021-07-23 16:41:50 +02:00
Paul Egberts
a813d9e875 fix for the situation that hydrocarbon consist only of gas 2021-07-23 16:41:50 +02:00
Markus Blatt
ea4e4a1520
Merge pull request #3346 from Tongdongq/amgcl-support 
Amgcl support
 2021-07-21 15:02:25 +02:00
Bård Skaflestad
48e1af8bbe Address Static Code Analysis Warnings 
In particular, don't print uninitialized memory (Reorder.cpp:left)
and don't capture objects ('prm') that aren't actually used.  While
here, refactor the initialization of the MT19937 random number
generator.  Constructing this object is too expensive to do for each
try, especially when we can just run the generator in place.
 2021-07-13 11:37:57 +02:00