OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

NewtonIterationBlackoilInterleavedImpl: cleanup.

Browse Source
This commit is contained in:
Robert Kloefkorn
2015-10-09 13:39:02 +02:00
parent 476a09e0d6
commit 4d121dccf4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
View File

@@ -50,12 +50,6 @@
namespace Opm namespace Opm
{ {
typedef AutoDiffBlock<double> ADB;
typedef ADB::V V;
typedef ADB::M M;
namespace detail { namespace detail {
/** /**
* Simple binary operator that always returns 0.1 * Simple binary operator that always returns 0.1
@@ -77,8 +71,9 @@ namespace Opm
template <int np> template <int np>
class NewtonIterationBlackoilInterleavedImpl : public NewtonIterationBlackoilInterface class NewtonIterationBlackoilInterleavedImpl : public NewtonIterationBlackoilInterface
{ {
typedef Dune::FieldVector<double, np > VectorBlockType; typedef double Scalar;
typedef Dune::FieldMatrix<double, np, np> MatrixBlockType; typedef Dune::FieldVector<Scalar, np > VectorBlockType;
typedef Dune::FieldMatrix<Scalar, np, np> MatrixBlockType;
typedef Dune::BCRSMatrix <MatrixBlockType> Mat; typedef Dune::BCRSMatrix <MatrixBlockType> Mat;
typedef Dune::BlockVector<VectorBlockType> Vector; typedef Dune::BlockVector<VectorBlockType> Vector;
@@ -293,6 +288,9 @@ namespace Opm
/// \return the solution x /// \return the solution x
SolutionVector computeNewtonIncrement(const LinearisedBlackoilResidual& residual) const SolutionVector computeNewtonIncrement(const LinearisedBlackoilResidual& residual) const
{ {
typedef LinearisedBlackoilResidual::ADB ADB;
typedef ADB::V V;
// Build the vector of equations. // Build the vector of equations.
//const int np = residual.material_balance_eq.size(); //const int np = residual.material_balance_eq.size();
assert( np == int(residual.material_balance_eq.size()) ); assert( np == int(residual.material_balance_eq.size()) );