Commit Graph

9555 Commits

Author SHA1 Message Date
Andreas Lauser
9136b01659
Merge pull request #1823 from akva2/fix-nnc-output
Make NNC output more eclipse compliant - with bisectability
2019-05-08 13:57:00 +02:00
Markus Blatt
781fb46e61 [bugfix] Search all NNCs when applying EDITNNC.
The latter is not sorted. Therefore we either need to search the whole
range or sort it before processing it. Io pted for the former.
2019-05-08 13:50:51 +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
Markus Blatt
7849ce690d Make sortNncAndApplyEditnnc return vector of NNCData ready to be processed.
Previously the vector of NNCData was passed in as a reference and sorted.
Unfortunately, it needed to be transformed later to meet all prerequisites.
With this commit we do this transformations in sortNncAndApplyEditnnc.
Furthermore EDITNNC data is passed by value as it is not needed
outside and should usually not be to big. It was copied outside anyway!
2019-05-08 13:50:50 +02:00
Markus Blatt
f02c2d4114 Factor out sorting of NNC and application of EDITNNC for reuse. 2019-05-08 13:50:50 +02:00
Markus Blatt
583741d5b1 Ignore NNCs with zero transmissibility during output. 2019-05-08 13:50:26 +02:00
Markus Blatt
5aa0399c67 Write NNCs once and honor them when writing fault transmissibility
We first add all NNCs specified in the deck to the ouput
and then determine additional NNCs by iterating over all faces that
connect cells that are not connected in the underlying cartesian grid.
Therefore we need to make sure that we do not output NNCs twice
and for faults that also have a specified NNC we need to substract
the transmissibility specified via NNC.
2019-05-08 13:50:26 +02:00
Atgeirr Flø Rasmussen
fe6d2376be
Merge pull request #1822 from atgeirr/move-linalg-code
Moved files to opm/simulators/ subdirs.
2019-05-08 13:46:10 +02:00
Atgeirr Flø Rasmussen
c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00
Andreas Lauser
589db89b09
Merge pull request #1810 from totto82/rockcomp
Rockcomp
2019-05-08 09:59:09 +02:00
Tor Harald Sandve
890d34a9e1 Add support for water induced compaction using
ROCKCOMP, ROCK2D, ROCK2DTR, ROCKWNOD and OVERBURD
2019-05-07 13:17:29 +02:00
Tor Harald Sandve
71cd83bb2b
Merge pull request #1775 from andlaus/update_ewoms_simulator_in_flow
flow: make sure that the ebosSimulator's episode machinery is up to date
2019-05-07 10:51:52 +02:00
Andreas Lauser
dd74fe1027 document all methods of EclThresholdPressure 2019-05-03 14:07:15 +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
17a4092c82 EclProblem: introduce a simulator auxiliary variable in most most cases
in most instances, this reduces the visual clutter a bit...
2019-05-03 14:07:15 +02:00
Andreas Lauser
6e351fef2e EclProblem: limit the limitTimeStepSize() to ebos
also, fix a few mistakes in that function.
2019-05-03 14:07:15 +02:00
Andreas Lauser
b9995f697f well models: remove superfluous arguments
concretely this means the `eclState` and `schedule` arguments to the
`init()` and `beginTimeStep()` methods.
2019-05-03 14:07:15 +02:00
Andreas Lauser
7868e420c0 EclProblem: print "checking conservativeness" messages in debug mode 2019-05-03 14:06:41 +02:00
Andreas Lauser
0be0de38cb EclProblem: ensure that eclWriter_ is always present
before patch, setting the `EnableEclOutput` parameter to `false`
resulted in the `eclWriter_` not to be allocated; yet it was used in
some places. this resulted in segfaults.
2019-05-03 14:06:41 +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
Andreas Lauser
701eb0edd3 ebos: never write restart files using the ad-hoc format
medium term, the output and restart file writing should be refactored:
the simulator does not need to be aware of this because it can be
accomplised in the problem's endTimeStep() method.
2019-05-03 14:06:41 +02:00
Tor Harald Sandve
e19508e599
Merge pull request #1780 from andlaus/ebos_deck_diagnostics
Ebos deck diagnostics
2019-05-03 13:49:02 +02:00
Tor Harald Sandve
34780c456b
Merge pull request #1816 from andlaus/ebos_non_MSW_by_default
ebos: use the non-multisegmented well model by default
2019-05-03 13:18:11 +02:00
Andreas Lauser
794b043a28 ebos: use the non-multisegmented well model by default
this avoids regressions for decks that use well testing and makes
`ebos` work as expected if UMFPACK is not available, but obviously it
will not work for decks that use multisegment wells in earnest.

