Commit Graph

2175 Commits

Author SHA1 Message Date
Arne Morten Kvarving
87bc1d8c10 HardcodedTimeStepControl: add serialization support 2023-02-13 22:03:19 +01:00
Arne Morten Kvarving
bd538cf61d SimpleIterationCountTimeStepControl: add serialization support 2023-02-13 22:03:19 +01:00
Arne Morten Kvarving
f2a14b2d07 SimulatorTimer: add serialization support 2023-02-13 18:01:16 +01:00
Arne Morten Kvarving
d73d52e162 added: simple HDF5File class
bare minimum to enable reading and writing byte arrays
2023-02-06 09:44:50 +01:00
Arne Morten Kvarving
bb70774902 add missing includes
and remove some unneeded ones
2023-01-19 15:16:33 +01:00
Arne Morten Kvarving
0a081adb54 ecloutputblackoilmodule.hh: remove unnecessary SummaryConfig.hpp include 2023-01-18 14:59:58 +01:00
Bård Skaflestad
da4e2deb6a
Merge pull request #4397 from akva2/summarystate_hpp_include
SummaryState.hpp: add missing and forward where possible
2023-01-18 14:58:47 +01:00
Arne Morten Kvarving
308cda46b1 add missing SummaryState.hpp include 2023-01-18 13:51:40 +01:00
Arne Morten Kvarving
6d97ca97a1 add missing Well.hpp includes 2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
fd94ca7031 add missing InputErrorAction.hpp includes 2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
3a01e89585 adjust to InputErrorAction change to enum class 2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
d8ce4bfd0c add missing WVFPEXP.hpp includes 2023-01-14 00:30:56 +01:00
Markus Blatt
e03227501a
Merge pull request #4376 from akva2/wellmicpproperties_hpp_include
add missing WellMICPProperties.hpp includes
2023-01-13 19:02:00 +01:00
Arne Morten Kvarving
d5fbbdc328 add missing WellEconProductionLimits.hpp includes 2023-01-13 15:26:24 +01:00
Arne Morten Kvarving
f74f2ded8e add missing WellMICPProperties.hpp includes 2023-01-13 14:01:56 +01:00
Bård Skaflestad
dcfa1ef24e
Merge pull request #4373 from akva2/wellbrineproperties_hpp_include
add missing WellBrineProperties.hpp includes
2023-01-13 12:03:08 +01:00
Arne Morten Kvarving
131f52773f add missing WellBrineProperties.hpp includes 2023-01-13 11:14:18 +01:00
Tor Harald Sandve
8d37ded703 Suppot EQUIL + WATER + GAS 2023-01-13 10:16:48 +01:00
Arne Morten Kvarving
351181f355 add missing WellSegments.hpp includes 2023-01-12 14:37:32 +01:00
Arne Morten Kvarving
7f7b373a2d add missing WellConnections.hpp includes 2023-01-12 12:24:32 +01:00
Arne Morten Kvarving
09dc3d9449 add missing Balance.hpp includes 2023-01-11 11:26:25 +01:00
Arne Morten Kvarving
7034b5528d add missing ExtNetwork.hpp includes 2023-01-11 09:47:15 +01:00
Arne Morten Kvarving
4e21e96660 add missing GConSump.hpp includes 2023-01-10 15:00:25 +01:00
Arne Morten Kvarving
7fffe402cd add missing NameOrder.hpp includes 2023-01-10 12:47:00 +01:00
Arne Morten Kvarving
4bdec3a58b avoid GasLiftOpt.hpp where possible
and add where necessary
2023-01-10 09:54:33 +01:00
Arne Morten Kvarving
b010a1717a add missing RPTConfig.hpp includes 2023-01-09 15:22:12 +01:00
Arne Morten Kvarving
1dd0897eca add missing GuideRateConfig.hpp includes 2023-01-09 14:26:03 +01:00
Arne Morten Kvarving
c9ef1ee7c8 test_csrToCscOffsetMap: include <fstream>
filestreams are used here
2023-01-03 15:25:36 +01:00
Arne Morten Kvarving
853b6d1172 test_wellstate: avoid use of sstream 2023-01-02 15:25:32 +01:00
Arne Morten Kvarving
b031c289bf test_milu: avoid use of sstream 2023-01-02 15:25:26 +01:00
Bård Skaflestad
858ca8fa49 Output Non-Linear Convergence to Separate File if Requested
This commit enables outputting non-linear convergence metrics, i.e.,
the MB and CNV values, per phase, for each non-linear iteration in
each timestep.  If the user passes the option value "iterations" to
the --extra-convergence-output command line option, this commit will
create a new output file, CASE.INFOITER, that holds

    * report step
    * time step within that report step
    * elapsed time
    * MB and CNV values per phase
    * well convergence status

for each non-linear iteration.

We use an asynchronous file writing procedure and confer ownership
of the report step's unprocessed convergence reports to this
procedure just before the end of

    SimulatorFullyImplicitBlackoilEbos::runStep()

At that point, the convergence reports are about to go out of scope.
The asynchronous protocol uses a dedicated queue of output requests,
class ConvergenceReportQueue, into which the producer-i.e., member
function runStep()-inserts new convergence reports and from which
the output thread, ConvergenceOutputThread::writeASynchronous(),
retrieves those requests before writing the file data.
2022-12-20 10:14:13 +01:00
Bård Skaflestad
63654a73fc Don't Output INFOSTEP File by Default
This commit introduces a new helper class,

    ConvergenceOutputConfiguration

which parses comma separated option strings into a runtime
configuration object for whether to output additional convergence
information and, if so, what information to output.

Supported option string values are

  * "none"       -- Dont want any additional convergence output.

  * "steps"      -- Want additional convergence output pertaining to the
                    converged solution at the end of each timestep.

  * "iterations" -- Want additional convergence output pertaining to each
                    non-linar ieration in each timestep.

Option value "none" overrides all other options.  In other words, if the
user requests "none", then there will be no additional convergence
output, even if there are other options in the option string.

