Adding size function in LinearisedBlackoilResidual.

int sizeNonLinear() const;
To compute the size of the non-linear system.

CMakeLists_files.cmake

@@ -38,6 +38,7 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/autodiff/TransportSolverTwophaseAd.cpp
 	opm/autodiff/BlackoilPropsAdFromDeck.cpp
 	opm/autodiff/WellDensitySegmented.cpp
+	opm/autodiff/LinearisedBlackoilResidual.cpp
 	)
 
 # originally generated with the command:

opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp

@@ -301,16 +301,7 @@ namespace {
                   << std::setw(18) << r0 << std::endl;
 
         // compute the size of the non-linear system
-        int sizeNonLinear = 0;
+        const int sizeNonLinear = residual_.sizeNonLinear();
-
-        std::vector<ADB>::const_iterator massBalanceIt = residual_.material_balance_eq.begin();
-        const std::vector<ADB>::const_iterator endMassBalanceIt = residual_.material_balance_eq.end();
-
-        for (; massBalanceIt != endMassBalanceIt; ++massBalanceIt) {
-            sizeNonLinear += (*massBalanceIt).size();
-        }
-        sizeNonLinear += residual_.well_flux_eq.size();
-        sizeNonLinear += residual_.well_eq.size();
 
         V dxOld = V::Zero(sizeNonLinear);
 

opm/autodiff/LinearisedBlackoilResidual.cpp

@@ -0,0 +1,36 @@
+/*
+  Copyright 2013 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <opm/autodiff/LinearisedBlackoilResidual.hpp>
+
+int Opm::LinearisedBlackoilResidual::sizeNonLinear() const
+{
+    int size = 0;
+
+    std::vector<ADB>::const_iterator massBalanceIt = material_balance_eq.begin();
+    const std::vector<ADB>::const_iterator endMassBalanceIt = material_balance_eq.end();
+    for (; massBalanceIt != endMassBalanceIt; ++massBalanceIt) {
+        size += (*massBalanceIt).size();
+    }
+
+    size += well_flux_eq.size();
+    size += well_eq.size();
+
+    return size;
+}

opm/autodiff/LinearisedBlackoilResidual.hpp

@@ -62,6 +62,9 @@ namespace Opm
         /// well either a rate specification or bottom hole
         /// pressure specification.
         ADB well_eq;
+
+        /// The size of the non-linear system.
+        int sizeNonLinear() const;
     };
 
 } // namespace Opm