OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-07 23:13:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,853 Commits 24 Branches 102 Tags 86 MiB
e2909958c8
Commit Graph

1758 Commits

Author SHA1 Message Date
Markus Blatt
5553d2d1f3 Renamed variables/functions for number of cells. 2020-10-05 20:02:13 +02:00
Markus Blatt
ca8de16285 Fixes parallel computation of average formation factors. 
This was using the sum of the sum of all cells of the partitions.
Hence the shared cells were counted twice.
 2020-10-05 14:08:59 +02:00
Arne Morten Kvarving
c888410a07 avoid usage of property system macros 2020-10-05 09:01:58 +02:00
Atgeirr Flø Rasmussen
f6569b6a4f
Merge pull request #2832 from alfbr/improve-output 
Improve output
 2020-10-05 08:49:09 +02:00
Alf Birger Rustad
958f368ce7 indent 2020-10-03 12:25:47 +02:00
Alf Birger Rustad
207d2678fa Fix indent 2020-10-03 12:23:46 +02:00
Alf Birger Rustad
5a8f274c36 Typo and white space 2020-10-03 12:21:05 +02:00
Håkon Hægland
c0b493c4ce Fix inconsistent-missing-override warnings 2020-10-03 10:43:09 +02:00
Alf Birger Rustad
3204b55a35 Forgot two 2020-10-02 15:20:23 +02:00
Alf Birger Rustad
885c182b7e Added one more decimal for hundreds of a second. 2020-10-02 15:13:41 +02:00
Tor Harald Sandve
165fa96250
Merge pull request #2824 from hakonhagland/gas_lift3 
Implements support for gas lift optimization.
 2020-10-02 14:48:27 +02:00
Alf Birger Rustad
3832be4f28 Typo 2020-10-02 14:27:51 +02:00
Alf Birger Rustad
a25868dc52 Untabify and add three missing parantheses 2020-10-02 14:26:09 +02:00
Alf Birger Rustad
9e89883aec Allow more digits in simulation time 2020-10-02 14:18:06 +02:00
Alf Birger Rustad
a081394f32 Fixed alignement 2020-10-02 14:06:25 +02:00
Kai Bao
ed89f25d1b providing the aquifer data for summary output 2020-10-02 13:13:20 +02:00
Alf Birger Rustad
7cebf7fb5a Added space 2020-10-02 12:48:35 +02:00
Alf Birger Rustad
e68db6dbda Converted to fmt formatting 2020-10-02 12:46:45 +02:00
Håkon Hægland
a5ac74082a Avoid unused variable warning. 
The control_mode is unused if not build in debug mode since the assertion
will be skipped.
 2020-10-02 11:17:48 +02:00
Alf Birger Rustad
845eb17d28 Formatted seconds and percent in final report. 2020-10-02 09:31:49 +02:00
Alf Birger Rustad
d36069c759 Remove confusing progress message. 2020-10-02 09:04:26 +02:00
Kai Bao
49eb111225 adapting to the interface change of SummaryConfig 2020-10-01 23:32:21 +02:00
Alf Birger Rustad
90b2e8b8ef Compacted time step report 2020-10-01 22:42:20 +02:00
Markus Blatt
ec884183a5
Merge pull request #2828 from blattms/add-mswells 
[opencl] deletes assignment operator of WellContributionsOCLContainer
 2020-10-01 22:35:09 +02:00
Markus Blatt
e8c030be17
Merge pull request #2821 from ducbueno/add-mswells 
Reintroduced multisegment wells to OpenCL backend
 2020-10-01 21:52:25 +02:00
Håkon Hægland
52f6f819ee Simplified using fmt::format() 
Simplified debug output formatting by using fmt::format(). Also switched
off glift debug output by default.
 2020-10-01 18:40:05 +02:00
Markus Blatt
684b58564c use auto in for-loop as at other occasions. 2020-10-01 15:56:50 +02:00
Markus Blatt
f306f78737 Delete assignment operator of WellContributionsOCLContainer, too 2020-10-01 15:55:57 +02:00
Jose Eduardo Bueno
fbbb21d482 Removed smart pointers; + delete for copy constr 2020-10-01 10:27:34 -03:00
Tor Harald Sandve
6b3a64bd40 add options for timestepping 2020-10-01 14:46:58 +02:00
Arne Morten Kvarving
7ffceeba57 fixed: make some indices constexpr 
also use the bool conditions for conditional deref'ing with the indices.
this helps avoid maybe uninitialized warnings with gcc
 2020-10-01 11:46:31 +02:00