We add a new option, ExtraConvergenceOutput (command line option
--extra-convergence-output), which takes a string argument expected
to be a comma separated combination of these options.  The default
value is "none".  Finally, make the INFOSTEP file output conditional
on the user supplying "steps" as an argument to the new option.
2022-12-15 13:02:09 +01:00
Arne Morten Kvarving
ee8b4cac02 add missing include after upstream header removal 2022-12-13 15:38:10 +01:00
Arne Morten Kvarving
dc7cddab64 adjust to upstream GasPvtApproach enum changes 2022-12-12 19:17:51 +01:00
Arne Morten Kvarving
9a9dfd2e1d adjust to upstream OilPvtApproach enum changes 2022-12-12 19:09:37 +01:00
Arne Morten Kvarving
e390ce5149 adjust to upstream WaterPvtApproach enum changes 2022-12-12 19:00:19 +01:00
Bård Skaflestad
364b87afc9 Enable Regression Testing of WELPI and CPI/CTFAC
Forgotten at the time we developed the WELPI support.
2022-12-09 13:09:02 +01:00
Arne Morten Kvarving
f9b570ec84 remove test_ecl_output
the tests done here is already done (better) elsewhere
2022-11-30 15:30:49 +01:00
Torbjørn Skille
0fd685dc19 add regression testing for grid unit models 2022-11-30 09:55:59 +01:00
Markus Blatt
42fdc38ae0
Merge pull request #4273 from Tongdongq/add-test
Add test for cusparseSolver
2022-11-22 13:55:11 +01:00
Håkon Hægland
43244c2132 Change condition under which stage 2 is done.
It only makes sense to try to optimize the distribution of lift gas if
the amount of lift gas is constrained either by the maximum allowed
gaslift or total gas or the group is under individual control.
2022-11-21 08:58:49 +01:00
Tong Dong Qiu
c7fec18a86 Simplify parameter 2022-11-18 13:22:41 +01:00
Tong Dong Qiu
b697460add Also test cusparseSolver with jacobi matrix 2022-11-18 13:09:33 +01:00
Tong Dong Qiu
35287a61ff Remove FPGASolver and references 2022-11-17 09:38:01 +01:00
Arne Morten Kvarving
a7249bee65 test_quadrature: remove support for dune < 2.6 2022-11-14 16:35:42 +01:00
Arne Morten Kvarving
c906b55a64 fix test with dune-alugrid 2.7 2022-11-14 16:34:30 +01:00
Markus Blatt
4988f98060
Merge pull request #4178 from Tongdongq/rocalution
Add rocalutionSolver
2022-11-09 16:44:35 +01:00
Tong Dong Qiu
627c7d50ac Removed outdated version checks 2022-11-08 10:03:15 +01:00
Arne Morten Kvarving
9ce8d1ceca adjust for ILU reorder removal 2022-11-03 15:47:38 +01:00
Tong Dong Qiu
d20be40aea Fix test names 2022-11-03 15:47:38 +01:00
Tong Dong Qiu
7e2a6800de Add test for rocalutionSolver 2022-11-03 15:47:32 +01:00
Bård Skaflestad
dc2f8685d9
Merge pull request #4207 from atgeirr/fix-schedule-multflt-fastassembly
Fix case with MULTFLT in SCHEDULE for the TpfaLinearizer ("fast assembly" path)
2022-10-27 18:17:24 +02:00
Atgeirr Flø Rasmussen
58edf39330 Add data update capability for new test. 2022-10-27 15:22:05 +02:00
Torbjørn Skille
f30417af8c start regression testing for krnum cases 2022-10-26 10:17:53 +02:00
Markus Blatt
3e680e41f5
Merge pull request #4136 from Tongdongq/remove_reordering
Remove reordering for opencl
2022-10-19 15:30:01 +02:00
Tor Harald Sandve
d25dc4e795 check controls in getWellConvergence 2022-10-18 10:55:17 +02:00
Atgeirr Flø Rasmussen
216f77f03f Remove unused variables. 2022-10-17 16:45:18 +02:00
Markus Blatt
8d522a2c42 Get rid deprecation warning for newer DUNE versions. 2022-10-14 21:29:09 +02:00
Tong Dong Qiu
d06b02f88f Add test with Jacobi matrix for openclSolver 2022-10-14 09:33:55 +02:00
Tong Dong Qiu
09e262bbfd Minor changes:
- removed unused header inclusion
- update comments
- removed unnecessary cast
2022-10-13 15:37:20 +02:00
Markus Blatt
fcc3690832 Added missing include of config.h in cpp files. 2022-10-12 15:28:38 +02:00
Torbjørn Skille
d9ca2c7108 start regression testing for SPE1CASE2_KRNUM 2022-10-12 07:59:56 +02:00
Torbjørn Skille
7afb12ff6e add regression test for model WVFPEXT-02 2022-10-06 14:30:46 +02:00
Arne Morten Kvarving
214f62f90c adjust to renaming of serializeObject 2022-10-04 14:10:47 +02:00
Tor Harald Sandve
941556ab4d
Merge pull request #4098 from totto82/extVFP
remove cutoff for extrapolation
2022-10-04 08:44:49 +02:00
Tor Harald Sandve
8dbf919f7e loose test criterion for glift case 2022-10-03 15:14:11 +02:00
Bård Skaflestad
66fac184ad
Merge pull request #4111 from goncalvesmachadoc/test-rvw
Add unit tests for EQUIL with rvw
2022-10-02 22:11:04 +02:00
goncalvesmachadoc
0b505e5f71 add flag and values 2022-10-01 16:46:59 +02:00
Tong Dong Qiu
42410d408f Removed GRAPH_COLORING opencl reordering option.
Simplified and renamed opencl_ilu_reorder parameter.
2022-09-27 15:54:19 +02:00
goncalvesmachadoc
c82e769697 fixes 2022-09-20 10:56:54 +02:00
goncalvesmachadoc
0a91b773d8 test also with live oil 2022-09-16 14:17:53 +02:00
Arne Morten Kvarving
4f9f0f921f changed: use Serializer from opm-common 2022-09-16 13:12:11 +02:00
Arne Morten Kvarving
5c78925981 fixed: wrong root rank in variadic broadcast
change the test to broadcast from rank 1 instead of 0
so this bug does not resurface
2022-09-14 19:38:24 +02:00
goncalvesmachadoc
a5a9f5ee4e addtestfordeadoilwithhumid&wetgas 2022-09-14 16:11:36 +02:00
Bård Skaflestad
67ec01a730
Merge pull request #4034 from plgbrts/equil2
Equilibration with water-gas ratio vs depth (RVWVD) table
2022-09-14 14:30:04 +02:00
Paul Egberts
d01e5e330f fix equil test 2022-09-14 09:58:50 +02:00
Arne Morten Kvarving
6e83e349d6 changed: move variadic broadcast into EclMpiSerializer 2022-09-13 13:29:47 +02:00
Bård Skaflestad
56c653235f
Merge pull request #4087 from akva2/rename_serialization
Rename serialization files
2022-09-13 10:48:33 +02:00
Arne Morten Kvarving
8e2b385f4d changed: put parts of ISTLSolverEbos in separate compile unit
in particular this means simulator objects are now not dependent
on FlexibleSolver.hpp and BdaBridge.hpp
2022-09-12 12:44:56 +02:00
Markus Blatt
a4360b4961
Merge pull request #4028 from akva2/reduce_dup
changed: get rid of duplicate MatrixBlock headers/classes
2022-09-09 15:30:30 +02:00
Tor Harald Sandve
f36ac3eeed
Merge pull request #3837 from totto82/wvfpexp
Add option for explicit vfp lookup for problematic wells
2022-09-09 10:00:02 +02:00
Arne Morten Kvarving
c68d979d4b remove unused variables 2022-09-09 08:38:17 +02:00
Arne Morten Kvarving
de0018350a changed: rename test_ParallelRestart to test_ParallelSerialization 2022-09-08 13:37:16 +02:00
Arne Morten Kvarving
1838b39d2e changed: split ParallelRestart.hpp/cpp in two bits
the mpi serialization bit is put in MPISerializer.hpp/cpp,
while the parallel restart bit stays in ParallelRestart
2022-09-08 13:36:51 +02:00
Arne Morten Kvarving
e65036cd45 add serialization test for TranCalculator 2022-09-07 10:10:10 +02:00
Arne Morten Kvarving
b53ab951d0 drop primitive serializer support for data:: types 2022-09-06 16:04:02 +02:00
Bård Skaflestad
3273ef04f4
Merge pull request #4079 from akva2/summarystate_test
added: SummaryState mpiserializer test
2022-09-06 12:01:21 +02:00
Bård Skaflestad
f10a71397b
Merge pull request #4078 from akva2/restartvalue_test
added: RestartValue mpiserializer test
2022-09-06 10:41:59 +02:00
Arne Morten Kvarving
8ad4f147d1 added: SummaryState mpiserializer test 2022-09-06 10:32:48 +02:00
Bård Skaflestad
29218040e3
Merge pull request #4073 from akva2/wells_test
add data::Wells mpiserializer test
2022-09-06 10:17:21 +02:00
Arne Morten Kvarving
24341037e5 added: RestartValue mpiserializer test 2022-09-06 10:02:17 +02:00
Arne Morten Kvarving
4035e6a1a8 added: data::AquiferData mpiserializer test 2022-09-06 09:37:47 +02:00
Arne Morten Kvarving
46b64e55e2 added: data::Wells mpiserializer test 2022-09-06 09:36:08 +02:00
Bård Skaflestad
14070fdfcb
Merge pull request #4072 from akva2/well_test
added: data::Well mpiserializer test
2022-09-06 09:31:34 +02:00
Arne Morten Kvarving
01cee8e50b added: data::FetkovichData mpiserializer test 2022-09-06 08:25:36 +02:00
Arne Morten Kvarving
f4f4919df4 added: data::Well mpiserializer test 2022-09-06 08:22:43 +02:00
Bård Skaflestad
e63a71a9e5
Merge pull request #4076 from akva2/numericaquiferdata_test
added: data::NumericAquiferData mpiserializer test
2022-09-05 16:27:06 +02:00
Bård Skaflestad
9d0ed4f075
Merge pull request #4075 from akva2/cartertracydata_test
added: data::CarterTracyData mpiserializer test
2022-09-05 16:19:52 +02:00
Bård Skaflestad
db9578ee99
Merge pull request #4069 from akva2/segment_test
add data::Segment mpiserializer test
2022-09-05 16:19:12 +02:00
Bård Skaflestad
b6a264b799
Merge pull request #4063 from akva2/groupandnetworkvalues_test
add data::GroupAndNetworkValues mpiserializer test
2022-09-05 16:18:44 +02:00
Arne Morten Kvarving
43b7999cf1 added: data::NumericAquiferData mpiserializer test 2022-09-05 15:21:49 +02:00
Arne Morten Kvarving
ac442436cc added: data::CarterTracyData mpiserializer test 2022-09-05 15:15:27 +02:00
Arne Morten Kvarving
54e514ed62 added: data::Segment mpiserializer test 2022-09-05 14:24:47 +02:00
Bård Skaflestad
459b116128
Merge pull request #4068 from akva2/segmentpressures_test
added: data::SegmentPressures mpiserializer test
2022-09-05 14:23:49 +02:00
Arne Morten Kvarving
6b258989c7 added: data::GroupAndNetworkValues mpiserializer test 2022-09-05 14:13:40 +02:00
Bård Skaflestad
dea0f27708
Merge pull request #4067 from akva2/connection_test
add data::Connection mpiserializer test
2022-09-05 14:10:39 +02:00
Arne Morten Kvarving
a5c8ed50d5 added: data::SegmentPressures mpiserializer test 2022-09-05 13:05:46 +02:00
Arne Morten Kvarving
a1a020de79 added: data::GroupData mpiserializer test 2022-09-05 13:03:32 +02:00
Bård Skaflestad
aabcc5161c
Merge pull request #4060 from akva2/groupguiderates_test
data::GroupGuideRates: mpiserializer test
2022-09-05 13:01:52 +02:00
Arne Morten Kvarving
1b9356cf12 added: data::Connection mpiserializer test 2022-09-05 13:01:24 +02:00
Bård Skaflestad
019ce8d055
Merge pull request #4070 from akva2/currentcontrol_test
added: data::CurrentControl mpiserializer test
2022-09-05 12:59:58 +02:00
Arne Morten Kvarving
5863213a4d added: data::Rates mpiserializer test 2022-09-05 12:21:28 +02:00
Arne Morten Kvarving
4f6a694ec7 added: data::GroupGuideRates mpiserializer test 2022-09-05 12:19:12 +02:00
Bård Skaflestad
c40d3c3777
Merge pull request #4065 from akva2/solution_test
added: data::Solution mpiserializer test
2022-09-05 12:16:35 +02:00
Arne Morten Kvarving
76e2fd88ac added: data::CurrentControl mpiserializer test 2022-09-05 11:47:33 +02:00
Arne Morten Kvarving
0d9a400f0c added: data::Solution mpiserializer test 2022-09-05 11:20:39 +02:00
Arne Morten Kvarving
6ff0d0cdc4 added: data::GuideRateValue mpiserializer test 2022-09-05 11:17:44 +02:00
Bård Skaflestad
69b32f7004
Merge pull request #4064 from akva2/restartkey_test
added: RestartKey mpiserializer test
2022-09-05 11:16:45 +02:00
Arne Morten Kvarving
360040da8e added: RestartKey mpiserializer test 2022-09-05 10:19:42 +02:00
Paul Egberts
1c70b5beea Equilibration with water-gas ratio vs depth (RVWVD) table 2022-09-05 09:59:16 +02:00
Arne Morten Kvarving
e7344840ca added: data::NodeData mpiserializer test 2022-09-05 09:58:12 +02:00
Arne Morten Kvarving
40867b5523 added: data::GroupConstraints mpiserializer test 2022-09-05 08:56:09 +02:00
Arne Morten Kvarving
9145115cab added: data::CellData mpiserializer test 2022-09-02 17:21:55 +02:00
Arne Morten Kvarving
980e9f6960 changed: rename macro
to better reflect reason for needing two macros
2022-09-02 15:32:54 +02:00
Arne Morten Kvarving
69db0dd175 wellhelpers: make templates private
to increase header encapsulation
2022-09-01 13:37:11 +02:00
Arne Morten Kvarving
2c0ff6f81e consistently use ParallelCommunication.hpp for communication definition 2022-09-01 12:26:11 +02:00
Arne Morten Kvarving
1a348c0d29 changed: get rid of duplicate MatrixBlock headers/classes
this has already led to some confusion. move some of the code
upstream to opm-models and remove the rest of the duplicated code.

