OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 14:51:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,766 Commits 24 Branches 102 Tags 90 MiB
0a70d95bee
Commit Graph

11766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alf Birger Rustad
a20f9a1036 Increase tolerances to make restart and parallel tests go through 2020-09-22 17:36:33 +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
Joakim Hove
3d28fe25a0
Merge pull request #2799 from joakim-hove/add-include-exception 
Add #include <opm/common/Exceptions.hpp>
 2020-09-21 23:30:23 +02:00
Markus Blatt
e5f4971d58 CentroidsPropsDatahandle Use emplace_back for saving pair 2020-09-21 21:30:51 +02:00
Kai Bao
897fc77a1d
Merge pull request #2791 from GitPaean/increasing_maxIter 
increasing maxIter to 1000 for function satFromPc
 2020-09-21 21:18:20 +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
Tor Harald Sandve
ae95570693 output temperature when TEMP is set 2020-09-21 15:35:55 +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
Atgeirr Flø Rasmussen
04732f596b
Merge pull request #2794 from bska/prepare-nodepress-smry-output 
Chase Group/Node Summary API Update
 2020-09-21 09:21:46 +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
Kai Bao
775793676c increasing maxIter to 1000 for function satFromPc 
it is a temporary fix to make some parallel running easier. We need to
change it manually to make some parallel running pass.
 2020-09-17 20:59:58 +02:00
Markus Blatt
fd2a0d8a7d Deserialize TranCalculator also on master 2020-09-17 20:28:17 +02:00
Markus Blatt
6d8621e4df Use TranCalculator to update transmissibilities. 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
Bård Skaflestad
6a592a8c55
Merge pull request #2789 from joakim-hove/keywordlocation 
Rename Location -> KeywordLocation
 2020-09-16 23:35:46 +02:00
Joakim Hove
1b0cc8d2ad Rename Location -> KeywordLocation 2020-09-16 21:07:18 +02:00
Alf Birger Rustad
345597f5f7 Enable drift compensation 2020-09-16 16:09:14 +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
1b626ead49 add serialization test for Opm::Network::Node 2020-09-16 08:47:06 +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
Bård Skaflestad
fdb035894d
Merge pull request #2726 from bska/guiderate-efac-accum 
Include All Pertinent EFACs In Guiderate Potential Updates
 2020-09-15 15:15:08 +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
Bård Skaflestad
79f2908277
Merge pull request #2782 from totto82/fixOilWater 
Fix oil water for MSW
 2020-09-14 20:00:09 +02:00
Markus Blatt
921e154972 use EXIT_FAILURE to indicate problems whem exiting. 2020-09-14 19:17:55 +02:00
Tor Harald Sandve
2f37742c21 add model6 to update ref 2020-09-14 15:56:48 +02:00
Tor Harald Sandve
8c69741bd5 rename test case for model6 2020-09-14 15:53:37 +02:00
Bård Skaflestad
e4878addb4
Merge pull request #2727 from totto82/fixUnitSalt 
fix output unit salt
 2020-09-14 15:46:11 +02:00
Tor Harald Sandve
c2c009ecb6 clean-up based on review 2020-09-14 15:42:48 +02:00
Tor Harald Sandve
d930cc8ad4 add 2p+msw test case 2020-09-14 15:14:22 +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
Tor Harald Sandve
bcc0a1be69 only output connection saturation for existing phases 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
Bård Skaflestad
c219b61c65
Merge pull request #2767 from joakim-hove/summary-reg 
Started to support summary regions
 2020-09-14 11:54:19 +02:00