Jose Eduardo Bueno
89cefd8d95 Fixed seg fault when there are only mswells 2020-09-30 18:34:50 -03:00
Jose Eduardo Bueno
7aad035bcf Added smart pointers 2020-09-30 17:31:35 -03:00
Markus Blatt
d30f6d272b [gpu] Support UMFPack with DUNE 2.7 
The index type changed from int to long int with 2.7.
 2020-09-30 20:10:21 +02:00
Jose Eduardo Bueno
3a680f728e Removed unnecessary vector clear operations 2020-09-30 09:14:20 -03:00
Jose Eduardo Bueno
99e4419b3c Reintroduced multisegment wells 2020-09-30 09:11:20 -03:00
Håkon Hægland
a01ae8a64c Removed unnecessary code. 
Forgot to remove this call after refactoring.
 2020-09-30 12:13:01 +02:00
Arne Morten Kvarving
36a42c0685 remove unused variables 2020-09-30 10:12:33 +02:00
Håkon Hægland
d707967f58 Implements support for gas lift optimization. 
Implements gas lift optimization for a single StandardWell. Support for
gas lift optimization for multi-segment wells, groups of wells and
networks is not implemented yet.

The keywords LIFTOPT, WLIFTOPT, and VFPPROD are used to supply parameters for
the optimization. Also adds support for summary output of liftgas
injection rate via keyword WGLIR.
 2020-09-30 10:04:39 +02:00
Markus Blatt
c26aefdd5b
Merge pull request #2816 from ducbueno/new-opencl-stdwell 
New standard well implementation for the OpenCL backend
 2020-09-30 09:32:19 +02:00
Jose Eduardo Bueno
a3a15a744c Corrected kernel 2020-09-28 18:06:13 -03:00
Jose Eduardo Bueno
9fe6ee85a4 Throws exception if well dimensions aren't correct 2020-09-28 18:01:42 -03:00
Jose Eduardo Bueno
268bcd95e8 Implemented reinit; reduced sync events 2020-09-28 17:27:12 -03:00
Jose Eduardo Bueno
bedf3d16cf Querying number of work items with get_local_size 2020-09-28 12:56:22 -03:00
Joakim Hove
0092ef0cf0 Pass location to ParseContext.handleError() 2020-09-28 16:58:37 +02:00
Joakim Hove
5985dee574
Merge pull request #2813 from joakim-hove/flow-exceptions 
Flow exceptions
 2020-09-28 16:57:02 +02:00
Jose Eduardo Bueno
77bcadff45 Events wellContribs write calls & update sparsity 2020-09-28 09:40:39 -03:00
Jose Eduardo Bueno
d653873735 Added destructor for WellContributionsOCLContainer 2020-09-28 09:15:17 -03:00
Atgeirr Flø Rasmussen
64f9f1431b
Merge pull request #2809 from GitPaean/fixing_ct_aquifer 
fixing the initialization of aquifer pressure for CT aquifer
 2020-09-28 12:28:02 +02:00
Joakim Hove
a755a2d056 Do not print error message when flow exits 2020-09-28 11:03:45 +02:00
Joakim Hove
76f57f5a1d Catch OpmInputError in addition to std::exception 2020-09-28 11:03:45 +02:00
Joakim Hove
0b5134521e Add inline fmtlib code in source tree 2020-09-28 11:01:13 +02:00
Atgeirr Flø Rasmussen
e8460b384e
Merge pull request #2804 from totto82/updateAndInvalid 
Invalidate and update the intensive quantities at the same time
 2020-09-28 09:02:25 +02:00
Atgeirr Flø Rasmussen
b5c5c28c16
Merge pull request #2788 from alfbr/new-defaults 
New numerical defaults
 2020-09-28 08:57:08 +02:00
