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,053 Commits 24 Branches 102 Tags
801a34b88c56bdbf4b1c24b24c2e0f5d62f310ae
Commit Graph

13053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
801a34b88c Merge pull request #3254 from bska/chase-aquifer-redefinition 
Use Aquifer's Notion of Water Properties
 2021-06-22 20:39:42 +02:00
Bård Skaflestad
e4dd8a91e8 Use Aquifer's Notion of Water Properties 
This commit switches to using the analytic aquifer's intrinsic water
properties (i.e., the mass density and the viscosity), and to get
the time constant from the *_data structure instead of calculating
this value with separate logic.  Note that this switches to using a
single density value for the aquifer instead of separate density
values for each aquifer connection.

If the aquifer's initial pressure is defaulted we still compute an
equilibrated initial pressure value.  We then use the *_data
structure's 'finishInitialisation()' member function to derive the
aforementioned PVT properties.

Finally, report these values in the aquifer type-specific sub
structures of data::AquiferData for restart output purposes.
 2021-06-22 14:47:56 +02:00
Joakim Hove
85ff6914fc Merge pull request #3397 from bska/report-dynpv 
Report Pressure Dependent Pore Volume in PRT File
 2021-06-22 14:30:36 +02:00
Bård Skaflestad
6d3da3d2e0 Report Pressure Dependent Pore Volume in PRT File 
This commit distinguishes the reference condition pore volume from
the dynamic, pressure (and/or temperature) dependent pore volume
value.  Previously we would report the latter as the 'PORV' value in
the "Field Totals" and "FIPNUM region" reports, but this commit
switches to reporting the former instead-mostly for compatibility.
We still report the dynamic pore volume value, but now we report
this on a line of its own, before the table, using one of the forms

Field total pressure dependent pore volume = 12345 RM3
FIPNUM report region 1 pressure dependent pore volume = 123 RM3
 2021-06-22 12:00:56 +02:00
Bård Skaflestad
6f227f8177 Merge pull request #3400 from hakonhagland/glift_config 
Add missing header file to GasLiftGroupInfo.cpp
 2021-06-22 11:55:07 +02:00
Håkon Hægland
dd1ca3197d Add missing header file to GasLiftGroupInfo.cpp 
GasLiftGroupInfo.cpp did not include "config.h" which caused HAVE_MPI
to be undefined causing the file to be compiled with
Dune::Communication<No_Comm> instead of with
Dune::Communication<MPI_Comm>. Which later caused linking problems with files
that used MPI.
 2021-06-22 09:52:22 +02:00
Bård Skaflestad
57aa8d0384 Merge pull request #3393 from akva2/fix_dune2.7_warnings 
quell dune2.7+ warning
 2021-06-20 11:54:45 +02:00
Bård Skaflestad
441558726b Merge pull request #3392 from bska/restart-test-dir-support 
Add Support for 'DIR' Parameter in Restart Test Macro
 2021-06-19 00:33:11 +02:00
Bård Skaflestad
5ecc6b8166 Add Support for 'DIR' Parameter in Restart Test Macro 
This commit adds support for setting a non-default case directory
in the

    add_test_compare_restarted_simulation
    add_test_compare_parallel_restarted_simulation

wrapper functions.  This, in turn, is helpful when creating
restarted cases for the aquifer models.
 2021-06-18 21:19:57 +02:00
Bård Skaflestad
7a9c9bedea Merge pull request #3390 from akva2/janitoring 
fixed: do not assert conditions guaranteed by unsigned
 2021-06-18 16:52:47 +02:00
Joakim Hove
7d2984e3a3 Merge pull request #3387 from verveerpj/fix_keyword_validation 
Small fix for the keyword validation
 2021-06-18 15:23:03 +02:00
Arne Morten Kvarving
a8ffe91841 quell dune2.7+ warning 2021-06-18 15:18:06 +02:00
Arne Morten Kvarving
463a41d373 fixed: do not assert conditions guaranteed by unsigned 2021-06-18 13:27:58 +02:00
Peter Verveer
7be1bce651 Small fix for the keyword validation 2021-06-18 12:12:58 +02:00
Arne Morten Kvarving
592af11e55 avoid include in header 
also add include for config.h
 2021-06-18 11:43:54 +02:00
Atgeirr Flø Rasmussen
8c5a6b12d5 Merge pull request #3158 from totto82/operability_solve 
shut/stop unsolvable wells
 2021-06-18 10:13:14 +02:00
Bård Skaflestad
d9f89b4c89 Merge pull request #3366 from totto82/scaleWellRatesAfterGroupSwitching 
Scale well rates after group switching
 2021-06-18 10:05:00 +02:00
Markus Blatt
2260fde478 Merge pull request #3300 from Tongdongq/add-tests 
Added tests for cusparseSolver and openclSolver
 2021-06-17 22:31:23 +02:00
Tor Harald Sandve
161c6cb1f8 Merge pull request #3385 from totto82/fixMSWtarget 
Change wellStateFromTarget to virtual to make sure the MSW part is run
 2021-06-17 13:03:33 +02:00
