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
11,634 Commits 24 Branches 102 Tags 90 MiB
1b626ead49
Commit Graph

11634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arne Morten Kvarving
76c63c4405 changed: hide internal method 2020-09-15 10:51:57 +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
Joakim Hove
4be8240771 Support alternate FIPxxx regions in region summary keywords 
As part of support the RPR__xxx summary keywords the ecloutputblackoilmodule.hh
file hase been refactored significantly:

 - std::optional<> is used to manage the calculate once initial values.

 - several small functions are extracted from the outputFipLog() function.

 - std::array<> is used instead of ScalarBuffer to manage containers over all
   FipTypes.

 - SummaryConfig nodes for the requested summary output is stored in the class.

 - A small struct RegionSum is created to hold the region summed properties.
 2020-09-14 11:09:37 +02:00
Tor Harald Sandve
a32f6bbfa8 fix output unit salt 2020-09-14 08:40:24 +02:00
Bård Skaflestad
4b72b476b5
Merge pull request #2784 from alfbr/missing-features 
Removed OPERATER and OPERNUM since they are supported.
 2020-09-13 23:57:19 +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
Bård Skaflestad
09412bea62
Merge pull request #2776 from blattms/apply-all-multz 
Apply minimum of Z multiplier for PINCH(5)==ALL, Prepare for PINCH(5)==TOP
 2020-09-11 16:29:00 +02:00
Joakim Hove
03852825d5 White space change 2020-09-10 13:53:39 +02:00
Markus Blatt
c2362daae9 reactive applyMultipliers_(trans, outsideFaceIdx, ..) for PINCH(5)=ALL 
Should make the tests succeed.
 2020-09-10 10:20:17 +02:00
Joakim Hove
bbcbb14a62
Merge pull request #2780 from joakim-hove/add-pinch-barrier 
Add test of PINCH::ALL + MULTZ with a barrier
 2020-09-10 10:06:02 +02:00
Markus Blatt
06827bdd17 Apply only MULTZ+ in applyAllZMultipliers_, prepare for PINCH(5)=TOP 
For PINCH(5)==ALL, we take the minimum of MULTZ+ and ignore MULTZ-.
We also prepare for PINCH(5)==TOP taking only the toplevel MULTZ+
value.

For non-vertical directions we use both MULTZ+ and MULTZ-
 2020-09-10 09:12:34 +02:00
Joakim Hove
a920828b1c Add test of PINCH::ALL + MULTZ with a barrier 2020-09-10 09:04:31 +02:00
Bård Skaflestad
8033e8fc67
Merge pull request #2781 from blattms/fix_pinchmode_all_parallel_3 
fix insideCartElmIdx and outsideCartElmIdx order for faces in parallel (2)
 2020-09-09 23:30:24 +02:00
Markus Blatt
d2a2d5074d Rely on insideCartElemIdx<outsideCartElemIdx in allpyAllZMultipliers_ 
and simpily code under that assumption.
 2020-09-09 21:41:52 +02:00
Bård Skaflestad
f771088414
Merge pull request #2779 from joakim-hove/use-make-unique 
Use std::make_unique<>
 2020-09-08 22:44:57 +02:00
Bård Skaflestad
c8ae87b8bb
Merge pull request #2778 from blattms/fix-parallel-summary-output 
Fixes determining whether index of summary keyword is on process.
 2020-09-08 22:04:10 +02:00
Joakim Hove
c0187ffc73 Use std::make_unique<> 2020-09-08 21:57:26 +02:00
Markus Blatt
ee6044b2e0 Fixes determining whether index of summary keyword is on process. 
We used a method isGlobalIdxOnThisRank to determine whether to write
an entry for a summary keyword (like BPR). Unfortunately, this did
exactly what the name suggested, but we actually passed a cartesian
index to it. That meant that a lower cartesian index might have found on
many processes (with different cartesian index and hence resulting in
wrong values), while higher for ones no process would have been found
with it (resulting in writing zeros).

With this commit we store a sorted list of cartesian indices and query
that in the renamed and restructured function isCartesianidxOnThisRank.

Most probably this broke during refactoring.

Closes #2665
 2020-09-08 20:44:27 +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
Kai Bao
7b4142e9b6 adding timing for the well assembly 
And changes the indentation of the linear solver setup time a little to
show it is part of the linear solve time.
 2020-09-08 11:12:41 +02:00
Markus Blatt
11f9eb9d88 Base face processing decision of faces on cartesian indices 
This will process the same faces in serial and parallel.
Hence it make the silent assumption that we only process faces
from low cartesian index to high cartesian index hold again.

This should fix PINCH MULTZ ALL in parallel.
 2020-09-08 11:10:31 +02:00
Joakim Hove
00c5d9f016
Merge pull request #2775 from joakim-hove/add-report-step-arg 
Add report_step argument to UDQConfig::eval()
 2020-09-08 11:05:29 +02:00
Joakim Hove
7d3ff894ee
Merge pull request #2765 from joakim-hove/add-pinch-testing 
Add regression testing for MULTZ + PINCH::ALL
 2020-09-08 10:12:22 +02:00
Joakim Hove
3a3e217941 Add regression testing for MULTZ + PINCH::ALL 2020-09-08 08:35:52 +02:00
Joakim Hove
ead673b58a Add report_step argument to UDQConfig::eval() 2020-09-08 07:39:03 +02:00
Bård Skaflestad
9d6a0be776
Merge pull request #2772 from blattms/prevent-copy-in-rateconverter 
Prevent another copy of cell to region mapping in RateConverter.
 2020-09-07 17:13:22 +02:00
Markus Blatt
578ca0a725 Fixed unused variable warning. 2020-09-07 16:42:01 +02:00
Markus Blatt
c21f1e72f8 Prevent another copy of cell to region mapping in RateConverter. 
RateConverter itself already copies this and offers the mapping.
With this commit we just use that.
 2020-09-07 15:36:07 +02:00
Markus Blatt
53005c477d
Merge pull request #2762 from ducbueno/opencl-stdwell-clean 
Fixed out of resources problem
 2020-09-03 19:50:39 +02:00
Jose Eduardo Bueno
525faf7b5d Changed work_group_size 2020-09-03 14:25:50 -03:00
Jose Eduardo Bueno
f8898e3158 New function for setting OpenCL in wellContribs 2020-09-03 13:30:12 -03:00
Markus Blatt
3ee0db8cf4
Merge pull request #2760 from atgeirr/inform-user 
Use log mechanism for info output
 2020-09-03 17:15:00 +02:00