From e3b578d6858b46367ba48419469eb7c78346d8b7 Mon Sep 17 00:00:00 2001 From: Robert Kloefkorn Date: Tue, 9 Feb 2016 16:07:56 +0100 Subject: [PATCH] NewtonIterationBlackoilInterleaved: single precision can be used whether UMFpack is there or not. --- opm/autodiff/NewtonIterationBlackoilInterleaved.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp index c816eb46c..e9135e5ed 100644 --- a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp +++ b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp @@ -541,15 +541,9 @@ namespace Opm { // get np and call appropriate template method const int np = residual.material_balance_eq.size(); -#if ! HAVE_UMFPACK - const bool singlePrecision = residual.singlePrecision ; - const NewtonIterationBlackoilInterface& newtonIncrement = singlePrecision ? + const NewtonIterationBlackoilInterface& newtonIncrement = residual.singlePrecision ? detail::NewtonIncrement< maxNumberEquations_, float > :: get( newtonIncrementSinglePrecision_, parameters_, parallelInformation_, np ) : detail::NewtonIncrement< maxNumberEquations_, double > :: get( newtonIncrementDoublePrecision_, parameters_, parallelInformation_, np ); -#else - const NewtonIterationBlackoilInterface& newtonIncrement = - detail::NewtonIncrement< maxNumberEquations_, double > :: get( newtonIncrementDoublePrecision_, parameters_, parallelInformation_, np ); -#endif // compute newton increment SolutionVector dx = newtonIncrement.computeNewtonIncrement( residual );