split mpi function from newtoniterationutilities

CMakeLists_files.cmake

@@ -40,6 +40,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/autodiff/BlackoilModelParameters.cpp
   opm/autodiff/WellDensitySegmented.cpp
   opm/autodiff/LinearisedBlackoilResidual.cpp
+  opm/autodiff/MPIUtilities.cpp
   opm/autodiff/VFPProperties.cpp
   opm/autodiff/VFPProdProperties.cpp
   opm/autodiff/VFPInjProperties.cpp

opm/autodiff/ISTLSolverEbos.hpp

@@ -23,7 +23,7 @@
 #include <opm/autodiff/BlackoilAmg.hpp>
 #include <opm/autodiff/CPRPreconditioner.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterleaved.hpp>
-#include <opm/autodiff/NewtonIterationUtilities.hpp>
+#include <opm/autodiff/MPIUtilities.hpp>
 #include <opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp>
 #include <opm/autodiff/ParallelOverlappingILU0.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>

opm/autodiff/MPIUtilities.cpp

@@ -0,0 +1,44 @@
+/*
+  Copyright 2014 SINTEF ICT, Applied Mathematics.
+  Copyright 2014 IRIS AS
+
+  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 <config.h>
+#include <boost/any.hpp>
+#include <opm/core/linalg/ParallelIstlInformation.hpp>
+
+namespace Opm
+{
+    /// Return true if this is a serial run, or rank zero on an MPI run.
+    bool isIORank(const boost::any& parallel_info)
+    {
+#if HAVE_MPI
+        if (parallel_info.type() == typeid(ParallelISTLInformation)) {
+            const ParallelISTLInformation& info =
+                boost::any_cast<const ParallelISTLInformation&>(parallel_info);
+            return info.communicator().rank() == 0;
+        } else {
+            return true;
+        }
+#else
+        static_cast<void>(parallel_info); // Suppress unused argument warning.
+        return true;
+#endif
+    }
+} // namespace Opm
+

opm/autodiff/MPIUtilities.hpp

@@ -0,0 +1,30 @@
+/*
+  Copyright 2015 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/>.
+*/
+
+#ifndef OPM_MPIUTILITIES_HEADER_INCLUDED
+#define OPM_MPIUTILITIES_HEADER_INCLUDED
+
+namespace Opm
+{
+    /// Return true if this is a serial run, or rank zero on an MPI run.
+    bool isIORank(const boost::any& parallel_info);
+
+} // namespace Opm
+
+#endif // OPM_MPIUTILITIES_HEADER_INCLUDED

opm/autodiff/NewtonIterationUtilities.cpp

@@ -22,7 +22,6 @@
 
 #include <opm/autodiff/NewtonIterationUtilities.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
@@ -288,25 +287,5 @@ namespace Opm
     }
 
 
-
-
-    /// Return true if this is a serial run, or rank zero on an MPI run.
-    bool isIORank(const boost::any& parallel_info)
-    {
-#if HAVE_MPI
-        if (parallel_info.type() == typeid(ParallelISTLInformation)) {
-            const ParallelISTLInformation& info =
-                boost::any_cast<const ParallelISTLInformation&>(parallel_info);
-            return info.communicator().rank() == 0;
-        } else {
-            return true;
-        }
-#else
-        static_cast<void>(parallel_info); // Suppress unused argument warning.
-        return true;
-#endif
-    }
-
-
 } // namespace Opm
 

opm/autodiff/NewtonIterationUtilities.hpp

@@ -21,7 +21,6 @@
 #define OPM_NEWTONITERATIONUTILITIES_HEADER_INCLUDED
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
-#include <boost/any.hpp>
 #include <vector>
 
 namespace Opm
@@ -58,10 +57,6 @@ namespace Opm
                             const std::vector< AutoDiffBlock<double> >& eqs,
                             Eigen::SparseMatrix<double, Eigen::RowMajor>& A,
                             AutoDiffBlock<double>::V& b);
-
-    /// Return true if this is a serial run, or rank zero on an MPI run.
-    bool isIORank(const boost::any& parallel_info);
-
 } // namespace Opm
 
 #endif // OPM_NEWTONITERATIONUTILITIES_HEADER_INCLUDED