OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,420 Commits 24 Branches 102 Tags 90 MiB
725af1442e
Commit Graph

871 Commits

Author SHA1 Message Date
Joakim Hove
a0aa7fcc2b Use shared SummaryState when instantiating WellsManager 2019-05-29 07:44:23 +02:00
Joakim Hove
511645d12c Use InjectionControls and ProductionControls data classes 2019-05-23 16:27:17 +02:00
Joakim Hove
b6840db604 Use new well implementation Well2 from opm-common 2019-05-22 21:47:45 +02:00
Bård Skaflestad
c4134fba76 Update Data: Make Protocol Aware of RFT Files 
If a simulation run intentionally changes an RFT file, then that
change should be reflected in the new reference data.
 2019-05-16 13:38:57 +02:00
Torbjørn Skille
a7fd029cbe run compareECL once, checking all files in one go 2019-05-10 15:25:14 +02:00
Arne Morten Kvarving
cdd1048b68 changed: compareECL now needs -t UNRST 
previously this was the default, now the default is to compare
files of all types.
 2019-05-09 07:55:05 +02:00
Arne Morten Kvarving
c4bcd9e467
Merge pull request #1814 from tskille/master 
updated test scripts to use eclipse compatible restart
 2019-05-08 14:25:14 +02:00
Markus Blatt
d2efdcfaa5 Implement correct ignore thresholds for NNC with/without EDITNNC. 
It seems like eclipse ignores NNCs with small transmissibility.
Small means less than 1e-6 for Eclipse (Even if it says that it
is ignoring values below 1e-5 and/or zero values)!.
This commit now implements the same threshold during IO.

Also fixes a bug when applying EDITNNC, it needs to have cell1<=cell2 to work.
 2019-05-08 13:50:51 +02:00
Atgeirr Flø Rasmussen
c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00
Andreas Lauser
d329547463 EclProblem: clean up the time management code 
- when an episode/report step is over, the next is started by endEpisode()
- the problem does not deal with updating the simulation time anymore
- rename `episodeIdx` in to `reportStepIdx` the 'EclWriter' because
  this variable is -- and always has been -- the report step number
  used by some parts of `opm-output`'s ECL writing code (the report
  step number is equivalent to the episode index plus 1). IMO, the
  output and parser code should be made more consistent in regard of
  whether it expects 0-based or 1-based indices, but this is a story
  for another day.
 2019-05-03 14:07:15 +02:00
Andreas Lauser
d9be3393d7 equil test decks: make them feature one time step 
the output writing code has issues if no time steps are specified...
 2019-05-03 14:06:41 +02:00
Torbjørn Skille
a9c7d11235 updated test scripts to use eclipse compatible restart 2019-05-02 11:35:26 +02:00
Markus Blatt
c9a06f8bb6 Initialize all members of Opm::Data::Connection 2019-04-25 10:00:59 +02:00
Joakim Hove
63f6f34906
Merge pull request #1781 from andlaus/adapt_to_checkDeck_changes 
also pass the parseContext and errorGuard to Opm::checkDeck()
 2019-04-05 12:07:40 +02:00
Andreas Lauser
6f1018f11a also pass the parseContext and errorGuard to Opm::checkDeck() 2019-04-04 18:13:36 +02:00
Kai Bao
ca69e2334a recovering well restart data for multisegment well 
When multisegment wells are involved for RESTART, based on the recovered
segment-related quantities as Opm::data::Segment objects, the segment
phase rates and segment pressure are recovered as part of the
WellStateFullyImplicitBlackoil.
 2019-04-04 16:22:19 +02:00
Bård Skaflestad
dce27c6829 WellState FIBO: Return Segment Vectors from report() 
This commit extends class WellStateFullyImplictBlackoil to report
segment-related quantities as Opm::data::Segment objects (included
in Opm::data::WellRates objects).  All wells have at least a top
segment in the context of WellState FIBO, so there is a meaningful
value to report for each well.

We put the extraction of segment-related quantities into a new
helper function

    WellStateFullyImplicitBlackoil::reportSegmentResults()

to avoid cluttering up the body of report() more than absolutely
needed.

The primary use-case for this is assigning appropriate values to
items 8 through 11 of restart vector RSEG.  In turn, this will
enable restoring these quantities from a restart file.
 2019-04-04 16:22:19 +02:00
