Kai Bao
49d6cfb188
renaming tempB to temp_b to adress the comment.
2015-09-08 10:57:19 +02:00
Kai Bao
b1b9c171b3
update scaling factors for mass balance equations.
2015-09-08 10:57:18 +02:00
babrodtk
83c3d51ae0
Removed need for delegating constructors
2015-09-07 15:33:46 +02:00
babrodtk
38865cac31
Cleaned up comments
2015-09-07 13:01:31 +02:00
babrodtk
4c82e9abc7
Fixed bug in diagonal*vector product
2015-09-07 13:01:31 +02:00
babrodtk
9855d7340f
Minor performance updates
2015-09-07 13:01:31 +02:00
babrodtk
466f1947a3
Fixed Eigen 3.3 compatibility
2015-09-07 13:01:31 +02:00
babrodtk
395c12a2d5
Refactoring to more readable names
2015-09-07 13:00:41 +02:00
babrodtk
0a2b898b33
Minor reformulations
2015-09-07 13:00:41 +02:00
babrodtk
2f83f9268e
Found the culprit
2015-09-07 13:00:41 +02:00
babrodtk
3a3e9d9e4a
Reverted more changes
2015-09-07 13:00:41 +02:00
babrodtk
8d82d9f89e
Reverted some changes
2015-09-07 13:00:41 +02:00
babrodtk
d57adc6ed4
Removed use of static memory
2015-09-07 13:00:41 +02:00
babrodtk
36f0e7531f
Minor changes
2015-09-07 13:00:41 +02:00
babrodtk
a30d6586a3
Made fastSparseProduct std::move-friendly
2015-09-07 13:00:41 +02:00
babrodtk
0b1f993588
Implemented statically allocated memory for SparseMatrix
2015-09-07 13:00:41 +02:00
babrodtk
df1d0f795d
Added the use of boost::any
2015-09-07 13:00:41 +02:00
babrodtk
624790e7e3
Added comment
2015-09-07 13:00:41 +02:00
babrodtk
c713a8bebc
Renamed functions
2015-09-07 13:00:41 +02:00
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
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
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 #462 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 #461 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
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 #460 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 #458 from totto82/new_defaults
...
Change defaults
2015-09-07 08:49:36 +02:00
Atgeirr Flø Rasmussen
9ceeba0e8c
Merge pull request #459 from blattms/zoltan-well-aware
...
Use well information during load balancing.
2015-09-07 08:49:04 +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
