OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,429 Commits 24 Branches 101 Tags 76 MiB
ef12186d78
Commit Graph

1105 Commits

Author SHA1 Message Date
Joakim Hove
edb2c4abb2
Merge pull request #3549 from joakim-hove/serialize-set 
Add serializer support for set - closely modelled after map
 2021-09-27 13:47:15 +02:00
Markus Blatt
88ae5b5963
Merge pull request #3545 from blattms/fix-parallel-try-catch 
[bugfix] Fix deadlocks because of parallel try-catch for some CO2 storage cases
 2021-09-27 13:02:34 +02:00
Joakim Hove
1b7ef65509 Add serializer support for set - closely modelled after map 2021-09-24 18:55:54 +02:00
Markus Blatt
e0f7b082c1
Merge pull request #3542 from blattms/unordered_map-compressed2cartesian 
Save space for cartesianToCompressed mapping.
 2021-09-24 10:24:34 +02:00
Markus Blatt
3cda8a2fdb Added missing parallel try-catch clause for updatePrimaryIntensities. 
As Problem::updatePrimaryIntensities might throw we need to do this
to prevent dealocks in parallel run in case problem occurs.
 2021-09-24 09:25:44 +02:00
Bård Skaflestad
1dc3832966
Merge pull request #3540 from hakonhagland/python_set_sched 
Initialize blackoil simulator from Opm::Schedule shared with Python.
 2021-09-23 13:32:31 +02:00
Håkon Hægland
4c5245196b Changed calling convention for shared pointers. 
Expect non-reference type shared pointers arguments instead of references
to shared pointer. This will make it clear to the caller that the called
function is making a copy of the pointer for its own use and not trying
to modify the original pointer of the caller.
 2021-09-22 23:49:13 +02:00
Bård Skaflestad
512f4c95b1
Merge pull request #3532 from totto82/aqnumco2store 
combine co2store and numerical aquifers
 2021-09-22 21:42:29 +02:00
Markus Blatt
33645cb4f6 Save space for cartesianToCompressed mapping. 
For 10 Million cell problems my compute server (with 128 GB Ram)
starts to swap, when I use debugging tools in parallel runs. I assume
that this might get an issue for others, too.

Now we consistently use unordered_map for the mapping.
 2021-09-22 10:23:50 +02:00
Håkon Hægland
5ad65c70ee Initialize blackoil simulator from schedule shared with Python. 
Adds a new constructor to Main.hpp that takes shared pointers to Deck,
EclipseState, Schedule, and SummaryConfig. This makes it possible to
share these variables with Python without worrying about lifetime issues
of the underlying C++ objects. For example, a Python script can first
create an opm.io.schedule.Schedule object which is modified from Python.
Then, assume the same Python script creates an
opm.simulators.BlackOilSimulator which is initialized with the same
schedule object. Since the underlying C++ object is a shared pointer,
the Schedule object in Python may go out of scope (get deleted by Python)
without having the C++ schedule object being deleted. And the Python
BlackOilSimulator may continue to be used after the Python Schedule object
has been deleted since it still has a valid C++ schedule object.
 2021-09-21 15:52:59 +02:00
Joakim Hove
357540bfca Create Action::State external to the vanguard 2021-09-19 10:17:58 +02:00
Tor Harald Sandve
10480b4f8f combine co2store and numerical aquifers 2021-09-17 16:05:26 +02:00
Bård Skaflestad
1dc9cf755e
Merge pull request #3492 from blattms/dune-2.8 
Fixes and removes deprecation warnings for Dune 2.8
 2021-09-14 21:11:25 +02:00
Joakim Hove
e16e721003 Eavluate all UDQ ASSIGN statements at the start of report step 2021-09-13 15:18:44 +02:00
Markus Blatt
8abf2159c4 Support Dune 2.8 version of MultipleCodimMultipleGeomTypeMapper 
Drop removed second template parameter from
MultipleCodimMultipleGeomTypeMapper (there is a defaultsince 2,6
nd now it is gone alltogether)
 2021-09-13 12:27:56 +02:00
Markus Blatt
e6c8f6985c Remove some shawowed variable warnings. 2021-09-13 12:08:13 +02:00
Cintia Goncalves Machado
d551e0579b fix rebase error 2021-09-09 13:41:08 +02:00
Cintia Goncalves Machado
0debc207fc fix if 2021-09-09 13:20:19 +02:00
Joakim Hove
7cb0bb5ae6 Improve error message for invalid phase id 2021-09-01 14:26:56 +02:00
Cintia Goncalves Machado
637a3431fd outputFSIP 2021-08-26 18:33:49 +02:00
Bård Skaflestad
21750a9eac
Merge pull request #3398 from goncalvesmachadoc/outputVolume 
Add FIPRESV
 2021-08-26 10:21:31 +02:00
