Commit Graph

13119 Commits

Author SHA1 Message Date
Tor Harald Sandve
0dcd91ac93
Merge pull request #3369 from totto82/grupWellState
handle GRUP in wellState from target
2021-06-24 13:02:24 +02:00
Bård Skaflestad
c101ed10f4
Merge pull request #3389 from totto82/scaleGuideRates
scale guiderates from si
2021-06-23 16:53:12 +02:00
Tor Harald Sandve
5368343512 handle GRUP in wellState from target 2021-06-23 14:46:35 +02:00
OPMUSER
c3fe22a6cf PartiallySupportedKeywords for RUNSPEC and GRID Sections
RUNSPEC and GRID keywords for partially supported keywords
2021-06-23 12:58:35 +08:00
Bård Skaflestad
256f4a3291
Merge pull request #3337 from bska/protect-against-noconnection-wells
Don't Create Well Instance for Wells With No Connections
2021-06-22 23:31:24 +02:00
Bård Skaflestad
9394a93c68 Don't Create Well Instance for Wells With No Connections
This commit protects against Opm::Well instances for which the sets
of connections are empty.  In those cases, do not put entries in the
well container as there is no influence on the systems of non-linear
equations.
2021-06-22 20:43:21 +02:00
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
Tong Dong Qiu
6291ba41b7 Added exception handling to cusparse test 2021-06-18 16:19:39 +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
Tor Harald Sandve
c3cf59327d scale guiderates from si 2021-06-17 23:56:02 +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
Ove Sævareid
33511b45c1 Relegating implementation details. 2021-06-15 17:18:46 +02:00
Ove Sævareid
c406216c7f Removed some tentative stuff. 2021-06-15 17:18:46 +02:00
Ove Sævareid
c4f41ccc5c Add some comments. 2021-06-15 17:18:46 +02:00
Ove Sævareid
39cf29a2a6 Variable names 2021-06-15 17:18:46 +02:00
Ove Sævareid
9478e8d03d Remove injector crossflow from tracer production. 2021-06-15 17:18:46 +02:00
Ove Sævareid
581408c760 Batchwise tracer calculations. 2021-06-15 17:18:46 +02:00
Ove Sævareid
6d76f6c557 Tracer summary curves, collect well rates. 2021-06-15 17:18:46 +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