Commit Graph
684 Commits
Author SHA1 Message Date
Arne Morten Kvarving 34bcccef9c remove unused variables
quells warnings
2019-06-19 11:59:43 +02:00
Joakim Hove 2950faece0 Extract the Summary::eval() call from the output call 2019-06-19 09:51:46 +02:00
Joakim Hove 7f1970af3c Use the shared SummaryState instance when initializing well rates 2019-06-17 07:49:55 +02:00
Kai Bao 3dcec6a436 removing StandardWellV 2019-06-13 14:49:04 +02:00
Atgeirr Flø Rasmussen 2c5ef367dd Merge pull request #1852 from atgeirr/flexible-linear-solver
Flexible linear solver
2019-06-06 14:21:51 +02:00
Atgeirr Flø Rasmussen 72ae444566 Fixes for Dune < 2.6.
The PreconditionerFactory requires 2.6, so this is addressed by
simply not using that code at all for Dune < 2.6. No FlexibleSolver
etc.
2019-06-06 09:10:43 +02:00
Atgeirr Flø Rasmussen c21fd6f26d Add and use PreconditionerFactory class.
This replaces the makePreconditoner() function. The main advantage
is that it is extensible, making it easy to for example add new
preconditioners to the factory at runtime. It supports both parallel
and serial preconditioners.
2019-06-05 15:12:52 +02:00
Joakim Hove 47f4e750d2 Merge pull request #1865 from joakim-hove/use-shared-summarystate
Use shared summarystate
2019-06-04 09:49:56 +02:00
Bård Skaflestad 6c0e5fb5a1 Merge pull request #1833 from tskille/run-regressionTest
run compareECL once, checking all files in one go
2019-06-03 11:50:50 +02:00
Atgeirr Flø Rasmussen 866db1c66d Revise json file for test after changing expected structure. 2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen a76b19d95a Make FlexibleSolver feature-complete.
In particular:
 - Add parallel solvers and preconditioners.
 - Add the update() interface to preconditioners, and use it with CPR.
2019-06-03 11:42:30 +02:00
Halvor Møll Nilsen ec498086a6 Add flexible solver and preconditioner infrastructure.
Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter,
--linear-solver-configuration-json-file, to read linear solver config from
JSON-format file at runtime.
2019-06-03 11:42:30 +02:00
Torbjørn Skille 0d916193b2 updated run-regressionTest.sh, added support for ignore_extra 2019-06-03 11:17:32 +02:00
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