OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,537 Commits 24 Branches 102 Tags
4b85fc74ae2a59c4a86c2d47de770b555291aa00
Commit Graph

1121 Commits

Author SHA1 Message Date
Joakim Hove
2c68f12769 Load WellTestState from restart file 2021-10-13 08:46:48 +02:00
Markus Blatt
cc1adf0b2a Merge pull request #3586 from blattms/tracer-use-well-container 
[refactor] Use well_container and PerforationData for tracers
 2021-10-12 09:55:33 +02:00
Bård Skaflestad
c7d7fa1146 Reset ACTNUM at EclipseState Level 
This method avoids resorting to const_cast tricks.
 2021-10-07 21:58:09 +02:00
Markus Blatt
d4ab9ea4b1 [refactor] Use well_container and PerforationData for tracers 
This saves some (expensive?) lookups that already have been done
in the well model. We had to make the well_container accessible from
the well model for this.

Using the perforation data will automatically make sure that the
perforations are not shut and reside on this process in a parallel run.
 2021-10-07 21:55:41 +02:00
Bård Skaflestad
c329d9cd00 Prune Deactivated Cells on All Ranks 
This commit broadcasts the 'removed_cells' to all ranks and uses
that array to delete any analytic aquifer connections that might
have been previously formed to those deactivated cells.  This is
needed to have a consistent view of which cells are connected to
analytic aquifers.
 2021-10-07 17:26:26 +02:00
Bård Skaflestad
f01777610f Adjust Whitespace and Rewrap Comments 
In preparation of distributing the 'removed_cells' to all ranks.
 2021-10-07 17:26:26 +02:00
Markus Blatt
011fb1034e Merge pull request #3571 from atgeirr/allow-non-world-comm 
Replacing use of MPI_COMM_WORLD with a variable communicator.
 2021-10-06 15:52:17 +02:00
Atgeirr Flø Rasmussen
e519bb32ec Use correct communicator in EclGenericVanguard::init(). 2021-10-06 08:51:31 +02:00
Elyes Ahmed
65f0e4e7f0 Replacing calling Communication with a header 2021-10-05 13:07:52 +02:00
Elyes Ahmed
0202b00d59 clean up after review 2021-10-05 13:07:52 +02:00
Elyes Ahmed
f53c597f90 Replacing use of MPI_COMM_WORLD with a variable communicator. 2021-10-05 13:07:52 +02:00
Tor Harald Sandve
033995ab8f Merge pull request #3565 from blattms/centroids-vanguard 
[refactor] Move cell centroid lookup magic to vanguard for reuse.
 2021-10-05 11:38:19 +02:00
Joakim Hove
dcd5fc76a0 Add WellTestState argument when calling IO routines 2021-10-04 21:30:27 +02:00
Markus Blatt
457d270bdf [refactor] Move cell centroid lookup magic to vanguard for reuse. 
In addition to transmissibilities We will need this for the tracers,
too, and should prevent code duplication.
 2021-10-04 09:47:03 +02:00
Joakim Hove
ac3748229a Collect WellTestState on IORank 2021-10-02 20:28:44 +02:00
Bård Skaflestad
2dedb62363 Serializer: Detect Existence of 'serializeOp' Member Function 
More direct test than looking for a 'serializeObject' member.
 2021-09-29 13:41:01 +02:00
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