Jose Eduardo Bueno
d236079173 Bug fixes 2020-09-25 11:31:17 -03:00
Jose Eduardo Bueno
ab57d5ecd2 Fixed errors 2020-09-24 18:07:10 -03:00
Jose Eduardo Bueno
1ba81cece2 First commit 2020-09-24 16:35:36 -03:00
Jose Eduardo Bueno
c43648076f Fixed kernel; fixed time step chopping; 2020-09-24 16:35:36 -03:00
Jose Eduardo Bueno
c41aafcc58 Simplified initialize_wellContribs calls 2020-09-24 16:35:36 -03:00
Kai Bao
fd3287cdd3 removing the duplication of calculateReservoirEquilibrium 
in the aquifer models.
 2020-09-24 16:09:56 +02:00
Kai Bao
91ec74dffc fixing the initialization of aquifer pressure for CT aquifer 2020-09-24 15:37:31 +02:00
Joakim Hove
2c447ae829
Merge pull request #2805 from akva2/serializer_optional 
Optional support in eclmpiserializer
 2020-09-24 07:33:16 +02:00
Arne Morten Kvarving
f846bbe959 remove Mpi::pack handling for GPMaint 
this is not implemented, and should go through the
serializer support
 2020-09-23 12:23:30 +02:00
Tor Harald Sandve
85e25f7e0e Invalidate and update the intensive quantities instead of just invalidate them 2020-09-23 11:39:04 +02:00
Atgeirr Flø Rasmussen
237b281f09
Merge pull request #2802 from blattms/refactor-defunct-wells 
Refactored how well information is exported after load balancing.
 2020-09-23 08:54:35 +02:00
Markus Blatt
1d94357558 Refactored how well information is exported after load balancing. 
Previously, we exported an unordered map containing all names of
wells that are not present in the local part of the grid.

As we envision to have wells that are distributed across multiple
processors, this information does not seem to be enough. We need
to be able to set up communication for each well. To do this we need
to find out who handles perforations of each well.

We now export a full list of well name together with a boolean
indicating whether it perforates local cells (vector of pair of string
and bool).
 2020-09-22 20:04:01 +02:00
Markus Blatt
779c7f6012
Merge pull request #2793 from blattms/fix-tran-application 
Fixes application of transmissibility modifiers from the edit section.
 2020-09-22 19:56:16 +02:00
Atgeirr Flø Rasmussen
68add695fe
Merge pull request #2735 from hakonhagland/python_step2 
Implements a Python step() method.
 2020-09-22 15:47:48 +02:00
Markus Blatt
a4ea6e9658
Merge pull request #2792 from atgeirr/fewer-mpi-sums 
Rewrite communicateGroupRates() to do a single sum().
 2020-09-22 07:51:34 +02:00
Markus Blatt
e5f4971d58 CentroidsPropsDatahandle Use emplace_back for saving pair 2020-09-21 21:30:51 +02:00
Joakim Hove
c059653fa0 Add #include <opm/common/Exceptions.hpp> 2020-09-21 19:25:52 +02:00
Joakim Hove
cc6abb4086
Merge pull request #2796 from joakim-hove/rm-exceptions 
Remove unused #include of exceptions
 2020-09-21 16:33:19 +02:00
Joakim Hove
d9465907be
Merge pull request #2795 from joakim-hove/remove-sim-container 
Remove references to unused class SimulationDataContainer
 2020-09-21 11:16:37 +02:00
Joakim Hove
0565d6f402 Remove unused #include of exceptions 2020-09-21 11:12:15 +02:00
Joakim Hove
9809dcc804 Remove references to unused class SimulationDataContainer 2020-09-21 07:16:11 +02:00
Bård Skaflestad
fde3c476c3 Chase Group/Node Summary API Update 
This is in preparation of adding support for outputting the network
node pressure quantity, GPR, to the summary file.  In particular,
'GroupValues' is renamed to 'GroupAndNetworkValues' and has new
individual datamembers for the former group-level data and the new
node-level data.

Update BlackoilWellModel::groupData() and CollectToIORank
accordingly and bring the parallel restart facility in line with the
new layout.
 2020-09-20 22:26:07 +02:00
