Commit Graph

2046 Commits

Author SHA1 Message Date
babrodtk
cbdb95d61b Removed opm statements which did not belong there 2015-09-07 13:00:41 +02:00
babrodtk
acd58f5272 Fixed commented out functions and some warnings 2015-09-07 13:00:41 +02:00
babrodtk
6a6a1d5280 Fixed warnings 2015-09-07 13:00:41 +02:00
babrodtk
54137c742b Added remaining files to CMakeLists_files.cmake 2015-09-07 13:00:41 +02:00
babrodtk
171cbbe3bb Fixed sim_simple.cpp 2015-09-07 13:00:41 +02:00
babrodtk
95e9ca6d2a Fixed SolventPropsAdFromDeck.cpp 2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen
73170c4281 Add forgotten constructor delegation. 2015-09-07 13:00:41 +02:00
babrodtk
51b85276ec Fixed TransportSolverThophaseAd.cpp 2015-09-07 13:00:41 +02:00
babrodtk
6deb3e2c4a Fixed IpmesTPFAAD.cpp 2015-09-07 13:00:41 +02:00
babrodtk
945593295d Fixed test_autodiffhelpers 2015-09-07 13:00:41 +02:00
babrodtk
3a9a153c22 Fixed test_block 2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen
61c352ca3b Add move constructor and assignment to AutoDiffMatrix.
This is necessary, and done using swap(), since (current version)
Eigen::SparseMatrix does not support move semantics.
2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen
097542a527 Whitespace fixes.
It turns out I accidentally used tabs for a while, this commit
fixes that for all touched files.
2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen
3c905845f9 Use std::vector instead of DiagonalMatrix.
This is because DiagonalMatrix lacks a swap() method.
2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
87f677af02 Fix bug in fastDiagSparseProduct(). 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
11a33b3017 Experiment with fast diagonal-sparse products. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
1f32594f79 Fix bug in prodDD(), add test. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
51dde7cec5 In collapseJacs(), avoid explicit zeros. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
dd52d444e7 Fix print() method. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
c795113ce3 Changes to make flow compile with AutoDiffMatrix. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen
c712d0070d Bugfixes for AutoDiffMatrix. 2015-09-07 12:58:51 +02:00
Atgeirr Flø Rasmussen
ffeaa5143d Add more ops and methods to AutoDiffMatrix.
To make it possible to use it instead of Eigen::SparseMatrix in
a range of cases.
2015-09-07 12:58:51 +02:00
Atgeirr Flø Rasmussen
47e7dbe943 New implementation of AutoDiffMatrix, some tests.
Compiles and tests successfully, but test coverage very
limited. New approach based on relatively primitive
run-time switching instead of trying to use inheritance.
2015-09-07 12:58:51 +02:00
Atgeirr Flø Rasmussen
6a5a48e728 Work in progress on AutoDiffMatrix (not compiling). 2015-09-07 12:58:51 +02:00
Bård Skaflestad
63d34157ef Merge pull request from blattms/fix-build
Removes unused experimental header include to fix build.
2015-09-07 11:23:59 +02:00
Atgeirr Flø Rasmussen
b08f61362b Merge pull request from blattms/fixes-solve_welleq_initially-in-parallel
Fixes parallel runs with solve_welleq_initially
2015-09-07 11:14:46 +02:00
Markus Blatt
b91fb70e92 Adds new header to CMakeLists_files.cmake
The new header 	opm/autodiff/AdditionalObjectDeleter.hpp
was not there yet.
2015-09-07 11:03:08 +02:00
Markus Blatt
8ed72cdf9f Remove unused experimental header include.
The include of ParallelRestrictedAdditiveSchwarz.hh was a left over
from some experiments and should not be here yet.
2015-09-07 10:48:34 +02:00
Atgeirr Flø Rasmussen
b77e306688 Merge pull request from blattms/parallel-interleaved
Fix parallel flow_cp for the interleaved case
2015-09-07 10:09:16 +02:00
Markus Blatt
02120d14d1 Directly initialize variable with global value.
Previously we initialized a variable for a global
(i.e. sum over all processes) value with the local
value first and the overwrote it with the computed
global. This meant the name did not reflect the value
during the first initialization.