the remainder of MatrixBlock.hpp is renamed to SmallDenseMatrixUtils.hpp
2022-08-25 12:48:53 +02:00
Atgeirr Flø Rasmussen
432df26ecc
Merge pull request #4025 from bska/remove-dune-unused
Prefer Attributes to Macros
2022-08-25 08:29:33 +02:00
Bård Skaflestad
a56cd6752c
Revert "changed: reduce some code duplication" 2022-08-24 20:34:52 +02:00
Bård Skaflestad
f3fc5331f0 Prefer Attributes to Macros 2022-08-24 17:05:55 +02:00
Bård Skaflestad
e66c7f6444
Merge pull request #4022 from akva2/reduce_dup
changed: reduce some code duplication
2022-08-24 16:53:16 +02:00
Arne Morten Kvarving
447d77b579 changed: get rid of duplicate MatrixBlock headers/classes
this has already led to some confusion. move some of the code
upstream to opm-models and remove the rest of the duplicated code.

the remainder of MatrixBlock.hpp is renamed to SmallDenseMatrixUtils.hpp
2022-08-24 15:54:01 +02:00
Bård Skaflestad
1d54d554ec
Merge pull request #4002 from goncalvesmachadoc/testSalt
add Test Case for Salt Precipitation
2022-08-24 00:12:18 +02:00
Arne Morten Kvarving
3ef07d7f62 changed: put ParallelOverlappingILU0 in separate compile unit
i chose to split in a separate _impl file because this code is so
generic that there may be downstream users who want to use on other
matrix types than what we use in opm-simulators.
2022-08-22 11:21:31 +02:00
Arne Morten Kvarving
ec089af048 changed: split PreconditionerFactory in _impl file
and put instances in separate cpp files.
2022-08-22 09:33:15 +02:00
Tor Harald Sandve
9364d4c54b Add option for wvfpexp item 2 plus minor fixes 2022-08-19 10:33:19 +02:00
Tor Harald Sandve
e875849497 Adapt test cases and vfpprint 2022-08-19 10:33:19 +02:00
goncalvesmachadoc
23bc8f4cde addTestCaseSalt 2022-08-15 16:46:52 +02:00
Bård Skaflestad
9a171582b4 Add Regression Test for WPIMULT in ACTIONX Block
To keep this feature working as intended.
2022-08-15 10:35:40 +02:00
Bård Skaflestad
2f4020a72f Add Regression Test for Single-Phase Water Run
Uses test model contributed by Edmund Stephens.
2022-08-11 17:51:17 +02:00
Arne Morten Kvarving
54cf35e821 equilibrationhelpers: make templates private 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving
b399f72777 changed: avoid typetag dependence in equil initializer 2022-08-11 15:27:38 +02:00
Atgeirr Flø Rasmussen
93ce28e9a2
Merge pull request #3972 from ElyesAhmed/alugrid2
Alugrid2
2022-08-04 15:43:24 +02:00
Arne Morten Kvarving
d6c378e6a9 remove use of Unused.hpp 2022-08-02 11:24:40 +02:00
Elyes Ahmed
5c2b60bcd0 rebasing 2022-07-28 20:40:34 +02:00
Arne Morten Kvarving
9f9b21932f add some missing EclipseState includes 2022-07-26 14:59:09 +02:00
Bård Skaflestad
a4e529914d
Merge pull request #3956 from totto82/testDiff
add diffusion test case to ctest
2022-06-29 15:26:23 +02:00
Kai Bao
ed78d8c99a adding a regression test for WSEGVALV 2022-06-29 14:04:23 +02:00
Arne Morten Kvarving
c5fcbb8f3d changed: use gcc pragma's to suppress strict-aliasing warning
we don't care
2022-06-27 14:55:30 +02:00
Arne Morten Kvarving
32eb467ead fix tests that relied on internal deck handling 2022-06-24 15:27:56 +02:00
Tor Harald Sandve
c910c8dbac add diffusion test case to ctest 2022-06-24 10:18:21 +02:00
Atgeirr Flø Rasmussen
7fe3839500 Use MatrixBlock consistently, also whitespace cleanup. 2022-06-10 11:08:24 +02:00
Atgeirr Flø Rasmussen
16b1756339 Add necessary include statements. 2022-06-09 10:38:47 +02:00
Atgeirr Flø Rasmussen
6c5988f011 Instantiate test program with MatrixBlock not FieldMatrix.
Cuts down on the necessary instantiation combinations for FlexibleSolver.
2022-06-08 17:03:27 +02:00
hnil
f3acfcde0b Adding functions for pressure system manipulation to well models.
Also add well-aware operator and transfer policy.
This will be used for CPR with custom operators.
2022-06-08 17:01:33 +02:00
Markus Blatt
02aaec82f7
Merge pull request #3815 from Tongdongq/subdomain-matrix-for-opencl
Subdomain matrix for opencl ILU preconditioner
2022-05-20 16:05:14 +02:00
Tong Dong Qiu
2d270d5613 Update GPU tests 2022-05-04 14:51:32 +02:00
Markus Blatt
9b98a8fdc1 Use flow to update reference data for onephase test cases 2022-04-26 17:07:09 +02:00
Tong Dong Qiu
e360c00b73 add block-jacobi partitioner option. Add block-jacobi matrix for use in OpenCL preconditioner
Rebased
2022-04-21 17:18:32 +02:00
Markus Blatt
aba4c5f487
Merge pull request #3880 from Tongdongq/fix-gpu-tests
Fix GPU tests, use Dune as reference instead of hardcoded
2022-04-21 15:21:07 +02:00
Tong Dong Qiu
aa362ae239 Fix GPU tests, use Dune as reference instead of hardcoded 2022-04-21 10:51:38 +02:00
Håkon Hægland
fbd6c03dd6 Cleanup glift debugging output code 2022-03-24 12:42:46 +01:00
Kai Bao
2c18d09ce1 fixing test_wellstate 2022-03-10 22:19:12 +01:00
Håkon Hægland
367e26a719 Use new constructor
Refer to opm-common/pull #2971. In order to use the new constructor
proposed in that PR, the constructor must now be passed a boolean
variable signalling if gaslift is active.
2022-03-09 09:11:10 +01:00
Torbjørn Skille
005241a13b adding regression testing of RXFT summary cases 2022-02-24 08:20:31 +01:00
Bård Skaflestad
1e121799c8 Add Multi-Array Aware Accumulator for Inter-Region Flow Rates
This commit introduces a new helper class

    Opm::EclInterRegFlowMapSingleFIP