`flow` is unaffected by this because it does not use this type tag.
2019-05-02 13:54:40 +02:00
Torbjørn Skille
a9c7d11235 updated test scripts to use eclipse compatible restart 2019-05-02 11:35:26 +02:00
Andreas Lauser
f5db6e8e1c
Merge pull request #1811 from atgeirr/bump-version
Update version to 2019.10-pre.
2019-05-02 09:55:56 +02:00
Bård Skaflestad
4d76ea5000
Merge pull request #1809 from atgeirr/log-messages-only-once
Clear DeferredLogger's message container after logging.
2019-04-30 15:47:40 +02:00
Atgeirr Flø Rasmussen
b5f343a414 Update version to 2019.10-pre. 2019-04-30 15:37:47 +02:00
Atgeirr Flø Rasmussen
32572ac2ab Clear DeferredLogger's message container after logging.
This keeps from logging the same messages again. Also add clearMessages()
method, which is useful to clear the local container after gathering into
a global container (which leaves the local containers untouched).
2019-04-30 12:24:31 +02:00
Atgeirr Flø Rasmussen
ad1eb4ae04
Merge pull request #1808 from GitPaean/correcting_mistake_pr1803
Correcting a small assertion mistake introduce in PR#1803
2019-04-30 12:22:08 +02:00
Kai Bao
65db00c1f9 removing --use-multisegment-well in compareECLFiles
since MSW is activated by default now.
2019-04-30 10:25:36 +02:00
Kai Bao
6c2a806e61 correcting an assertion mistake introduced in PR#1803 2019-04-30 10:25:17 +02:00
Atgeirr Flø Rasmussen
9bbb0ef679
Merge pull request #1807 from atgeirr/enable-msw-by-default
Enable multi-segment wells by default.
2019-04-28 23:13:16 +02:00
Atgeirr Flø Rasmussen
9b583ef936
Merge pull request #1806 from blattms/fix-editnnc-application
[bugfix] Use NNC data with applied EDITNCC for transmissibility.
2019-04-28 16:21:17 +02:00
Atgeirr Flø Rasmussen
d2f8f07337 Enable multi-segment wells by default. 2019-04-27 07:16:36 +02:00
Markus Blatt
184be292ea [bugfix] Use NNC data with applied EDITNCC for transmissibility.
Unfortunately, we first created NNC with applied EDITNNC and then
still used the original NNC data to set the transmissibility. Thus
we were actually ignoring EDITNNC.

This commit fixes this by using the data structure that has EDITNNC
applied.
2019-04-26 21:25:59 +02:00
Bård Skaflestad
75e8508e3b
Merge pull request #1803 from blattms/remove-warnings
Remove warnings experienced with g++-8
2019-04-26 17:41:55 +02:00
Atgeirr Flø Rasmussen
8c95d3e163
Merge pull request #1804 from totto82/removeDuplictaedThrow
BUGFIX. Make sure that the convergece report is stored before throw
2019-04-26 09:27:59 +02:00
Tor Harald Sandve
8a4117441c Make sure that the convergece report is stored before throw 2019-04-25 10:33:39 +02:00
Markus Blatt
c9a06f8bb6 Initialize all members of Opm::Data::Connection 2019-04-25 10:00:59 +02:00
Markus Blatt
b847f36ec8 Removes warning about unused variable. 2019-04-25 10:00:59 +02:00
Markus Blatt
66ef71e67a Removes warning about ignored return type qualifier on function. 2019-04-25 10:00:59 +02:00
Markus Blatt
3aa60433ad Removes unsigned-signed integer comparison warnings. 2019-04-25 10:00:59 +02:00
Markus Blatt
48c3802bf3 Removes unused function parameter warnings. 2019-04-25 10:00:59 +02:00
Joakim Hove
cda7d1906e
Merge pull request #1801 from joakim-hove/FLUXTYPE-keyword
Add 'FLUXTYPE' to list of not supported keywords
2019-04-19 12:08:21 +02:00
Joakim Hove
ed91356a90 Add 'FLUXTYPE' to list of not supported keywords 2019-04-19 11:02:18 +02:00
Joakim Hove
58aab220ac
Merge pull request #1799 from joakim-hove/add-missing-comma
Add missing "," in set literal
2019-04-17 07:21:43 +02:00
Joakim Hove
58f541cd93 Add missing "," in set literal 2019-04-17 06:43:08 +02:00
Kai Bao
8e5bfa0c67
Merge pull request #1751 from GitPaean/fixing_multisegment_wells_cleaning_up
various improvements/corrections to the multisegment well model
2019-04-12 14:28:12 +02:00
Atgeirr Flø Rasmussen
e3f951ee7d
Merge pull request #1790 from hnil/cpr_less_verbose
changed verbosity of the cpr solver
2019-04-12 12:48:47 +02:00