Markus Blatt
b5d55b9fb2
Fix indentation and whitespace.
2018-02-26 14:35:04 +01:00
Markus Blatt
2e7313ac08
Cater for move of CpGrid header
2018-02-26 14:35:04 +01:00
Markus Blatt
9221bc958b
Added missing header includes
2018-02-26 14:35:04 +01:00
Markus Blatt
01b90bce05
Improve well matrix products
2018-02-26 14:35:04 +01:00
Markus Blatt
22dfa6f135
Setup auxiliary module only once with all possible well completions.
...
Clearing the auxiliary modules will result in the sparsity pattern being
recomputed. Previously we did this before each nonlinear solve. But for the
master branch the sparsity pattern was only computed once for the whole
simulation.
To get the same behaviour (one sparsity pattern computation) we change the
auxiliary module to include all well perforations that might become active
during the simulation and do this once up front of a simulator run.
Please note that the new matrix entries might also improve convergence for
the ILU if the well is not active.
2018-02-26 14:35:04 +01:00
Markus Blatt
07f61c2a2b
Add auxiliary module in BlackoilModelEbos constructor.
...
Previously, we did this during assemble. Unfortunately, this resulted
in the sparsity pattern being recomputed every time instead of just
once for a non-linear solve.
2018-02-26 14:35:04 +01:00
Markus Blatt
799cbb4b62
Add influences by well perforations to matrix.
...
This is only done upon request and uses the auxiliary module approach
provided by ewoms.
In the case of adding the influences we do not execute applyWellModelScaleAdd
or applyWellModel in the operator
2018-02-26 14:35:04 +01:00
Markus Blatt
d0fcd1a8e9
Add non neighboring connections induced by well perforations to matrix sparsity pattern
...
This is only done upon request and uses the auxiliary module approach
provided by ewoms.
2018-02-26 14:32:50 +01:00
Atgeirr Flø Rasmussen
f0b8e586a6
Merge pull request #1405 from GitPaean/populating_reservoir_rated_output
...
[WIP] Populating reservoir rate related output
2018-02-21 17:11:40 +01:00
Kai Bao
a8f560b046
addressing the comments.
2018-02-21 14:45:22 +01:00
Kai Bao
89bb589755
update the reservoir volume in WellState
2018-02-21 12:20:43 +01:00
Kai Bao
abfe9d445b
recoring solution gas rate and solutiion oil rate in StandardWell
2018-02-21 12:20:43 +01:00
Kai Bao
f33657aabf
adding a few memebers to WellStateFullyImplicitBlackoil
...
to get ready for populating well reservoir rates, solution gas
production rates and solution oil production rates.
2018-02-21 12:20:43 +01:00
Atgeirr Flø Rasmussen
d4ca28ec61
Merge pull request #1409 from totto82/fix_default_output_dir
...
Fix default output dir
2018-02-19 17:04:35 +01:00
Atgeirr Flø Rasmussen
1b33769922
Merge pull request #1399 from totto82/MoveWell
...
Some more cleaning in the output code in opm-output, ewoms and opm-simulator
2018-02-19 15:05:20 +01:00
Tor Harald Sandve
bcb501e3d3
Fix default output dir
2018-02-19 13:09:07 +01:00
Atgeirr Flø Rasmussen
e3e4f3acac
Merge pull request #1408 from atgeirr/add-nowells-test
...
Add integration test with no wells.
2018-02-15 13:33:58 +01:00
Atgeirr Flø Rasmussen
5f8124bfbf
Add integration test with no wells.
2018-02-15 10:07:58 +01:00
Arne Morten Kvarving
8ff91c83e7
Merge pull request #1406 from akva2/dyn_boost_test_bs
...
changed: let the build system handle the dynamic boost test defines
2018-02-15 08:14:46 +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
8e9b13584d
Merge pull request #1403 from lars-petter-hauge/empty_wells_init
...
Allow Wells struct initialization without wells
2018-02-14 10:31:52 +01:00
Atgeirr Flø Rasmussen
17a524e42c
Merge pull request #1404 from atgeirr/fix-no-wells
...
Ensure we do not dereference nullptr.
2018-02-14 09:56:43 +01:00
Lars Petter Øren Hauge
011143829d
Allow Wells struct initialization without wells
...
Calling wells()->number_of_wells on nullptr causes segmentation fault. This
occurs when running a deck without wells. Allowing WellsManager::init to
continue for decks without wells enables the well struct to be set.
Authored by Sveinung Rundhovde & Lars Petter Hauge
2018-02-13 16:43:10 +01:00
Atgeirr Flø Rasmussen
4f414b78ed
Ensure we do not dereference nullptr.
2018-02-13 16:22:11 +01:00
Atgeirr Flø Rasmussen
dd93a67086
Merge pull request #1402 from atgeirr/fix-binary-path
...
Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR.
2018-02-13 15:51:22 +01:00
Atgeirr Flø Rasmussen
cf51303697
Merge pull request #1387 from akva2/buildsystem_conditionals
...
changed: only add conditionally built files if they are to be built
2018-02-13 15:51:04 +01:00
Atgeirr Flø Rasmussen
7b1d377e82
Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR.
2018-02-13 13:04:54 +01:00
Arne Morten Kvarving
371ae786ca
changed: only add conditionally built files if they are to be built
...
instead of unconditionally adding, and then conditionally removing
again.
2018-02-13 12:35:39 +01:00
Arne Morten Kvarving
5ac22e9f42
Merge pull request #1401 from atgeirr/moved-opm-grid-headers
...
Adapt to moved opm-grid headers.
2018-02-12 16:32:06 +01:00
Tor Harald Sandve
a89a6af854
Some more cleaning in the output code in opm-output, ewoms and opm-
...
simulator
1) Don't depend on legacy code for communicating the data::wells
2) Bugfix. Store globalIdx instead localIdx in data::wells::complitions
3) Move ThreadHandle to ebos
2018-02-12 08:44:43 +01:00
Atgeirr Flø Rasmussen
cf9b7c39b9
Adapt to moved opm-grid headers.
2018-02-10 08:33:33 +01:00
Andreas Lauser
024344600e
Merge pull request #1400 from andlaus/gridManager_to_vanguard
...
adapt to the gridManager() -> vanguard() change in ewoms
2018-02-08 17:54:03 +01:00
Andreas Lauser
3d0fca2f08
adapt to the gridManager() -> vanguard() change in ewoms
2018-02-08 16:27:42 +01:00
Andreas Lauser
996dc3382e
Merge pull request #1398 from andlaus/separate_opm-common_concerns
...
adapt to the move of infrastructure from opm-common to opm-material
2018-02-08 16:25:29 +01:00
Andreas Lauser
7f3a9f1f43
catch NumericalIssue instead of NumericalProblem
...
the underlying problem is that the OPM build system does not define a
HAVE_OPM_COMMON macro in config.h.
2018-02-08 12:02:25 +01:00
Andreas Lauser
58a1b7df1f
adapt to the move of infrastructure from opm-common to opm-material
2018-02-07 13:32:52 +01:00
Atgeirr Flø Rasmussen
532403c5fb
Merge pull request #1391 from totto82/RFIP
...
Use FIP, EGRID and INIT output code in ebos.
2018-02-06 12:54:01 +01:00
Arne Morten Kvarving
a2419e285f
Merge pull request #1396 from akva2/remove_err_brace
...
fixed: remove erroneous brace
2018-02-05 12:10:39 +01:00
Arne Morten Kvarving
05593c975d
fixed: remove erroneous brace
2018-02-05 11:38:15 +01:00
Arne Morten Kvarving
9617cf012e
Merge pull request #1395 from andlaus/flow_first
...
move the flow_ebos_*.cpp files to the beginning of the source list
2018-02-05 10:56:14 +01:00
Andreas Lauser
bb788a976b
add comment to CMakeLists_files.cmake why the flow_ebos*.cpp files are on top
2018-02-05 10:53:40 +01:00
Andreas Lauser
9693e0b33d
move the flow_ebos_*.cpp files to the beginning of the source list
...
these files take the longest to compile. moving them to the beginning
speeds things up forn parallel builds because the remaining compile
can be compiled while dealing with the flow_ebos files while the build
stalls if these files are at the bottom of the list because they are
required for the library.
2018-02-05 10:14:51 +01:00
Atgeirr Flø Rasmussen
516d0237d5
Merge pull request #1394 from akva2/relocate_files_in_common
...
Relocate files in common
2018-01-31 13:18:12 +01:00
Arne Morten Kvarving
2da361414e
changed: relocate the remaining files in opm/core/utility
...
move to opm/common/utility/numeric
2018-01-30 16:33:46 +01:00
Arne Morten Kvarving
141186ad1d
changed: opm/[core -> common]/utility/parameters
2018-01-30 16:33:45 +01:00
Arne Morten Kvarving
e9e5c15e99
changed: opm/[core/linalg -> common/utility/numeric]/blas_lapack.h
2018-01-30 12:47:10 +01:00
Arne Morten Kvarving
e9404486bb
changed: opm/common/[->utility]/ResetLocale.hpp
2018-01-30 12:34:04 +01:00
Arne Morten Kvarving
742d2d2158
changed: opm/common/[util->utility]/numeric/cmp.hpp
2018-01-30 12:13:30 +01:00
Atgeirr Flø Rasmussen
90be27116f
Merge pull request #1390 from akva2/super_build
...
Some changes to facilitate building using a super project
2018-01-29 16:28:33 +01:00
Tor Harald Sandve
cdeefc3a34
Fix command line argument for double precision restart output
2018-01-29 08:56:55 +01:00