With this commit we fix this by using an additional
variable for the local value that is used to compute
the global one.
2015-09-07 09:50:36 +02:00
Atgeirr Flø Rasmussen
09e254d9a3 Merge pull request from totto82/new_defaults
Change defaults
2015-09-07 08:49:36 +02:00
Atgeirr Flø Rasmussen
9ceeba0e8c Merge pull request from blattms/zoltan-well-aware
Use well information during load balancing.
2015-09-07 08:49:04 +02:00
Tor Harald Sandve
18d429ebff Use CPR as fall back if use_interleaved=false 2015-09-07 06:08:13 +02:00
Markus Blatt
4cc87c28f6 Fixes parallel runs with solve_welleq_initially
If this option was set there were some branches in
the code that did depend on the local number of wells
but should depend on the number of wells in the reservoir
no matter on which process they are stored.

With this commit we introduce BlackOilModelBase::localWellsActive()
which only takes local wells into account. The function now
BlackOilModelBase::wellsActive() considers all active wells in the
reservoir.
2015-09-05 20:24:50 +02:00
Markus Blatt
45fdb3ac48 [bugfix] Use correct parameters for ParallelIstlInformation::copyValuesTo.
The last parameter of this functions specifies how vector/martix
entries there are per index/cell of the grid. For the interleaved
versions all components end up in one block. Therefore this number
needs to be one here (in contrast to the number of phases for the
non-interleaved version).

This commit new uses the correct number.
2015-09-05 16:09:33 +02:00
Markus Blatt
0adde744bf [bugfix] Make sequential preconditioner live as long as the parallel one.
It holds a reference to the sequential code. Previously this reference
point to a temporary object that was deleted upon exit of
constructPrecond.

With this commit use a unique_ptr to store the parallel
preconditioner. It also gets a custom deleter that will delete the
nested sequential iterator during destruction.
2015-09-05 16:09:33 +02:00
Markus Blatt
6890e8db71 Renames ParallelPreconditionerDeleter and moves it to a separate header.
The class is not limited to parallel preconditioners. To reflect this
we rename it to AdditionalObjectDeleter. As it will also be used for
the parallel interleaved version we move the class to a separate header.
2015-09-05 16:09:33 +02:00
Atgeirr Flø Rasmussen
6f0f90d1b6 Merge pull request from totto82/WCONINJH
Add support for WCONINJH
2015-09-04 15:27:40 +02:00
Atgeirr Flø Rasmussen
c2d652a61f Merge pull request from totto82/outofbounds_fix
BUGFIX Fix out of bounds error
2015-09-04 14:15:07 +02:00
Markus Blatt
c527e15b63 Use well information during load balancing.
With this commit we pass the well information to
the loadbalance method of CpGrid to ensure that
each well is stored completely on one process.
2015-09-03 20:28:13 +02:00
Tor Harald Sandve
fd48a6e004 Change defaults
Use the more stable interleaved solver instead of CPR as default
Solve well equation initially as default
2015-09-03 12:38:03 +02:00
Tor Harald Sandve
53c1195b64 Rename variable from i to injector 2015-09-03 11:29:12 +02:00
Tor Harald Sandve
944092bd89 Add support for WCONINJH
Explicitly adds bhp control on rate controlled history matching
injector.The default bhp limit is a large number to make sure that the
well does not switch. Alternativly bhp limit can be specified using
WELTARG. This is typically done to make sure the bhp limit stays within
the pressure limits in the PVT tables. Support for WELTARG is also added
to the history matching producers (WCONHIST)
2015-09-03 11:26:07 +02:00
Tor Harald Sandve
3a78cd4635 BUGFIX Fix out of bounds error 2015-09-03 09:33:46 +02:00
Atgeirr Flø Rasmussen
59fccb2f86 Merge pull request from andlaus/satfunc_refactoring
add a few missing "#include <Evaluation.hpp>"
2015-09-02 15:23:16 +02:00
Andreas Lauser
73710a01d2 move the code which creates a compressed to cartesian cell index map to a separate free function 2015-09-02 14:50:41 +02:00
Atgeirr Flø Rasmussen
bbd1395d3f Merge pull request from babrodtk/fix_warnings
Fixed warnings
2015-09-02 14:31:31 +02:00
Atgeirr Flø Rasmussen
61f49793fb Merge pull request from babrodtk/bugfix_backup_restore
Fix bug reading directly into data owned by std::string
2015-09-02 14:30:55 +02:00
babrodtk
6dd24640c9 Changed c-style cast to c++-style cast 2015-09-02 14:23:35 +02:00
babrodtk
e1632b8522 Fixed bug reading directly into data owned by string 2015-09-02 14:18:52 +02:00