Commit Graph

1682 Commits

Author SHA1 Message Date
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
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
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