that wraps a vector of

    Opm::EclInterRegFlowMapSingleFIP

along with the associate array names (e.g., "FIPNUM" and any
additional "FIP*" arrays).  We implement the same operations as the
*SingleFIP type and simply loop over the internal accumulators to
affect the operations.

Add unit tests to exercise the new class, including simulating
multiple MPI ranks that are communicated to a single I/O rank for
summary output purposes.
2022-02-18 10:29:56 +01:00
Bård Skaflestad
27564f0610 Add MPI-Aware Accumulator for Inter-Region Flow Rates
This commit introduces a new helper class

    Opm::EclInterRegFlowMapSingleFIP

that wraps an object of type

    Opm::data::InterRegFlowMap

along with the MPI rank's notion of a FIP region array definition
(e.g., the local FIPNUM array).  The new single-FIP flow map is
responsible for accumulating local contributions to the inter-region
flows defined by that FIP array.  In the case of connections between
MPI ranks, the rank that owns the lowest region ID accumulates the
associate flow rates.

Add unit tests to exercise the new class, including simulating
multiple MPI ranks that are communicated to a single I/O rank for
summary output purposes.
2022-02-18 10:29:56 +01:00
Markus Blatt
3b8501469c
Merge pull request #3800 from Tongdongq/move-gpu-files
Move gpu files
2022-02-03 12:55:41 +01:00
Bård Skaflestad
e68744e01f
Merge pull request #3776 from jilocode/WTEST
Added WTEST models
2022-02-02 16:41:11 +01:00
Bård Skaflestad
1bd81ba276
Merge pull request #3788 from goncalvesmachadoc/precsalt
Add precsalt case to regression tests
2022-02-02 16:01:06 +01:00
Arne Morten Kvarving
dd0b335dc1 fixed: use the --porcelain option when parsing git status
the formatting for the standard git status output is unstable,
and has changed in newer versions of the git client. this lead
to missing lines in untracked files.
2022-02-02 15:08:36 +01:00
jilocode
9ef7218194 added test cases 2022-02-02 11:34:51 +01:00
Tong Dong Qiu
e81ca0526e Move opencl files to separate folder 2022-02-01 16:51:32 +01:00
Tong Dong Qiu
a514947b5a Include boost version 2022-02-01 15:56:36 +01:00
goncalvesmachadoc
8f24a7eba5 add precsalt case to regression tests 2022-01-25 12:06:46 +01:00
Håkon Hægland
4970b0641e Improve debugging tools in gaslift code.
Introduces a gaslift debugging variable in ALQState in WellState. This
variable will persist between timesteps in contrast to when debugging
variables are defined in GasLiftSingleWell, GasLiftGroupState, or GasLiftStage2.

Currently only an integer variable debug_counter is added to ALQState,
which can be used as follows: First debugging is switched on globally
for BlackOilWellModel, GasLiftSingleWell, GasLiftGroupState, and
GasLiftStage2 by setting glift_debug to a true value in BlackOilWellModelGeneric.
Then, the following debugging code can be added to e.g. one of
GasLiftSingleWell, GasLiftGroupState, or GasLiftStage2 :

    auto count = debugUpdateGlobalCounter_();
    if (count == some_integer) {
        displayDebugMessage_("stop here");
    }

Here, the integer "some_integer" is determined typically by looking at
the debugging output of a previous run. This can be done since the
call to debugUpdateGlobalCounter_() will print out the current value
of the counter and then increment the counter by one. And it will be
easy to recognize these values in the debug ouput. If you find a place
in the output that looks suspect, just take a note of the counter
value in the output around that point and insert the value for
"some_integer", then after recompiling the code with the desired value
for "some_integer", it is now easy to set a breakpoint in GDB at the
line

    displayDebugMessage_("stop here").

shown in the above snippet. This should improve the ability to quickly
to set a breakpoint in GDB around at a given time and point in the simulation.
2022-01-23 20:37:26 +01:00
Arne Morten Kvarving
4efd278017 fixed: build with dune 2.6 2022-01-20 10:13:12 +01:00
Markus Blatt
3db9a4e3e5
Merge pull request #3750 from ducbueno/isai-ilu
Adds IncompleteSAI preconditioner to openclSolver
2022-01-18 12:38:39 +01:00
Eduardo Bueno
1df9d2e51f Adds BISAI preconditioner to openclSolver 2022-01-17 13:57:29 -03:00
Arne Morten Kvarving
fd6299364b avoid boost deprecation warning 2022-01-17 13:59:39 +01:00
Bård Skaflestad
3317f10c4a
Merge pull request #3729 from goncalvesmachadoc/gaswater_brine
allow for gas-water + brine
2022-01-12 12:31:34 +01:00
Joakim Hove
6b92443cb4 Downstream filesystem reorganisation in opm-common 2022-01-02 14:33:34 +01:00
Markus Blatt
0485c65d16
Merge pull request #3740 from atgeirr/make-split-comm-test-runtime-optional
Replace DEMONSTRATE_RUN_WITH_NONWORLD_COMM macro with runtime bool.
2021-12-20 12:46:49 +01:00
Atgeirr Flø Rasmussen
c94a940770 Add test for the custom communicator feature. 2021-12-20 09:58:13 +01:00
Torbjørn Skille
3274281c2d multiple restart tests 2021-12-12 17:57:40 +01:00
Markus Blatt
a61f69bb79
Merge pull request #3672 from Tongdongq/add-cpr-opencl
Add CPR preconditioner to openclSolver
2021-12-08 19:44:59 +01:00
goncalvesmachadoc
6280b9d93f add to regression test 2021-12-08 16:57:16 +01:00
Atgeirr Flø Rasmussen
69b81c4fbf
Merge pull request #3724 from totto82/CO2STORETHERMAL
Add gasoil + thermal simulator
2021-12-08 08:33:46 +01:00
Tor Harald Sandve
4f75d1ab8d Add gasoil + energy simulator
Useful when combining CO2STORE + THERMAL