Cintia Goncalves Machado
21e3e4dc81 use Saturation to compute vol 2021-08-25 18:24:05 +02:00
Joakim Hove
5a721b8cd2 Remove WellMap from WellState 2021-08-24 13:25:02 +02:00
Joakim Hove
755de65eb4 Use SingleWellState to manage well surface rates 2021-08-24 12:46:24 +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
ed3ea9fa49 Don't Assign Restart Rs/Rv Unless O/G Both Active 
This enables running two-phase oil/water restart cases.
 2021-08-19 21:07:05 +02:00
Bård Skaflestad
fdf3ae83ac
Merge pull request #3482 from joakim-hove/store-action-result 
Store the action result - when evaluated to true
 2021-08-19 20:59:35 +02:00
Joakim Hove
0da38ee7d0 Store the action result - when evaluated to true 2021-08-19 15:32:47 +02:00
Tor Harald Sandve
24bf13c26f
Merge pull request #3429 from akva2/remove_plain 
remove ebos_plain
 2021-08-19 14:11:27 +02:00
Tor Harald Sandve
31ac5378cf fix case where wells are shut behind our back 2021-08-19 13:08:33 +02:00
Torbjørn Skille
4e9a19cf7c Extra command line argument write-lodsmry for creating LODSMRY file 
- default is false
 - file LODSRMY optimized for fast loading of selected vectors
 2021-08-12 20:16:07 +02:00
Arne Morten Kvarving
d1a51569bc fix build 
need to include header for assert
 2021-08-12 15:11:55 +02:00
Arne Morten Kvarving
d99f642dff add collective communication to generic vanguard 2021-08-12 12:08:43 +02:00
Arne Morten Kvarving
23c2dd15aa remove ebos_plain 
the ebos well model is severely limited, I doubt
anyone would ever use this binary.
 2021-08-05 11:48:09 +02:00
Joakim Hove
ea4cf8d28f
Merge pull request #3428 from akva2/remove_altidx 
remove ebos_altidx
 2021-08-03 14:10:00 +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
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
b8b881d6e9 allow for water-gas system 2021-08-01 17:53:57 +02:00
Paul Egberts
ec4bb5c9c7 set gas saturation for water-gas system 2021-08-01 17:52:33 +02:00
Atgeirr Flø Rasmussen
38d68fbae4 Do not use C99 variable-length arrays. 2021-07-08 17:55:28 +02:00
Bård Skaflestad
cec3098c3a Don't Pass 'log' Argument to 'Schedule::rst_file' 
The function does not use that argument.
 2021-07-07 14:06:38 +02:00
Bård Skaflestad
2627a05c1e
Merge pull request #3433 from osae/tracerDefaultTrue 
Default activation of tracer model.
 2021-07-07 11:54:28 +02:00
Bård Skaflestad
e64574dfcf
Merge pull request #3430 from osae/tracerCrossFlow 
Some regularisation of tracer rate reporting.
 2021-07-07 00:32:53 +02:00
Ove Sævareid
738877fc1b Default activation of tracer model. 2021-07-06 17:06:10 +02:00
Arne Morten Kvarving
d13b413011 changed: replace code with data in restart output 2021-07-06 15:30:34 +02:00
Ove Sævareid
6db925189c Some regularisation of tracer rate reporting. 2021-07-06 12:54:16 +02:00
Arne Morten Kvarving
8443306fb6 remove ebos_altidx 
building a whole simulator for this, and then not even
running a test for it, seems rather excessive. if a test for
index-conformance is wanted, a better approach should be taken.
 2021-07-05 13:17:13 +02:00
Joakim Hove
528078e8e1 Assemble UDQState external to the vanguard 2021-07-01 08:24:59 +02:00
Bård Skaflestad
71de144399
Merge pull request #3239 from osae/tracer 
Tracer summary curves, collect well rates.
 2021-06-25 17:48:40 +02:00
Bård Skaflestad
5e883e562c Chase Type Specific Aquifer Data API Change 
This commit switches to using the new 'typeData' interface for
representing type-specific aquifer data items.  In particular we use
the new 'typeData.is<>()' and 'typeData.get<>()' member functions to
query and access the data that is specific to each aquifer type
(e.g., Carter-Tracy or numerical).

While here, also expand the reported data items for numerical
aquifers to one initial pressure value for each aquifer cell.  This
is needed for restart purposes.
 2021-06-25 09:58:27 +02:00