Tor Harald Sandve
7cfff653ce Merge pull request #3384 from hakonhagland/glift_sw_mpi5 
Check group limits in gas lift stage 1
 2021-06-17 11:52:01 +02:00
Tor Harald Sandve
b5e29684f2 shut/stop unsolvable wells 2021-06-17 11:50:31 +02:00
Håkon Hægland
860cfd9fb5 Fix some sign compare warnings. 2021-06-17 10:44:32 +02:00
Tong Dong Qiu
f075c236c1 New error handling from Markus 2021-06-16 15:54:06 +02:00
Tor Harald Sandve
eb4e25c3f6 Change wellStateFromTarget to virtual to make sure the MSW part is run 2021-06-16 15:53:34 +02:00
Håkon Hægland
fbb24e2a5a Check group limits in gas lift stage 1. 
Check group limits in gas lift stage 1 to avoid adding too much ALQ which must
anyway later be removed in stage 2. This should make the optimization
more efficient for small ALQ increment values. Also adds MPI support.
 2021-06-16 12:00:54 +02:00
Tor Harald Sandve
b2341a84d6 scale well rates after group switching 2021-06-15 09:29:24 +02:00
Joakim Hove
969fc20154 Merge pull request #3373 from verveerpj/improve_validation 
Add keyword validation using a predicate function
 2021-06-15 07:47:37 +02:00
Joakim Hove
2a990f7465 Merge pull request #3382 from GitPaean/fixing_compilation 
not comparing guideRate_ with nullptr
 2021-06-15 07:46:00 +02:00
Kai Bao
b415cd4fb8 not comparing guideRate_ with nullptr 
it is not a pointer anymore since OPM/opm-simulators#3380
 2021-06-15 00:00:43 +02:00
Joakim Hove
0cf158cd15 Merge pull request #3379 from joakim-hove/wellrates-rename-X 
Rename data::WellRates -> data::Wells
 2021-06-14 18:21:39 +02:00
Peter Verveer
fd753e20c4 Add keyword validation using a predicate function 2021-06-14 18:10:36 +02:00
Joakim Hove
f9618faceb Merge pull request #3377 from joakim-hove/perf-data-injector 
PerfData maintains producre / injector status
 2021-06-14 15:53:15 +02:00
Joakim Hove
166907c45d Merge pull request #3380 from joakim-hove/guiderate-value 
Use GuideRate value instead of std::unique_ptr<GuideRate>
 2021-06-14 15:52:08 +02:00
Joakim Hove
b1600b904f Rename data::WellRates -> data::Wells 2021-06-14 15:27:56 +02:00
Joakim Hove
193657fee1 Use GuideRate value instead of std::unique_ptr<GuideRate> 2021-06-14 14:35:55 +02:00
Bård Skaflestad
dc7a6018f6 Merge pull request #3381 from akva2/boost_version_include 
fixed: add missing include for boost version
 2021-06-14 13:29:14 +02:00
Joakim Hove
2030237299 Merge pull request #3378 from akva2/janitoring 
Quell some warnings in static analyzers
 2021-06-14 12:47:54 +02:00
Arne Morten Kvarving
54d928583b fixed: add missing include for boost version 2021-06-14 11:50:57 +02:00
Arne Morten Kvarving
86b454f4c8 fixed: initialize to avoid sca warning 2021-06-14 09:26:32 +02:00
Arne Morten Kvarving
6b5c7b66fd fixed: mark methods as override 2021-06-14 09:09:33 +02:00
Arne Morten Kvarving
a84d05c83b fixed: forward classes as classes 2021-06-14 09:09:15 +02:00
Joakim Hove
a22b836b82 PerfData maintains producre / injector status 2021-06-14 09:03:02 +02:00
Joakim Hove
f401f17132 Merge pull request #3375 from joakim-hove/rename-wellrates2 
Rename data::WellRates -> data::Wells
 2021-06-14 08:00:37 +02:00
Joakim Hove
3442af12a2 Rename data::WellRates -> data::Wells 2021-06-13 22:00:59 +02:00
Joakim Hove
7c133bb0eb Merge pull request #3374 from joakim-hove/rename-wellrates 
Rename data::WellRates -> data::Wells in opm-common
 2021-06-13 13:14:03 +02:00
Joakim Hove
b0d4aedb2a Merge pull request #3372 from joakim-hove/wellstate-report 
Minor renames++ in WellState report
 2021-06-13 08:39:27 +02:00
Joakim Hove
454220b9e7 Rename data::WellRates -> data::Wells in opm-common 2021-06-13 08:37:56 +02:00
Joakim Hove
fe5e4a9ac3 Minor renames++ in WellState report 2021-06-11 16:01:25 +02:00
Joakim Hove
2dae87fb74 Merge pull request #3370 from totto82/bugMaxInnerIter 
change get param from bool to int
 2021-06-11 12:39:45 +02:00
Joakim Hove
2966a52a0f Merge pull request #3361 from joakim-hove/simplify-conn-check 
Suggestion: Simplify check for number of perforations
 2021-06-11 11:04:21 +02:00