This PR also fixes an issue with missing phases in computation of output temperature
2021-12-07 09:18:38 +01:00
Tong Dong Qiu
a5ed003418 Update GPU solver and solve_transposed_3x3() tests 2021-12-06 11:57:24 +01:00
Tong Dong Qiu
d58aa58791 Add more testcases for solve_transposed_3x3() 2021-12-01 11:47:44 +01:00
Tong Dong Qiu
a911d5d2be Add test for solve_transposed_3x3() 2021-12-01 11:47:44 +01:00
Joakim Hove
6f7042801a Remove references to opm-pack in restart testing 2021-11-30 09:41:08 +01:00
Joakim Hove
b46b83011a Create CASE_RESTART deck on the fly when restart testing 2021-11-27 13:39:31 +01:00
Joakim Hove
36281b2aed Update deck access api 2021-11-18 15:11:50 +01:00
Joakim Hove
2b0bce970c
Merge pull request #3698 from joakim-hove/rename-restart
Suggestion: Rename restart case to ${CASE}_RESTART in regression test
2021-11-16 10:46:58 +01:00
Markus Blatt
afc5ed751f
Merge pull request #3691 from akva2/bda_wellcontrib_refactor
Refactor BDA well contributions
2021-11-15 10:26:44 +01:00
Markus Blatt
ec56782288
Merge pull request #3690 from akva2/wellcontrib_cleanups
Some simple cleanup in BDA WellContributions
2021-11-15 10:18:12 +01:00
Joakim Hove
ccb708e716 Rename restart case to ${CASE}_RESTART 2021-11-14 13:16:57 +01:00
Joakim Hove
b28c3abbc5
Merge pull request #3693 from akva2/fix_changed_tests
fixed: only update files if they actually changed
2021-11-14 13:11:12 +01:00
Arne Morten Kvarving
06fe93a430 changed: do not always start update_data branch from origin/master
this allows for update_data from opm-tests. the generated
PR will include the contents of the PR it was generated for
2021-11-12 11:57:13 +01:00
Arne Morten Kvarving
9e01b3b790 fixed: only update files if they actually changed
fixes the changed tests output
2021-11-12 11:25:45 +01:00
Arne Morten Kvarving
069882f3e4 fixed: no device handling in test_cusparseSolver
the exception is not thrown while setting up the bridge as in
opencl. rather the exception is thrown in the solve_system call.
2021-11-12 10:29:26 +01:00
Joakim Hove
46ed61455d Reorder SUMMARY and SOLUTION section in test deck 2021-11-12 09:08:30 +01:00
Arne Morten Kvarving
e25caba8ed changed: refactor BDA well contributions
split in API specific classes for Cuda/OpenCL

this to
1) it's cleaner
2) it avoids pulling in openCL code in cuda classes which leads
to clashes between nvidia headers and opencl.hpp

there is still too much API specific things in interface between the
bda components to work through a virtual interface so we still have to cast
to the relevant implementation in various places.
2021-11-11 14:49:33 +01:00
Arne Morten Kvarving
be6c857b16 bda: use forwarding for WellContributions 2021-11-11 13:29:12 +01:00
Arne Morten Kvarving
2120cbf043 added: utility to broadcast multiple variables in one operation 2021-11-09 13:02:05 +01:00
Atgeirr Flø Rasmussen
84392a25b4
Merge pull request #3648 from joakim-hove/phase-usage-constructor
Create PhaseUsage constructor
2021-11-05 15:35:50 +01:00
Bård Skaflestad
2971a3f051
Merge pull request #3659 from joakim-hove/refactor-wellstate-init
Refactor wellstate init
2021-11-03 13:16:34 +01:00
Joakim Hove
05317e1d72 Extract functionality to update target rates to SingleWellState 2021-11-03 12:30:40 +01:00
Joakim Hove
101b277bfe
Merge pull request #3642 from joakim-hove/remove-groupstate-dump
Remove debugging aid GroupState::dump
2021-11-01 17:51:32 +01:00
Joakim Hove
bcdc974585 Create PhaseUsage constructor 2021-11-01 17:04:42 +01:00
Joakim Hove
d213bc9d78 Initialize static perforation data in SingleWellState constructor 2021-11-01 16:02:34 +01:00
Joakim Hove
807ac101d8 Add name member to SingleWellState 2021-11-01 16:02:34 +01:00
Joakim Hove
ab63d14bcd Remove debugging aid GroupState::dump 2021-11-01 13:47:36 +01:00
Arne Morten Kvarving
06bd25575f use std::filesystem directly 2021-11-01 12:31:58 +01:00
Joakim Hove
8673e02317 Add regression testing for model ACTIONX_UDQ 2021-10-25 11:45:32 +02:00
jilocode
ad8e709550 Regression tests added 2021-10-20 11:39:52 +02:00
jilocode
10207cfbb8 Regression added test BASE model6 2021-10-19 19:27:24 +02:00
Bård Skaflestad
38f9558c19
Merge pull request #3617 from totto82/micp_ctest
Add micp test case
2021-10-19 18:05:18 +02:00
Tor Harald Sandve
5dcc584848 Add micp test case 2021-10-19 14:13:28 +02:00
Joakim Hove
c8cbd32f85 Add method WellContainer<T>::wells() 2021-10-19 11:16:41 +02:00
Bård Skaflestad
09b7f287a0
Merge pull request #3604 from akva2/improve_test_drivers
changed: use getopts in test drivers
2021-10-17 17:48:23 +02:00
Arne Morten Kvarving
673b049b9a changed: use getopts in test drivers
the number of options were getting unmanagable as
a flat list.

also add help/usage to the scripts
2021-10-13 14:24:55 +02:00
Joakim Hove
a86573c247
Merge pull request #3605 from atgeirr/remove-redundant-wellmanager
Reinstate tests in test_ecl_output.cc and remove unused classes.
2021-10-13 12:37:34 +02:00
Arne Morten Kvarving
0fa24f7711 update test driver to match opm_add_test 2021-10-13 11:44:20 +02:00
Joakim Hove
29caa8b89f
Merge pull request #3601 from joakim-hove/restart-sched-flag
Restart sched flag
2021-10-13 11:28:15 +02:00
Atgeirr Flø Rasmussen
347ad2da6b Reinstate tests that were commented out due to EclWellManager issues. 2021-10-13 11:10:48 +02:00
Atgeirr Flø Rasmussen
2da4165b3e Stop using EclWellManager in test_ecl_output.cc. 2021-10-13 10:55:05 +02:00
Atgeirr Flø Rasmussen
72be136529 Stop using EclWellManager in test_equil.cc. 2021-10-13 10:50:33 +02:00
Joakim Hove
9b0b4f42a0 Add RESTART_SCHED argument to test registration 2021-10-12 17:21:40 +02:00
Joakim Hove
745b96530d Add serialization testing for WellTestState 2021-10-11 16:40:42 +02:00
Atgeirr Flø Rasmussen
7e5cd73254 Set communication object before constructing vanguard. 2021-10-06 08:52:19 +02:00
Elyes Ahmed
0202b00d59 clean up after review 2021-10-05 13:07:52 +02:00
Elyes Ahmed
f53c597f90 Replacing use of MPI_COMM_WORLD with a variable communicator. 2021-10-05 13:07:52 +02:00
Alf Birger Rustad
61ef539bf5
Merge pull request #3473 from akva2/regression_restart_tests
Add support for regression restart tests
2021-10-05 09:07:19 +02:00
Joakim Hove
681c851edc Disable test creating ecl style output 2021-10-02 20:37:25 +02:00
Joakim Hove
bdeba973fb Add regression testing for ACTIONX + WEFAC 2021-10-01 08:41:25 +02:00
Joakim Hove
33033cd6cc Add actionx testing of GCONPROD 2021-10-01 08:41:25 +02:00
Joakim Hove
86a0662381 Use std::reference_wrapper<> for parallel well info 2021-09-28 21:42:57 +02:00
Joakim Hove
cf340644b2 Add ParallelWellInfo member to SingleWellState 2021-09-28 21:42:57 +02:00
Joakim Hove
064d134711 Add serialize test for UDQState 2021-09-25 11:51:59 +02:00
Joakim Hove
7c358b17df Add serialise test for Action::State 2021-09-24 18:55:54 +02:00
Arne Morten Kvarving
c6d2fc85ef added: option to add a restart run to a regression test
this restarts the simulation at a specified step.
it then compares the results from this run to a separate,
existing regression data set.
2021-09-24 14:34:53 +02:00
Joakim Hove
5fd7432e96
Merge pull request #3538 from joakim-hove/actionx-wconinje
Add regression testing of case ACTIONX_WCONINJE
2021-09-22 10:56:21 +02:00
Joakim Hove
26e9ef37f5 Add regression testing of case ACTIONX_WCONINJE 2021-09-21 10:58:48 +02:00
Joakim Hove
357540bfca Create Action::State external to the vanguard 2021-09-19 10:17:58 +02:00
Joakim Hove
7b833b7706
Merge pull request #3526 from joakim-hove/add-actionx-gconinje-test
Add actionx gconinje test
2021-09-16 13:54:53 +02:00
Joakim Hove
3406bf82dd Add regression testing of actionx/ACTIONX_GCONINJE 2021-09-14 20:54:46 +02:00
Markus Blatt
c84b55c452 Fixes ILU for Dune 2.8
We got compile errors like:

