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

NewtonIterationBlackoilInterleaved: replace switch-case statement by proper template

Browse Source 
recursion.
This commit is contained in:
Robert Kloefkorn 2015-10-08 14:04:05 +02:00
parent 884edadbd6
commit d93a1a5b63
2 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
View File

@ -435,13 +435,56 @@ namespace Opm
/// Construct a system solver.
NewtonIterationBlackoilInterleaved::NewtonIterationBlackoilInterleaved(const parameter::ParameterGroup& param,
const boost::any& parallelInformation_arg)
: newtonIncrement_( 6 ),
: newtonIncrement_(),
param_( param ),
parallelInformation_(parallelInformation_arg),
iterations_( 0 )
{
}
namespace detail {
template< int NP >
struct NewtonIncrement
{
template <class NewtonIncVector>
static const NewtonIterationBlackoilInterface&
get( NewtonIncVector& newtonIncrements,
const parameter::ParameterGroup& param,
const boost::any& parallelInformation,
const int np )
{
if( np == NP )
{
assert( np < int(newtonIncrements.size()) );
// create NewtonIncrement with fixed np
if( ! newtonIncrements[ NP ] )
newtonIncrements[ NP ].reset( new NewtonIterationBlackoilInterleavedImpl< NP >( param, parallelInformation ) );
return *(newtonIncrements[ NP ]);
}
else
{
return NewtonIncrement< NP-1 >::get(newtonIncrements, param, parallelInformation, np );
}
}
};
template<>
struct NewtonIncrement< 1 >
{
template <class NewtonIncVector>
static const NewtonIterationBlackoilInterface&
get( NewtonIncVector& newtonIncrements,
const parameter::ParameterGroup& param,
const boost::any& parallelInformation,
const int np )
{
OPM_THROW(std::runtime_error,"NewtonIncrement::get: number of variables not supported yet. Adjust maxNumberEquations appropriately to cover np = " << np);
return *(newtonIncrements[ 0 ]);
}
};
} // end namespace detail
NewtonIterationBlackoilInterleaved::SolutionVector
@ -449,42 +492,19 @@ namespace Opm
{
// get np and call appropriate template method
const int np = residual.material_balance_eq.size();
switch( np )
{
case 2:
return computeNewtonIncrementImpl< 2 >( residual );
case 3:
return computeNewtonIncrementImpl< 3 >( residual );
case 4:
return computeNewtonIncrementImpl< 4 >( residual );
case 5:
return computeNewtonIncrementImpl< 5 >( residual );
case 6:
return computeNewtonIncrementImpl< 6 >( residual );
default:
OPM_THROW(std::runtime_error,"computeNewtonIncrement: number of variables not supported yet. Consult the code to add a case for np = " << np);
return SolutionVector();
}
}
template <int np>
NewtonIterationBlackoilInterleaved::SolutionVector
NewtonIterationBlackoilInterleaved::computeNewtonIncrementImpl(const LinearisedBlackoilResidual& residual) const
{
assert( np < int(newtonIncrement_.size()) );
// create NewtonIncrement with fixed np
if( ! newtonIncrement_[ np ] )
newtonIncrement_[ np ].reset( new NewtonIterationBlackoilInterleavedImpl< np >( param_, parallelInformation_ ) );
// maxNumberEquations_ denotes the currently maximal number of equations
// covered, this is mostly to reduce compile time. Adjust accordingly to cover
// more cases
const NewtonIterationBlackoilInterface& newtonIncrement =
detail::NewtonIncrement< maxNumberEquations_ > :: get( newtonIncrement_, param_, parallelInformation_, np );
// compute newton increment
SolutionVector dx = newtonIncrement_[ np ]->computeNewtonIncrement( residual );
SolutionVector dx = newtonIncrement.computeNewtonIncrement( residual );
// get number of linear iterations
iterations_ = newtonIncrement_[ np ]->iterations();
return dx;
iterations_ = newtonIncrement.iterations();
return std::move(dx);
}
const boost::any& NewtonIterationBlackoilInterleaved::parallelInformation() const
{
return parallelInformation_;

7
opm/autodiff/NewtonIterationBlackoilInterleaved.hpp
View File

@ -29,6 +29,7 @@
#include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <array>
#include <memory>
namespace Opm
@ -69,10 +70,10 @@ namespace Opm
virtual const boost::any& parallelInformation() const;
private:
template <int np>
SolutionVector computeNewtonIncrementImpl( const LinearisedBlackoilResidual& residual ) const;
// max number of equations supported, increase if necessary
static const int maxNumberEquations_ = 6 ;
mutable std::vector< std::unique_ptr< NewtonIterationBlackoilInterface > > newtonIncrement_;
mutable std::array< std::unique_ptr< NewtonIterationBlackoilInterface >, maxNumberEquations_ > newtonIncrement_;
const parameter::ParameterGroup& param_;
boost::any parallelInformation_;
mutable int iterations_;