Bård Skaflestad
55e452c605 Well State FIBO: Report() Segment Results by Seg-Numbers 
This commit adds a new data member, seg_number_, that maps a linear
segment index (0 .. #segments - 1) to the appropriate segment number
(segment ID).  This ensures that member function report() is able to
produce segment results in terms of user-assigned segment numbers
rather than linear indices internal to the simulator and its state
variables.  This, in turn, decouples the well state object from the
output (summary/restart) code and makes the restart facility more
self contained.

Rewrite the unit test for WellStateFullyImplicitBlackoil to account
for the new indexing scheme when assigning the synthetic segment
results.

While here, also abide by the file's naming convention for data
members and locals.
 2019-04-04 16:22:19 +02:00
Bård Skaflestad
45689f3ade WellState FIBO (test): Add Some Vertical Spacing for Separation 
Suggested by: [at]GitPaean
 2019-04-04 16:22:19 +02:00
Bård Skaflestad
2418df701f WellState FIBO: Return Segment Vectors from report() 
This commit extends class WellStateFullyImplictBlackoil to report
segment-related quantities as Opm::data::Segment objects (included
in Opm::data::WellRates objects).  All wells have at least a top
segment in the context of WellState FIBO, so there is a meaningful
value to report for each well.

We put the extraction of segment-related quantities into a new
helper function

    WellStateFullyImplicitBlackoil::reportSegmentResults()

to avoid cluttering up the body of report() more than absolutely
needed.

The primary use-case for this is assigning appropriate values to
items 8 through 11 of restart vector RSEG.  In turn, this will
enable restoring these quantities from a restart file.
 2019-04-04 16:22:19 +02:00
Atgeirr Flø Rasmussen
e8da0e8fd5
Merge pull request #1776 from atgeirr/update-test_equil 
Update test_equil.cpp for upstream changes.
 2019-04-02 08:20:05 +02:00
Atgeirr Flø Rasmussen
c28d77e087 Update test_equil.cpp for upstream changes. 2019-03-28 15:47:44 +01:00
Joakim Hove
77bd1c8019 Add PERM values in test deck 2019-03-21 17:00:56 +01:00
Atgeirr Flø Rasmussen
f18477ce71
Merge pull request #1757 from atgeirr/improve_cpr_mod 
Improve CPR solver
 2019-03-21 11:19:10 +01:00
hnil
31f4c01938 Changes to make CPR able to use general indexing. 2019-03-15 11:27:38 +01:00
Arne Morten Kvarving
e12b959def fix test_blackoil_amg 2019-03-14 11:52:21 +01:00
Atgeirr Flø Rasmussen
13cd05fc19 Add weights argument to test for BlackoilAmg. 2019-03-14 09:56:12 +01:00
Atgeirr Flø Rasmussen
a80527f808
Merge pull request #1753 from atgeirr/fix-hardcoded-phase-indices 
Replace hardcoded phase indexing.
 2019-03-13 11:07:23 +01:00
hnil
3bcc80cc5b changes to make test compile, however the tests tests matrixes functionality not used in flow 2019-03-12 15:13:38 +01:00
Atgeirr Flø Rasmussen
ea9783277d Replace hardcoded phase indexing. 2019-03-11 11:36:41 +01:00
Joakim Hove
485db348f0 Move well includes to subdirectory Well/ 2019-03-07 15:30:33 +01:00
Andreas Lauser
ef956da9b5 make the build system happy about the imported ebos binary 
also, a few data files changed their location.
 2019-02-27 22:34:10 +01:00
Arne Morten Kvarving
8d6e903c3f Import ebos from eWoms 2019-02-27 10:48:51 +01:00
Arne Morten Kvarving
b5f47e31c9 add a regression test using NNCs 2019-02-13 12:22:03 +01:00
Arne Morten Kvarving
5da7b54047 remove unused local typedef 2019-02-13 11:55:09 +01:00
Andreas Lauser
51b24d33d5 EclWriter: remove obsolete writeOutput() overload 
this has been unused for any simulator for a while. the only code
which called it was the ECL output test, but this one could be easily
ported.
 2019-02-06 12:21:08 +01:00
Atgeirr Flø Rasmussen
7c30ee46ce
Merge pull request #1713 from fgfuchs/replace_well_switching_logger 
Replace well switching logger
 2019-01-21 21:56:56 +01:00
Franz G. Fuchs
129e7d181e replace well switching logger with deferred logger 2019-01-18 14:04:30 +01:00
Arne Morten Kvarving
fd7db0b94a fixed: spurious white space 2019-01-17 11:29:54 +01:00
Franz G. Fuchs
70425a681f style changes 2019-01-14 09:22:17 +01:00
Franz G. Fuchs
828c3c7949 fix for variable number of messages 2019-01-11 19:05:11 +01:00
Franz G. Fuchs
831a374d02 gather deferredLogger implemented 2019-01-11 13:53:18 +01:00
Atgeirr Flø Rasmussen
601cce155c
Merge pull request #1693 from GitPaean/ignoring_well_no_perf 
not adding wells without perforations to WellsManager
 2019-01-10 14:47:20 +01:00
Kai Bao
affb767017
Merge pull request #1642 from WesselDeZeeuw/AquiferFetkovich 
Aquifer fetkovich
 2019-01-10 13:06:08 +01:00
Kai Bao
12cf3b6d58 adding the unit_test for PR#1693 2019-01-10 11:29:28 +01:00
Atgeirr Flø Rasmussen
9c799b9c97
Merge pull request #1698 from fgfuchs/new-feature-deferredlogger 
New feature deferredlogger
 2019-01-09 07:27:49 +01:00
Franz G. Fuchs
040d576839 Use angle brackets for includes 
verify that the tagged messages are forwarded correctly
 2019-01-08 13:26:19 +01:00
Franz G. Fuchs
da1ddbfd53 test tagged mesages 2019-01-08 12:22:35 +01:00
Franz G. Fuchs
bef6cd9ce7 renamed class instance 2019-01-08 12:17:18 +01:00
Franz G. Fuchs
c815c56287 new feature: DeferredLogger class 2019-01-08 11:28:18 +01:00
Kai Bao
47b933a58e removing DynamicListEconLimited 
it is not used anymore. A lot of related implementation has been moved
to WellTestState.

Its existence makes some logic rather confusing and some new development
not easy.
 2019-01-08 11:28:11 +01:00
Joakim Hove
8a9df385af Add ErrorGuard when parsing 2019-01-07 10:44:33 +01:00
WesselDeZeeuw
214c963177 correction to update_reference_data.sh file 2019-01-03 13:04:10 +01:00
WesselDeZeeuw
b3deeed165 Changed the compare and test files, to extend with a test case for the fetkovich aquifer 2019-01-03 13:04:10 +01:00
Kai Bao
1ddcfcb679 adding test for polymer_injectivity 2018-12-12 16:24:24 +01:00
Arne Morten Kvarving
51da91c1ad remove files moved to opm-simulators-legacy 2018-11-27 11:00:21 +01:00
Tor Harald Sandve
b661791a63 Remove usage of BlackoilState class 
This allows (re)moving of the following files
opm/autodiff/RateConverter.hpp
opm/autodiff/Compat.cpp
opm/autodiff/Compat.hpp
opm/core/props/BlackoilPropertiesInterface.hpp
opm/core/simulator/BlackoilState.cpp
opm/core/simulator/BlackoilState.hpp
opm/core/simulator/BlackoilStateToFluidState.hpp
opm/core/utility/initHydroCarbonState.hpp
opm/polymer/PolymerBlackoilState.cpp
opm/polymer/PolymerBlackoilState.hpp
tests/test_blackoilstate.cpp
 2018-11-27 09:38:38 +01:00
Arne Morten Kvarving
e858166402 remove legacy tests from update data script 2018-11-22 07:45:30 +01:00
Arne Morten Kvarving
f771049f93 build system cleanup 2018-11-16 15:01:59 +01:00
Arne Morten Kvarving
f027262ec4 remove files 2018-11-16 14:53:37 +01:00
Andreas Lauser
e110fac52a
Merge pull request #1633 from akva2/rogue_and_unwanted 
Remove some rogue includes and unwanted opm/autodiff/GridHelpers.hpp usage
 2018-11-14 16:00:30 +01:00
Arne Morten Kvarving
fe8adb51d8 remove rogue includes 2018-11-14 15:37:44 +01:00
Arne Morten Kvarving
023924d057 changed: use UgGridHelpers directly 
GridHelpers.hpp will be moved
 2018-11-14 15:37:44 +01:00
Arne Morten Kvarving
911a89fc4c fixed: use the ebos ISTL class 
to avoid legacy code in tests that will sit in this repo
 2018-11-14 12:27:39 +01:00
Arne Morten Kvarving
d3fa23bc2e changed: split legacy VFP test into own file 2018-11-14 09:54:33 +01:00
Arne Morten Kvarving
c5ae3adbbf changed: split VFP classes in base (ebos) and legacy 
to get rid of eigen usage in ebos based classes
 2018-11-14 09:54:33 +01:00
Atgeirr Flø Rasmussen
9fc272fb85 Add runner script for tests needing MPI. 
The script run-parallel-unitTest.sh takes as its arguments:
 - number of processes (to be passed as -np parameter to mpirun)
 - directory in which to find the binary to be executed
 - remaining arguments form the command line for the test.
 2018-11-13 10:31:23 +01:00
Atgeirr Flø Rasmussen
566f6813dd Created gatherConvergenceReport() function and test. 2018-11-13 10:30:32 +01:00
Atgeirr Flø Rasmussen
576852b299 Remove cell_index from ReservoirFailure struct. 2018-11-13 10:19:15 +01:00
Tor Harald Sandve
08c4a4857b Adapt to changes in schedule interface 2018-10-29 10:39:14 +01:00
Andreas Lauser
4cf81c69b1
Merge pull request #1602 from atgeirr/convergence-status 
Add convergence status class
 2018-10-25 14:16:29 +02:00
Atgeirr Flø Rasmussen
671ed75535 Made ReservoirFailure and WellFailure into classes. 2018-10-25 13:08:16 +02:00
Atgeirr Flø Rasmussen
852765a65b Address review comments. 2018-10-25 12:12:06 +02:00
Atgeirr Flø Rasmussen
2bf4d15285 Rename ConvergenceStatus -> ConvergenceReport. 2018-10-25 11:57:47 +02:00
Atgeirr Flø Rasmussen
42cb36ab9f Improve severity feature, add severityOfWorstFailure(). 2018-10-23 11:28:32 +02:00
Atgeirr Flø Rasmussen
34afb0b254 Add severity (normal, too large, nan) to failure objects. 2018-10-23 10:52:34 +02:00
Atgeirr Flø Rasmussen
892b24c435 Make well failure types more informative. 
Separating control eq failures with THP, BHP and Rate.
 2018-10-23 10:26:39 +02:00
Atgeirr Flø Rasmussen
891912b04a Add ConvergenceFailure class and test. 2018-10-23 10:03:13 +02:00
Tor Harald Sandve
df4db9dfbc Add support for MINPVV 
The test and code for pinchprocessor is removed since it is no
longer used.
 2018-10-15 13:39:47 +02:00
Joakim Hove
e6be0f5ca6 Make sure the restart files used when testing are OPM style 2018-09-14 14:28:04 +02:00
Joakim Hove
8979d1a3b3 Jenkins can ignore extra keywords when doing regression testing 2018-09-13 12:38:51 +02:00
Arne Morten Kvarving
0f482eef5b changed: adjust to compareSummary being part of compareECL 2018-09-10 08:44:53 +02:00
Andreas Lauser
f22f1668f3 fix some rebase fallout 2018-08-15 23:36:56 +02:00
Andreas Lauser
43ac2e36c6 remove the Flow prefixes of parameters only used by flow 
this has been requested by [at]atgeirr.

Note: The FlowLinearSolverVerbosity, FlowNewtonMaxIterations and
FlowNewtonMinIterations parameters are still prefixed because they
clashes with parameters registered deeply within eWoms.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
b5cddef928 flow: switch it to use the eWoms parameter system 
this has several advanges:

- a consistent and complete help message is now printed by passing the
  -h or --help command line parameters. most notably this allows to
  generically implement tab completion of parameters for bash
- the full list of runtime parameters can now be printed before the simulator
  has been run.
- all runtime parameters understood by ebos can be specified
- no hacks to marry the two parameter systems anymore
- command parameters now follow the standard unix convention, i.e.,
  `--param-name=value` instead of `param_name=value`

on the negative side, some parameters have been renamed and the syntax
has changed so calls to `flow` that specify parameters must adapted.
 2018-08-15 23:34:32 +02:00
Arne Morten Kvarving
1e574b8c2f changed: use the built-in analysis in the comparison programs 2018-08-14 11:07:29 +02:00
Arne Morten Kvarving
b1b5759d7f changed: do not remove the result path in regression tests 
in particular this leads to issues with tests sharing
result dir
 2018-08-09 08:24:41 +02:00
Atgeirr Flø Rasmussen
11b987b97d
Merge pull request #1544 from joakim-hove/use-opm-pack 
Relocate restart data file in tests
 2018-08-08 13:27:01 +02:00
Andrea T. Lonn
0084d1d369 Updated the files with the new test. 2018-08-07 16:21:37 +02:00
Andrea T. Lonn
41ead55163 Changed the names of the tests to match the new names in opm-test. 2018-08-07 09:22:04 +02:00
Andrea T. Lonn
919b43cd1f Updated the files with the new tests. 2018-08-07 09:22:04 +02:00
Joakim Hove
8e71e3878f Relocate restart data file in tests 2018-08-06 08:01:55 +02:00
Bård Skaflestad
b087cf54af
Merge pull request #1495 from blattms/red-black-ilu 
Added support for red black ilu
 2018-08-01 18:52:07 +02:00
Andreas Lauser
ac2bc410f3 adapt to the fluid system naming convention change in opm-material 
note that almost the only thing which is affected is legacy code.
 2018-07-27 12:54:02 +02:00
Markus Blatt
41e5779ae3 Extended test for the reordering 2018-07-20 14:43:40 +02:00
Markus Blatt
a1650a58f4 Added Welsh Powell graph coloring 2018-07-20 14:43:40 +02:00
Markus Blatt
59b99d9ef9 Fixed unused variable warnings in test_milu 2018-07-20 14:42:46 +02:00
Markus Blatt
397fc78405 Add additional MILU test. 2018-07-20 14:42:46 +02:00
Markus Blatt
5333a2430f Be verbose only when compiled with -DDEBUG 2018-07-20 14:42:46 +02:00
Markus Blatt
e1e289dc1e Added MILU0 decomposition 2018-07-20 14:42:46 +02:00
Andrea T. Lonn
7426b5db11 Added the test for BASE_MODEL_1.DATA. 2018-07-20 13:35:54 +02:00
Andrea T. Lonn
383a0b7964 Included my tests in update_reference_data.sh 2018-07-13 10:21:04 +02:00
Arne Morten Kvarving
35d10a61b8 changed: improve reference data update script 
- separate code and data
- no prt files for any tests
 2018-07-04 10:49:18 +02:00
Kai Bao
a154d89197
Merge pull request #1501 from totto82/wtest 
Implement WTEST support
 2018-07-04 10:45:27 +02:00
Andreas Lauser
864fc12469 fix extra compiler warnings 
this is only relevant people who are masochistic enough to go beyond
`-Wall`. (note that at this warning level, there is plenty of noise from
Dune and other upstream dependencies.)
 2018-07-02 09:17:56 +02:00
Tor Harald Sandve
e509d9187a
Revert "Add test for cases with Carlson’s hysteresis model" 2018-06-29 14:07:39 +02:00
Andreas Lauser
6e5793b674
Merge pull request #1525 from totto82/addTestForEhystr 
Add  test for cases with Carlson’s hysteresis model
 2018-06-29 14:03:29 +02:00
Tor Harald Sandve
22d144c3cd rename completion to connection 2018-06-28 15:49:45 +02:00
Tor Harald Sandve
0f4038342d add update data for wecon_wtest 
and fix filename inconsistency
 2018-06-28 10:16:29 +02:00
Tor Harald Sandve
f2ba643bc9 Add test case with Carlson’s hysteresis model where drainage curve (=0) or imbibition curve (=1) is used for the wetting phase 2018-06-27 15:28:25 +02:00
Atgeirr Flø Rasmussen
a287d877da Add PORV acceptance test running Norne. 2018-06-26 14:24:08 +02:00
Andreas Lauser
26e6d56930 do explicit put properties into the the Ewoms::Properties namespace anymore 
instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
 2018-06-15 20:22:07 +02:00
Joakim Hove
2bd9c0ea78 Rename Completions -> Connections 2018-06-11 14:11:32 +02:00
Rohith Nair
123d3c68c5 edit 2018-06-04 15:29:01 +02:00
Rohith Nair
a0db7c3229 Add test for carter tracy aquifer 2018-06-04 15:29:00 +02:00
Kai Bao
18917b81f4 adding THP well control equation 2018-05-28 16:05:02 +02:00
Atgeirr Flø Rasmussen
ffd1f76c7c
Merge pull request #1474 from akva2/data_to_tests 
data -> tests
 2018-05-14 07:36:33 +02:00
Arne Morten Kvarving
7f32dad6c7 data -> tests 2018-05-08 10:39:48 +02:00
Tor Harald Sandve
54c8a48481 code clean-up based on review 2018-05-08 10:22:47 +02:00
Tor Harald Sandve
936220f85c Add test case for thermal simulator in flow 2018-04-30 13:56:15 +02:00
Arne Morten Kvarving
45f70f1a38
Merge pull request #1451 from akva2/missing_tests_to_root 
fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT
 2018-04-13 11:48:20 +02:00
Joakim Hove
4e7213b97a Use VFPProdTable constructor 2018-04-12 20:04:26 +02:00
Kai Bao
ed49fd1e88 adapting to the change related to VFP from the parser. 2018-04-11 09:22:52 +02:00
Arne Morten Kvarving
2f3996cc15 fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT 2018-04-09 10:40:34 +02:00
Andreas Lauser
3288548c7e disable asynchronous output for the ECL output test 
this leads to crashes deeply inside libecl. My cursory hypotheses are
that this test makes the assumption that the output is written
synchronously (it tries to read back the results from disk
immediately) and/or that libecl is not threadsafe.
 2018-03-21 10:31:15 +01:00
Kai Bao
f098579e0b fixing test_multmatrixtransposed 2018-03-13 12:58:44 +01:00
Andreas Lauser
7b56e9e9df clean up the determination of the directory for output 
this should be done by the vanguard, not by the problem!
 2018-03-12 16:51:30 +01:00
Atgeirr Flø Rasmussen
14645fb1b8
Merge pull request #1429 from akva2/remove_repo_update_data 
changed: remove repos from regression data update script
 2018-03-09 14:15:24 +01:00
Atgeirr Flø Rasmussen
42c41efa4e Leave BOOST_TEST_DYN_LINK setting to the build system. 2018-03-09 12:56:51 +01:00
Atgeirr Flø Rasmussen
8070e9d229
Merge pull request #1397 from blattms/system-amg-rebased 
Add support for CPR (and variants) for flow_ebos
 2018-03-09 12:46:27 +01:00
Arne Morten Kvarving
a7d1544585 changed: remove repos from regression data update script 2018-03-09 09:35:15 +01:00
Kai Bao
f071c4c647 changing the PVTO in test_ecl_output 
to make the table passing the sanity check.
 2018-03-08 09:54:08 +01:00
Kai Bao
75e6bcefbb fixing test_transmissibilitymultipliers 
due to the change of the PVTO table policy from the parser
 2018-03-07 10:01:34 +01:00
Kai Bao
56caffab67 fixing comments for PR#1416 2018-02-28 10:26:54 +01:00
Kai Bao
b71949b09e adding a test for polymer oil water 2018-02-28 08:39:38 +01:00
Markus Blatt
247241c037 Added test for multMatrixTransposed. 2018-02-26 16:11:53 +01:00
Joakim Hove
b6e8e9c6fb Rename test-deck to get consistent case 2018-02-20 14:34:31 +01:00
Tor Harald Sandve
998a6339cb Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Atgeirr Flø Rasmussen
5f8124bfbf Add integration test with no wells. 2018-02-15 10:07:58 +01:00
Arne Morten Kvarving
adee0a1649 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:04:48 +01:00
Atgeirr Flø Rasmussen
39793ec932 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Atgeirr Flø Rasmussen
cf9b7c39b9 Adapt to moved opm-grid headers. 2018-02-10 08:33:33 +01:00
Andreas Lauser
3d0fca2f08 adapt to the gridManager() -> vanguard() change in ewoms 2018-02-08 16:27:42 +01:00
Andreas Lauser
436c9f8791 rename the "grid manager" to "vanguard" 
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
 2018-02-08 16:26:58 +01:00
Markus Blatt
8456a84ec9 Prevent unused variable warning when compiling test_blackoil_amg 2018-02-07 16:58:51 +01:00
Markus Blatt
e5de96e5f4 Make test_blackoil_amg compile. 
There was typo in the last fix.
 2018-02-07 16:58:09 +01:00
Markus Blatt
ffda4f96d5 Adjust test to changed constructor. 2018-02-06 12:44:21 +01:00
Markus Blatt
f5d81513da First version of a AMG for the Blackoil equations. 
The approach is inspired by Geiger's system-amg but we use dune-istl
aggregation AMG for it. On the fine level all unknowns attached to a cell
form a matrix block and are treated fully coupled. To form the first
coarse level system we use only the pressure component to guide the aggregation
and neglect all other unknowns on the fine level. All other level are formed
in the usual way by scalar aggregation.

Currently,it has to be requested for flow_ebos manually by passing
"linear_solver_use_amg=true amg_blackoil_system=true" to it.
 2018-02-05 22:37:01 +01:00
Arne Morten Kvarving
141186ad1d changed: opm/[core -> common]/utility/parameters 2018-01-30 16:33:45 +01:00
Arne Morten Kvarving
0aca27ab52 changed: rename test_equil test_equil_legacy 2018-01-19 14:48:40 +01:00
Arne Morten Kvarving
e674fd2b16 not going to execute these 2018-01-17 15:19:34 +01:00
Arne Morten Kvarving
c03a980199 Import the remaining code from opm-core 2018-01-17 15:18:56 +01:00
Steinar Foss
8788924608 test_relpermdiagnostics: ParseContext set to default for all enum fields. 2018-01-17 11:27:16 +01:00
Steinar Foss
b26c7cdbe0 test_relpermdiagnostics makes no reference to PARSE_EXTRA_RECORDS. 2018-01-17 10:34:01 +01:00
Steinar Foss
792b0e7f9d test_RelpermDiagnostics: .DATA file correct, test throws exception for parser errors. 2018-01-17 09:50:21 +01:00
Steinar Foss
57d36b5e51 test_RelpermDiagnostics made to use PARSE_EXTRA_RECORDS. 2018-01-16 17:59:05 +01:00
Tor Harald Sandve
9192380308 Add support for PBDV and PDDV in initstateequil.hh 2018-01-09 10:42:04 +01:00
Kai Bao
efeccd8e74 fixing a test related to history mode. 2018-01-08 09:08:05 +01:00
Arne Morten Kvarving
6704ae0bb8 add support for parallel restart tests 2018-01-04 13:48:43 +01:00
Andreas Lauser
817f91d176 make the equil test work in the presence of dune-fem 2018-01-03 18:53:03 +01:00
Andreas Lauser
4e37c53038 restore the hydrostatic equilibration test from opm-core 
This involved quite a bit of kicking and screaming. The result
certainly is not pretty, but it works.
 2018-01-03 12:28:12 +01:00
Tor Harald Sandve
d099d88625 Add SPE1CASE2_OILGAS test case 2017-12-05 09:38:21 +01:00
Roland Kaufmann
0c53ac1509 Add classes for event-handling 
The new classes Event and EventSource can be used as a simple mechanism
for implementing event-based callbacks in the simulators.
 2017-12-04 16:24:14 +01:00
Kai Bao
ea3cbd1fe8 removing numComponents() from WellInterface 
which is dumplicated from BlackoilWellModel.
 2017-11-30 16:31:48 +01:00
Tor Harald Sandve
c787f5a251 Handle WEFAC 
Added test combining WEFAC and GEFAC
 2017-11-30 13:45:05 +01:00
Arne Morten Kvarving
937e8afb77 fixed: missing msw_3d in commit message for the opm-data PR 2017-11-29 09:45:09 +01:00
Tor Harald Sandve
e350c04871 Fix date for long simulation times 2017-11-28 13:37:00 +01:00
Atgeirr Flø Rasmussen
401aa28c08
Merge pull request #1340 from totto82/solventAndResv 
Make it possible to combine solvent and RESV
 2017-11-27 07:20:24 +01:00
Atgeirr Flø Rasmussen
369e9f5a06
Merge pull request #1344 from atgeirr/remove-legacy-polymer 
Remove legacy fully implicit polymer simulator.
 2017-11-27 07:19:01 +01:00
Atgeirr Flø Rasmussen
eabd06389c Stop updating reference data for legacy flow_polymer regression test. 2017-11-24 12:38:55 +01:00
Kai Bao
f87e6d35db removing more legacy Multisegment Wells related. 2017-11-24 12:27:43 +01:00
Tor Harald Sandve
85aa6d41cc Adress PR review issues 2 2017-11-24 10:52:57 +01:00
Tor Harald Sandve
054361d537 Make it possible to combine solvent and RESV 
Compute the conversion factor for solvent using the RateConverter.hpp
 2017-11-22 15:21:21 +01:00
Tor Harald Sandve
197019d865 Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve
5bb7bc1185 Remove the usage of partition_unif_idx() from opm-core 2017-11-21 15:01:52 +01:00
Tor Harald Sandve
d6ea5cc402 Cleaning the initialization code 
-remove whitespaces
-fix documentation
 2017-11-21 12:52:07 +01:00
Tor Harald Sandve
0ef82665f5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
51f48fcd13 Remove blackoilPhases and phaseUsage from the initialization code 
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
36e8f1bfec Remove BlackoilProps from equil initalization code 
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
 2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen
f29f1b49d1 Merge pull request #1122 from atgeirr/fix-type-bug-in-equil 
Fix type bug in equil
 2017-11-14 14:40:47 +01:00
Arne Morten Kvarving
e0907ddc49 remove 'flow_solvent' and associated files 
use 'flow'
 2017-11-13 14:21:10 +01:00
Arne Morten Kvarving
baa4f0b0c3 add msw_3d_hfa test 2017-11-10 15:15:24 +01:00
Arne Morten Kvarving
e190aec229 added: add new files in tests/update_reference_data.sh 
a bit dangerous locally but this script is mainly for CI usage
and this is annoying to have to do manually.
 2017-11-10 15:15:24 +01:00
Arne Morten Kvarving
c0a1c7fffb move spe5 test to flow 2017-11-10 15:15:24 +01:00
Arne Morten Kvarving
55538f23c4 add polymer test for flow 2017-11-10 15:15:24 +01:00
Arne Morten Kvarving
46cf9e4058 move MSW_2D_H to flow 2017-11-10 15:15:24 +01:00
Arne Morten Kvarving
c6e140f615 remove unwanted/duplicate tests 2017-11-10 14:06:04 +01:00
Joakim Hove
e125334847
Merge pull request #1315 from joakim-hove/extract-schedule 
Use Schedule constructor.
 2017-11-06 17:06:49 +01:00
Joakim Hove
566f4fbb02 Use Schedule constructor. 2017-11-06 14:20:41 +01:00
Andreas Lauser
e65790224e replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H 
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
 2017-10-27 17:48:26 +02:00
Joakim Hove
19318e5019 Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Kai Bao
ba8eb708d1 fixing reviewing comments from PR 1279. 2017-10-16 17:01:15 +02:00
Atgeirr Flø Rasmussen
9021571c05 Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
8779937d3d Update equil regression reference after bugfix. 
Also reduce some very coarse tolerances to more reasonable levels.
 2017-10-12 14:27:32 +02:00
Kai Bao
fc06923c50 changing StandardWellsDense to BlackoilModelEbos 
for a better naming.
 2017-10-12 13:39:58 +02:00
Atgeirr Flø Rasmussen
bbfd5b6413 Merge pull request #1180 from blattms/cleanup-version-ifs 
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
 2017-10-12 13:28:50 +02:00
Markus Blatt
2bdafdb602 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions. 
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
 2017-10-11 21:25:18 +02:00
Markus Blatt
56cd0f5d24 Removed unnecessary version if in transmult test 2017-10-11 16:20:36 +02:00
Tor Harald Sandve
4b123f839a Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Atgeirr Flø Rasmussen
63b38cfe20 Merge pull request #1281 from totto82/fixRESV 
Use pore volume weighted averaged hydrocarbon state in rateConverted.
 2017-10-09 13:42:43 +02:00
Arne Morten Kvarving
2acb886292 add flow simulators to the data update script 2017-10-09 11:21:55 +02:00
Arne Morten Kvarving
02b4644612 workaround eigen 3.3.2 issue 
eigen returns a matrix with all coefficients stored from the operator/
this makes the comparison fail as x has no nonzeros
 2017-10-06 12:48:43 +02:00
Tor Harald Sandve
ebc2f46967 Use pore volume weighted averaged hydrocarbon state in rateConverted. 
- pressure, rs and rv is averaged using hydrocarbon pore volume weights.
- pvtRegions is used as input in the conversion factor calculations.
- the pvt cell of the first well cell is used as the pvt index.
(Completing a well in two different PVT regions sounds like a very bad
idea anyway)
- FIP region support is added to the rate converter also for the ebos
interface.
 2017-10-03 10:25:56 +02:00
Joakim Hove
b6b2f12142 Updated NNC() constructor. 2017-09-26 14:30:50 +02:00
Arne Morten Kvarving
0b2fa89e69 fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p 2017-09-26 08:05:42 +02:00
Kai Bao
f982faed05 not using std::make_unique in test_wellmodel 
to avoid using C++14 specific functions.
 2017-09-04 15:50:01 +02:00
Atgeirr Flø Rasmussen
77f3bdaeda Merge pull request #1257 from totto82/add_invert4x4 
Add invert4x4 specialization for invertMatrix()
 2017-09-04 09:08:32 +02:00
Tor Harald Sandve
210f1edf25 Add test for invert 4x4 matrix specialization 2017-08-29 11:01:20 +02:00
Kai Bao
9accb56c86 adding a test for well model. 
It is just test for StandardWell.
 2017-08-25 14:09:26 +02:00
Arne Morten Kvarving
86bc690ea4 add spe9group to reference data update script 
was missing in 1950052684
 2017-08-22 14:28:58 +02:00
Atgeirr Flø Rasmussen
1679078c51 Make scripts run on older bash versions. 2017-06-13 14:11:19 +02:00
Arne Morten Kvarving
cdf25e1a9e add spe5 flow_solvent regression test 2017-06-12 10:24:30 +02:00
Arne Morten Kvarving
09cbcee62c add regression test for flow_polymer 2017-06-09 13:11:05 +02:00
Atgeirr Flø Rasmussen
33025d752e Clarified notation in test. 2017-06-01 14:07:57 +02:00
Atgeirr Flø Rasmussen
f707abae36 Add unit test for connectionMultiPhaseUpwind(). 2017-06-01 13:55:11 +02:00
Atgeirr Flø Rasmussen
e07ddfccee Merge pull request #1170 from akva2/2p 
Add 2 phase regression test for flow_ebos and flow_legacy
 2017-05-12 13:02:46 +02:00
Joakim Hove
8b36daa7aa Merge pull request #1173 from joakim-hove/use-libecl 
Use libecl in jenkins build.
 2017-05-10 13:37:05 +02:00
Joakim Hove
dc65d43109 Use libecl in jenkins build. 2017-05-08 15:03:12 +02:00
Andreas Lauser
f3e0b9c692 Merge pull request #1169 from totto82/prepare_solvent 
Prepare for 2p and  extended models.
 2017-05-08 13:47:43 +02:00
Tor Harald Sandve
6084721812 Prepare for extended models. 
Let the code loop over number of components instead of phase
Pass TypeTag as template parameter instead of all the properties.
 2017-05-08 09:52:30 +02:00
Arne Morten Kvarving
6812d9619e add 2 phase case to update_reference_data.sh 
ie jenkins update_data trigger support
 2017-05-04 21:24:48 +02:00
Arne Morten Kvarving
3c0cb9e950 adjust for changed ParameterGroup namespacing 2017-04-28 15:36:25 +02:00
Arne Morten Kvarving
ca2288ac37 changed: remove embedded 'parameters' namespace in ParamGroup 
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
 2017-04-28 15:34:11 +02:00
Atgeirr Flø Rasmussen
2b5000bf06 Merge pull request #1137 from andlaus/jenkins-update-flow_ebos-data 
update update_reference_data.sh to also update the flow_ebos reference solutions
 2017-04-19 13:04:47 +02:00
Kai Bao
8d96d835b3 removing the well potential from WellsManager constructor. 2017-04-11 16:51:16 +02:00
Andreas Lauser
0b84a89a1d update update_reference_data.sh to also update the flow_ebos reference solutions 
maybe this even works.
 2017-04-11 15:56:02 +02:00
Atgeirr Flø Rasmussen
f166c9e15c Fix data update directory for flow_sequential test. 2017-04-10 13:54:49 +02:00
Atgeirr Flø Rasmussen
db8523e849 Merge pull request #1082 from totto82/satTableIdWells 
Support for saturation table for each well completion
 2017-04-07 14:43:28 +02:00
Arne Morten Kvarving
7bbb4a2a28 update scripts to use new paths for reference data 
reference data paths have been updated to reflect simulator
data is for.
 2017-04-07 11:40:45 +02:00
Tor Harald Sandve
cd564ade5f Support for saturation table for each well completion 
Compute relperms for each well completion based on saturation table ids
(satnums)

Does not work in combination with hysteresis.
 2017-04-06 14:21:59 +02:00
Tor Harald Sandve
214e9764b2 Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Arne Morten Kvarving
866001d148 fixed: paths in data update script 
forgot to update these in https://github.com/OPM/opm-simulators/pull/1096
 2017-04-05 12:04:26 +02:00
Tor Harald Sandve
df74d7e696 Enable swatinit equil test 2017-03-22 10:26:03 +01:00
Tor Harald Sandve
02122a60ce FIX swatinit test in test_equil 
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
 2017-03-22 10:20:59 +01:00
Joakim Hove
d237c91b8d Temporarily disabled EQUIL + SWATINIT test. 2017-03-21 16:49:14 +01:00
Atgeirr Flø Rasmussen
a89af9c92f Updated output_dir in test driver scripts/ 2017-03-16 17:18:14 +01:00
Atgeirr Flø Rasmussen
78995a7f61 Merge pull request #949 from akva2/move_msw_test 
convert MSW_2D_H__ into a regression test
 2017-03-15 09:56:33 +01:00
Arne Morten Kvarving
42ef0655ee changed: print some banners during test comparisons to make output more readable 2017-03-10 14:46:09 +01:00
Arne Morten Kvarving
f2e1f4bef1 changed: move multisegment well test to proper regression test 2017-03-03 15:27:35 +01:00
Alf Birger Rustad
cac6a33a51 Merge pull request #1045 from akva2/more_summary_analysis 
[WIP] Perform more analysis of summary regression test failures
 2017-02-18 11:35:33 +01:00
Arne Morten Kvarving
6183e78402 perform some more analysis on regression test failures 2017-02-16 16:00:42 +01:00
Atgeirr Flø Rasmussen
cb899a425b Merge pull request #1044 from akva2/update_norne_reference 
added: update norne integration test from jenkins trigger
 2017-02-16 14:05:11 +01:00
Arne Morten Kvarving
d2730175a0 changed: perform all comparisons in regression tests in all cases 
we want to process all comparisons, even if a previous comparison
failed. will aid further analysis
 2017-02-16 11:07:38 +01:00
Atgeirr Flø Rasmussen
27c0430932 Change include paths for moved headers. 2017-02-10 16:07:25 +01:00
Arne Morten Kvarving
86fbb36fd2 adjustments for imported files 
- adjust include paths
- add new test to build system
- add new example to build system
 2017-02-10 13:02:00 +01:00
Arne Morten Kvarving
109780f62f Import adaptive time stepping and simulator timer from opm-core 
also import associated tests / examples
 2017-02-10 12:04:11 +01:00
Arne Morten Kvarving
f9de2dee2a added: update norne integration test from jenkins trigger 2017-02-02 11:16:00 +01:00
Andreas Lauser
42ec0ca3c3 do not explicitly pass the permeability to the well model anymore 
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
detail (ordering of the permeability matrices) of the simulator on the
well model. If this needs to be done for performance reasons, IMO it
would be smarter to pass an array of matrices instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.
 2017-01-27 13:06:09 +01:00
Andreas Lauser
1ae94c8db3 do not explicitly pass the permeability to the well model anymore 
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
(ordering of the permeability matrices) the simulator on the well
model. If this needs to be done for performance reasons, IMO it would
be smarter to pass an array of matrices, instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.

in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.

finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
 2017-01-27 12:51:12 +01:00
Arne Morten Kvarving
c5d27bf6ed refinement in regression data update script to aid automation 2017-01-26 10:52:49 +01:00