/home/build/opm-simulators/opm/simulators/linalg/FlexibleSolver1.cpp:24:1:   required from here
/usr/include/dune/istl/ilu.hh:140:29: error: 'double' is not a class, struct, or union type

without this patch.
Hence we use the new internal ILU functions if available.
2021-09-13 12:25:49 +02:00
Arne Morten Kvarving
2b1ac22c99 drop aliases for Indices entries
using Indices directly more clearly shows where the data comes
from without having to hop through hoops to do so.
2021-09-06 12:49:01 +02:00
Bård Skaflestad
fcdb4c33ea
Merge pull request #3496 from goncalvesmachadoc/radial
add radial case to regression test
2021-09-01 12:14:22 +02:00
Cintia Goncalves Machado
247511fd49 fix test name 2021-09-01 10:04:24 +02:00
Cintia Goncalves Machado
b675d86aa8 add radial to regression test 2021-09-01 00:13:02 +02:00
Joakim Hove
7bb3dba310 Special case wells with no open connections in ParallelWellInfo 2021-08-31 17:31:45 +02:00
Joakim Hove
1a02ac7bd5
Merge pull request #3487 from joakim-hove/single-well-state
Single well state
2021-08-25 14:27:41 +02:00
Joakim Hove
060eac4999 Add basic functionality for validating special case keywords 2021-08-24 13:50:40 +02:00
Joakim Hove
579aba8d08 Include perforation data in SingleWellState 2021-08-24 12:46:24 +02:00
Joakim Hove
46f45e3999 Add PerfData member to SingleWellState 2021-08-24 12:46:24 +02:00
Joakim Hove
c711e869d8
Merge pull request #3484 from joakim-hove/mod4-gefac-testing
Add regression test for model with GEFAC
2021-08-23 13:52:50 +02:00
Joakim Hove
77a9fd352b Add SegmentState member to SingleWellState 2021-08-23 13:17:24 +02:00
Joakim Hove
f0b73ad29b Add regression test for model with GEFAC 2021-08-23 12:11:33 +02:00
Joakim Hove
2f504536f4 Add well potentials to SingleWellState 2021-08-23 12:05:26 +02:00
Arne Morten Kvarving
08c7ae44ac added: 'update_data' custom target
this allows updating opm-tests reference data repository
with the current results.

this is useful for devs as some of the tests only pass on the
CI system due to slight differences. you can now run this
before applying changes, and thus only reveal real regressions
introduced by your changes.
2021-08-19 08:55:44 +02:00
Joakim Hove
d5ab308fbd Add temperature to SingleWellState 2021-08-15 09:01:21 +02:00
Joakim Hove
1dd9b91ad3 Add member "bool producer" to SingleWellState 2021-08-15 09:01:21 +02:00
Joakim Hove
a54daf75e8 Add trivial class SingleWellState with bhp and thp 2021-08-15 09:01:21 +02:00
Arne Morten Kvarving
f89d0bc469 fixed: add missing initialization call 2021-08-05 11:01:04 +02:00
Joakim Hove
1cbc096d20
Merge pull request #3450 from joakim-hove/small
Small
2021-08-03 18:08:33 +02:00
Paul Egberts
68f7ad65ba include twophase gaswater in the test suite 2021-08-03 12:24:09 +02:00
Joakim Hove
057db0ec0e Add method WellState::name() 2021-07-26 13:07:12 +02:00
Markus Blatt
ea4e4a1520
Merge pull request #3346 from Tongdongq/amgcl-support
Amgcl support
2021-07-21 15:02:25 +02:00
Bård Skaflestad
48e1af8bbe Address Static Code Analysis Warnings
In particular, don't print uninitialized memory (Reorder.cpp:left)
and don't capture objects ('prm') that aren't actually used.  While
here, refactor the initialization of the MT19937 random number
generator.  Constructing this object is too expensive to do for each
try, especially when we can just run the generator in place.
2021-07-13 11:37:57 +02:00
Tong Dong Qiu
aa63da2bd3 Update GPU tests 2021-07-07 17:03:48 +02:00
Bård Skaflestad
d637f5983e Add Serialization Test for WriteRestartFileEvents 2021-07-07 14:30:46 +02:00
Bård Skaflestad
71594c1311
Merge pull request #3411 from joakim-hove/restart-summary-only
Restart summary only
2021-07-02 23:48:18 +02:00
Markus Blatt
8d0a254211
Merge pull request #3364 from blattms/flexible-solver-determine-pressure-idx-from-model
Determine index of pressure from model used to increase usability
2021-07-01 15:22:50 +02:00
Tor Harald Sandve
60f59cd6e6 Potentially reduce gaslift when under well is under group control
Current implemention only support ORAT and GRAT controlled groups
2021-06-30 09:59:09 +02:00
Joakim Hove
a20da30d40 Add test driver for summary-only restart testing 2021-06-26 10:48:10 +02:00
Bård Skaflestad
0ba2c9fa99
Merge pull request #3391 from Tongdongq/handle-exception-cusparse-test
Added exception handling to cusparse test
2021-06-25 21:52:17 +02:00
Bård Skaflestad
5e883e562c Chase Type Specific Aquifer Data API Change
This commit switches to using the new 'typeData' interface for
representing type-specific aquifer data items.  In particular we use
the new 'typeData.is<>()' and 'typeData.get<>()' member functions to
query and access the data that is specific to each aquifer type
(e.g., Carter-Tracy or numerical).

While here, also expand the reported data items for numerical
aquifers to one initial pressure value for each aquifer cell.  This
is needed for restart purposes.
2021-06-25 09:58:27 +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
Tong Dong Qiu
6291ba41b7 Added exception handling to cusparse test 2021-06-18 16:19:39 +02:00
Peter Verveer
7be1bce651 Small fix for the keyword validation 2021-06-18 12:12:58 +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
Tong Dong Qiu
f075c236c1 New error handling from Markus 2021-06-16 15:54:06 +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
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
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
b1600b904f Rename data::WellRates -> data::Wells 2021-06-14 15:27:56 +02:00
Joakim Hove
a22b836b82 PerfData maintains producre / injector status 2021-06-14 09:03:02 +02:00
Joakim Hove
3442af12a2 Rename data::WellRates -> data::Wells 2021-06-13 22:00:59 +02:00
Joakim Hove
454220b9e7 Rename data::WellRates -> data::Wells in opm-common 2021-06-13 08:37:56 +02:00
Bård Skaflestad
faba44dd2e
Merge pull request #3368 from joakim-hove/del-timemap
Remove unused #include <TimeMap>
2021-06-10 17:12:17 +02:00
Markus Blatt
db0f19ba88 Determine index of pressure from model used.
Previously, the user had to specify it in the json file read from the
FlexibleSolver or 1 was used. Unfortunately, the index depends on the
model used and it seem rather opaque to a user what that index is.