Markus Blatt
99f74cad96 FieldData and TranCalculator are now in Fieldprops namespace. 2020-09-18 15:01:17 +02:00
Atgeirr Flø Rasmussen
8dffd39b0a Rewrite communicateGroupRates() to do a single sum(). 2020-09-18 09:50:41 +02:00
Markus Blatt
abff765c1d Also query unsupported field data for the TransCalculator. 
FiedlPropsManager::keys() list the FieldProperties needed by the
TransCalculator, but these cannot be queried the normal way as this
raises exceptions and results in a deadlock. Hence we use the new
funtionality to get also the unsupported ones, by passing true to
get_double_field_data.
 2020-09-17 22:23:04 +02:00
Markus Blatt
fd2a0d8a7d Deserialize TranCalculator also on master 2020-09-17 20:28:17 +02:00
Markus Blatt
5987eae7d5 Add TranCalculator functionality to ParallelFieldPropsManager 2020-09-17 19:49:38 +02:00
Markus Blatt
9b997aea8c Use FieldData in ParallelEclipseState. 
We will need the values_status for the TranCalculator in parallel.
 2020-09-17 19:49:38 +02:00
Alf Birger Rustad
2e2bad179d New default tuning parameters based on pore volume 2020-09-16 15:58:14 +02:00
Atgeirr Flø Rasmussen
0816e21846
Merge pull request #2787 from akva2/fix_optional_deserialization 
Fix optional deserialization
 2020-09-16 09:41:53 +02:00
Arne Morten Kvarving
4160c6ce98 fixed: deserialization for std::optional<T> 
just writing the data does not update the has_value as expected
 2020-09-16 08:47:06 +02:00
Joakim Hove
d5bc4d539c Distribute transmissibility calculator of the FieldPropsManager 2020-09-15 17:15:03 +02:00
Arne Morten Kvarving
76c63c4405 changed: hide internal method 2020-09-15 10:51:57 +02:00
Bård Skaflestad
e8582ce476 Include All Pertinent EFACs In Guiderate Potential Updates 
This commit switches the helper function

    WellGroupHelpers::updateGuideRateForGroups<>()

to include efficiency factors in the potential rates at grouptree
levels below a particular group.  We furthermore switch the helper
function

    WellGroupHelpers::updateGuideRatesForWells<>()

to not include efficiency factors at all.

The motivation for this change is that efficiency factors always
apply to the level we're accumulating rate values into rather than
to the rate values themselves.
 2020-09-15 09:44:52 +02:00
Bård Skaflestad
453dec3e26
Merge pull request #2785 from blattms/improve-parallel-deck-error-handling 
Improves error handling and reporting in parallel.
 2020-09-15 09:06:43 +02:00
Markus Blatt
58fdf300df Use std::exit(EXIT_FAILURE) 
Somehow this reappeard druing refactoring.
 2020-09-15 08:36:20 +02:00
Markus Blatt
cd74796004 Refactored to only check once for errors in parallel. 
This simplifies the code a lot (less `#if HAVE_MPI`) and there seems
to be not reason not to.
 2020-09-15 08:27:04 +02:00
Markus Blatt
d413a2c960 Perform checkArrayDimension only on rank 0. 2020-09-15 08:26:23 +02:00
Markus Blatt
921e154972 use EXIT_FAILURE to indicate problems whem exiting. 2020-09-14 19:17:55 +02:00
Tor Harald Sandve
c2c009ecb6 clean-up based on review 2020-09-14 15:42:48 +02:00
Tor Harald Sandve
1a7b617074 guards against non-exsisting phases 2020-09-14 14:44:16 +02:00
Tor Harald Sandve
a323487b3b Fix the equation index for 2p oil-water simulations 2020-09-14 14:44:16 +02:00
Markus Blatt
519e4ac002 Improves error handling and reporting in parallel. 
As the ErrorGuard also dumps warnings we now always dump
it (previously only on error) to get these messages in the
console.

If there are error encountered, we log a meaningful error
message (the real cause was missing previously) and do a
graceful exit after MPI_Finalize.
 2020-09-14 12:53:02 +02:00
Alf B. Rustad
d0c110e935 Removed duplicated OPTIONS 2020-09-13 23:15:01 +02:00
Alf B. Rustad
1b05ed1199 Removed OPERATER and OPERNUM since they are supported. 2020-09-13 22:40:20 +02:00
Atgeirr Flø Rasmussen
76384344ca
Merge pull request #2777 from GitPaean/adding_well_assembly_timing 
adding timing for the well assembly
 2020-09-08 16:02:16 +02:00