With this commit we determine the pressure index from the model.
2021-06-10 16:19:18 +02:00
Joakim Hove
308e191ad5 Remove unused #include <TimeMap> 2021-06-10 14:38:14 +02:00
Joakim Hove
76838cd8a4 Use PerfData for perforation pressure 2021-06-10 07:19:21 +02:00
Joakim Hove
4b69d12335 Use PerfData for perforation rates 2021-06-10 07:18:46 +02:00
Joakim Hove
b6318ac017 Add WellContainer<PerfData> to WellState 2021-06-10 07:18:46 +02:00
Joakim Hove
34481e48c3 Add data container PerfData to use in WellState 2021-06-10 07:18:46 +02:00
Arne Morten Kvarving
b7e2ad3bfe added: PropertyTree class
this is a thin wrapper around boost::property_tree
with this we avoid parsing property tree headers in all
simulator objects
2021-06-09 15:21:52 +02:00
Tong Dong Qiu
31eeb33039 Added error checking to tests 2021-06-08 16:07:38 +02:00
Joakim Hove
023edc67e5 Remove first perf member from Well classes 2021-06-08 14:24:26 +02:00
Arne Morten Kvarving
059140f2ee split out typetag independent code from BlackoilWellModel 2021-06-07 12:04:06 +02:00
Tong Dong Qiu
393ab24154 Updated copyright notice 2021-06-07 11:40:03 +02:00
Tong Dong Qiu
74b46e4d8d Added tests for cusparseSolver and openclSolver 2021-06-07 11:40:03 +02:00
Joakim Hove
fcc4970337
Merge pull request #3318 from akva2/eclwellmodel_no_default
changed: do not set the ebos well model as default type
2021-06-04 09:58:46 +02:00
Joakim Hove
59f36eacc0 Remove WellState::top_segment_index 2021-06-03 10:46:26 +02:00
Joakim Hove
f7b1f90c12 Add method SegmentState::size() 2021-06-03 10:46:26 +02:00
Joakim Hove
ac12c8b3a4 Use SegmentState for rates 2021-06-03 10:46:26 +02:00
Joakim Hove
eac69061c2 Use SegmentState when copying pressure 2021-06-03 10:46:04 +02:00
Joakim Hove
df7d96494b Add small method SegmentState::scale_pressure() 2021-06-03 10:46:04 +02:00
Joakim Hove
bccb4f36e4 Don't test pressure & rates for top segment in non MSW well 2021-06-03 10:46:04 +02:00
Joakim Hove
45e7c8c982 Add WellContainer<SegmentState> member 2021-06-03 10:46:04 +02:00
Joakim Hove
5dc267c6f5 Add class SegmentState 2021-06-03 10:46:04 +02:00
Arne Morten Kvarving
5754747009 add regression test for flow_onephase_energy 2021-06-02 13:57:05 +02:00
Bård Skaflestad
fc47eb8b4f
Merge pull request #3332 from akva2/fix_trans_writer_par
eclwriter: fix regression in parallel
2021-06-01 10:32:20 +02:00
Arne Morten Kvarving
c2211b532f eclwriter: fix regression in parallel
order of constructing and obtaining global transmissibilities
was off. replace constructor argument with a setter so it can be
set at the appropriate time.
2021-06-01 09:08:38 +02:00
Arne Morten Kvarving
c76803b913 changed: make bhp template hidden and use explicit instantations
this to avoid includes in headers.
2021-05-31 11:42:29 +02:00
Bård Skaflestad
bd9b9a7118 Prepare to Save/Restore Richer Set of Aquifer Values
This commit adds logic to communicate more dynamic aquifer values
between the simulation and I/O layers.  In particular, we ensure
that we allocate the 'aquFet' and 'aquCT' substructures of the
dynamic aquifer data as appropriate and that we collect this
information on the I/O rank as part of the restart output process.
We furthermore make the 'ParallelRestart' facility aware of dynamic
aquifer data in preparation of loading these values from the restart
file.
2021-05-28 14:47:17 +02:00
Arne Morten Kvarving
d65a9a5f70 changed: do not set the ebos well model as default type
rather, only set it where we want to use it. this avoids including
eclwellmanager.hh and eclpeacemanwell.hh unnecessarily in
simulator objects (where BlackoilWellModel is used).
2021-05-28 11:28:43 +02:00
Joakim Hove
5ac53f8106 Use well index for segment rates 2021-05-27 10:45:33 +02:00
Joakim Hove
34ef516472 Use well index for segment pressure 2021-05-27 10:45:33 +02:00
Joakim Hove
8e0ed53207 Add method WellContainer::well_index() 2021-05-24 09:14:36 +02:00
Arne Morten Kvarving
70ece6d25a eclwriter: split in typetag dependent and typetag-independent parts 2021-05-22 13:21:09 +02:00
Joakim Hove
23180e06d2 Rename WellStateFullyImplicitBlackoil -> WellState 2021-05-21 15:07:21 +02:00
Arne Morten Kvarving
1614767362 GasLiftSingleWell: split typetag independent code to separate class 2021-05-21 09:09:10 +02:00
Joakim Hove
506a349085
Use wellcontainer2 (#3255)
Use WellContainer<> to manage members in WellState
2021-05-20 16:16:12 +02:00
Tor Harald Sandve
bf87a1b519 Add SPE9_CP_GROUP_RESV to the test suite 2021-05-19 09:44:48 +02:00
Peter Verveer
ad0b62ab1c Simplify the message for keywords with only a single record 2021-05-14 15:12:12 +02:00
Arne Morten Kvarving
861899de2e changed: put WellStateFullyImplicitBlackoil in separate compile unit 2021-05-13 12:01:03 +02:00
Joakim Hove
66c56bb8c3 Add initializer_list based WellContainer constructor 2021-05-12 09:18:58 +02:00
Arne Morten Kvarving
c7c29483e7 fix regression: unconditional dereferences
equilGrid and equilCartesianMapper can only
be dereferenced on rank 0.
2021-05-11 15:21:50 +02:00
Arne Morten Kvarving
3397cd6252 eclbasevanguard: split in template and non-template parts 2021-05-11 09:15:11 +02:00
Bård Skaflestad
9d3cf25366
Merge pull request #3217 from akva2/adjust_enums
adjust to upstream enum changes
2021-05-07 21:48:19 +02:00
Markus Blatt
d462aee2f8
Merge pull request #3204 from akva2/collect_separate_compile_unit
CollectDataToIORank: move to separate compile unit
2021-05-07 08:55:47 +02:00
Joakim Hove
36cc9e8567 Add small class WellContainer to manage well data in WellState 2021-05-06 15:46:52 +02:00
Arne Morten Kvarving
a8627d1974 adjust to upstream enum changes 2021-05-05 22:06:06 +02:00
Arne Morten Kvarving
543dbe7114 CollectDataToIORank: move to separate compile unit
make it a template for grid types. this allows using
explicit template instantation and compile this code
only once per grid type, instead of once per simulator object.
2021-05-03 13:45:52 +02:00
Joakim Hove
8a78dc1c59 Add class GlobalWellInfo and use it from WellState 2021-05-03 13:28:28 +02:00
Bård Skaflestad
ff2caa5675 Well Model Test: Supply Valid 'ecl_index' Values
The WellInterface::initCompletions() member function needs these.
2021-04-30 17:05:20 +02:00
Bård Skaflestad
aa1df1352f
Merge pull request #3197 from akva2/move_to_comp_units
Move to separate compilation units
2021-04-30 16:50:54 +02:00
Arne Morten Kvarving
541ebdde13 phaseUsageFromDeck: move to separate compile unit 2021-04-29 13:00:23 +02:00
Arne Morten Kvarving
bbfda699d3 KeywordValidation: use forwarding 2021-04-29 12:46:49 +02:00
Joakim Hove
8bae5e0127 Add class ALQState to manage the ALQ state in the WellState 2021-04-28 09:33:06 +02:00
Joakim Hove
42a6505cf1
Merge pull request #3179 from joakim-hove/groupstate-dump
Add json dump to GroupState
2021-04-27 07:52:11 +02:00
Bård Skaflestad
6cbe5ae8f4
Merge pull request #3178 from joakim-hove/wellstate-internalize-pu
WellState will internalize PhaseUsage member
2021-04-27 06:33:18 +02:00
Joakim Hove
a68589eb9a WellState will internalize PhaseUsage member 2021-04-27 00:11:04 +02:00
Arne Morten Kvarving
a4c5429341 fixed: include required headers where needed 2021-04-26 22:39:32 +02:00
Joakim Hove
5a4190bbea Add json dump to GroupState 2021-04-26 11:51:07 +02:00
Joakim Hove
7fecd9f433 Create new class GroupState to maintain runtime state of groups 2021-04-21 13:07:57 +02:00
Joakim Hove
c8db0d1090 Assign number of phases in WellState constructor 2021-04-21 13:07:57 +02:00
Kai Bao
06fa81f4e3 following interface change for processEcipseFormat 2021-04-20 11:27:15 +02:00
Kai Bao
06ec3d2420 fixing test_relpermdiagnostics test 2021-04-14 09:48:55 +02:00
Joakim Hove
061b5c2395
Merge pull request #3062 from joakim-hove/enable-actionx-test
Enable new test udq_actionx/ACTIONX_M1
2021-04-13 09:28:32 +02:00
Peter Verveer
1640c4afcf Implement a new keyword validator 2021-04-12 16:47:02 +02:00
Håkon Hægland
61e67b143d Adds a simple test case for gas lift.
Adds a simple test case for gas lift optimization. Currently this is
very simplistic and only covers a fraction of the gas lift optimization
code. The plan is to use this as a building block to add more tests
in the future.
2021-04-01 16:41:46 +02:00
Joakim Hove
0515d3c7f3 Add SPE1 testcase where grid data is loaded iwth IMPORT 2021-03-31 20:39:35 +02:00
Joakim Hove
d750d5c68f Enable new test udq_actionx/ACTIONX_M1 2021-03-31 11:52:23 +02:00
Joakim Hove
3d226abd24 Remove references to RestartConfig 2021-03-26 08:03:07 +01:00
Bård Skaflestad
9d72ee157c
Merge pull request #3130 from totto82/addCO2testCases
add more co2 tests to ctest
2021-03-23 20:55:41 +01:00
Tor Harald Sandve
a204cc4b3c add more co2 tests to ctest 2021-03-23 10:54:54 +01:00
Bård Skaflestad
0468b2eee6
Merge pull request #2972 from goncalvesmachadoc/spider
Add cases to regression tests
2021-03-20 01:14:13 +01:00
Bård Skaflestad
b982ad0fd2 Record Dynamic Well Status in 'wellData()' Output
This commit sets the 'data::Well::dynamicStatus' based on the
dynamically updated 'Schedule' object (i.e., from ACTIONX and
similar) and the results of well/operability testing (WECON and/or
WTEST).  If a well is closed due to economic limits (WECON) we still
provide summary-style data at the timestep that closed the well, but
omit this data at later steps until the well reopens.

We add a new parameter to WellState::report() to distinguish these
situations.

This is in preparation of making the 'BlackoilWellModel' manage both
open and shut wells alike.
2021-03-18 17:28:28 +01:00
Cintia Goncalves Machado
49f3728396
Add test for flow_onephase_energy 2021-03-10 12:15:50 +01:00
Kai Bao
69619339a1 Merge branch 'master' into new_numerical_aquifer 2021-03-04 22:54:36 +01:00
Joakim Hove
74ca0d12e0 Use std::chrono::system_clock with 1/1000 second resolution 2021-02-25 23:50:25 +01:00
Joakim Hove
6f15765f53 Use Schedule time functions - avoid TimeMap 2021-02-25 18:10:22 +01:00
Tor Harald Sandve
0902568fa5 Add CO2STORE test to ctest 2021-02-24 09:56:04 +01:00
Kai Bao
d76251818f adding tests for numerical aquifers 2021-02-22 23:18:43 +01:00
Kai Bao
524e63a255 adapting to the upstream interface change. 2021-02-22 23:15:26 +01:00
Joakim Hove
fc398c8555
Merge pull request #3067 from joakim-hove/add-tran-parallel-test
Add parallel test of partial TRAN EDIT
2021-02-17 16:44:15 +01:00
Joakim Hove
2df154017b Add parallel test of partial TRAN EDIT 2021-02-16 08:04:12 +01:00
Joakim Hove
6383f3c1ac Use class based enums for VFP flow types 2021-02-15 19:17:39 +01:00
Joakim Hove
648b0f6581 Use Well::updateDeckPI( ) 2021-02-11 13:47:27 +01:00
Bård Skaflestad
27a11508ae
Merge pull request #3031 from totto82/relperm_diag
Removing explicit usage of the Grid in the relperm diagnostics
2021-01-27 09:18:16 +01:00
Tor Harald Sandve
c145722798 pass CartesianIndexMapper instead of the grid to the RelpermDiagnositics 2021-01-26 14:59:36 +01:00
Joakim Hove
e4789d4eb7 Use std::reference_wrapper for VFP tables 2021-01-26 07:56:59 +01:00
Joakim Hove
208209bd95 Don't test serialization for isolated ScheduleState 2021-01-20 09:00:30 +01:00
Atgeirr Flø Rasmussen
3a0dbdc6e7
Merge pull request #2993 from blattms/stdwell-comm-rebase-split-cont-clean
Final fixes to make distributed wells work for Norne.
2021-01-15 15:42:45 +01:00
Joakim Hove
17fcdfc87a Use ScheduleState to handle VFP propertes + simplifications 2021-01-14 19:22:34 +01:00
Joakim Hove
31b2f597ac Enable serialization testing for ScheduleDeck / ScheduleState 2021-01-12 14:12:39 +01:00
Joakim Hove
914bbeca82 Fetch messagelimits from ScheduleState 2021-01-12 07:44:10 +01:00
Kai Bao
a3004580e6 adapting to the directory change in opm-common related to aquifer 2021-01-08 23:18:41 +01:00
Markus Blatt
c037bd762d
Merge pull request #2990 from atgeirr/testing-precfactory-operators
Only add AMG preconditioners to factory if sensible.
2020-12-22 09:52:53 +01:00
Atgeirr Flø Rasmussen
2cce4a1af5
Merge pull request #2962 from totto82/addFLowDynTest
add flow solvent dynamic test
2020-12-21 16:07:21 +01:00
Tor Harald Sandve
4636e7956e add flow_dyn test 2020-12-21 08:25:39 +01:00
Markus Blatt
69fd6495c0 Added factory to construct the global representation of perf data.
Some of our computations are heavily serial and need a complete
representation of the data attached to all perforation no matter
whether a perforation lives on the local partition or not. This commit
adds a factory that allows to easily create such a representaion and
helps writing data back to the local representation.
2020-12-18 14:48:19 +01:00
Markus Blatt
a9c327b321 refactored ParallelWellInfo test code for further testing. 2020-12-18 14:48:19 +01:00
Atgeirr Flø Rasmussen
d910d42f6e Only add AMG preconditioners to factory if sensible.
Also add test using a new operator class, that would not compile
without the change.
2020-12-17 14:54:59 +01:00
Arne Morten Kvarving
b7c8baf08f add serialization test for AutoICD 2020-12-16 08:36:30 +01:00
Markus Blatt
35218bf042 Added possibility to communicate values from perforations below. 2020-12-10 11:06:28 +01:00
Bård Skaflestad
0e938c0ca7
Merge pull request #2941 from totto82/dunifyInitCode
dunify and make the initialization parallel
2020-12-09 20:46:28 +01:00
Cintia Goncalves Machado
e0f7ae0663 add spider case to regression 2020-12-08 14:51:15 +01:00
Markus Blatt
c1da6a896a Cleanup wellstatefullyimplicit test. 2020-12-07 20:41:24 +01:00
Markus Blatt
562f9ffd03 Fixes test for WellStateFullyImplicitBlackoil 2020-12-07 15:40:51 +01:00
Markus Blatt
4edca71a1b Correct pressure and pvt region index for distributed wells.
To get this we need to determine which process has the
very first open well connection and use that to broadcast
pressure and pvt region index.
2020-12-07 15:40:50 +01:00
Arne Morten Kvarving
f3c5a496c2 changed: use BOOST_CHECK instead of BOOST_TEST
BOOST_TEST is not available in older versions of boost.
in particular this broke building on rh6/7.
2020-12-07 08:34:56 +01:00