ISTLSolverEbosBda: rename to ISTLSolverBda

CMakeLists_files.cmake

@@ -205,7 +205,7 @@ if(USE_BDA_BRIDGE)
   list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/BdaBridge.cpp
                                  opm/simulators/linalg/bda/WellContributions.cpp
                                  opm/simulators/linalg/bda/MultisegmentWellContribution.cpp
-                                 opm/simulators/linalg/ISTLSolverEbosBda.cpp)
+                                 opm/simulators/linalg/ISTLSolverBda.cpp)
   if(OPENCL_FOUND)
     list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/BlockedMatrix.cpp)
     list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/BILU0.cpp)
@@ -505,7 +505,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/linalg/FlowLinearSolverParameters.hpp
   opm/simulators/linalg/GraphColoring.hpp
   opm/simulators/linalg/ISTLSolverEbos.hpp
-  opm/simulators/linalg/ISTLSolverEbosBda.hpp
+  opm/simulators/linalg/ISTLSolverBda.hpp
   opm/simulators/linalg/MatrixMarketSpecializations.hpp
   opm/simulators/linalg/OwningBlockPreconditioner.hpp
   opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp

opm/simulators/flow/BlackoilModelNldd.hpp

@@ -38,7 +38,7 @@
 #include <opm/simulators/linalg/extractMatrix.hpp>
 
 #if COMPILE_BDA_BRIDGE
-#include <opm/simulators/linalg/ISTLSolverEbosBda.hpp>
+#include <opm/simulators/linalg/ISTLSolverBda.hpp>
 #else
 #include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #endif

opm/simulators/linalg/FlowLinearSolverParameters.hpp

@@ -31,7 +31,7 @@
 
 namespace Opm {
 template <class TypeTag>
-class ISTLSolverEbosBda;
+class ISTLSolverBda;
 template <class TypeTag>
 class ISTLSolverEbos;
 }
@@ -221,7 +221,7 @@ struct OpenclIluParallel<TypeTag, TTag::FlowIstlSolverParams> {
 template<class TypeTag>
 struct LinearSolverBackend<TypeTag, TTag::FlowIstlSolverParams> {
 #if COMPILE_BDA_BRIDGE
-    using type = ISTLSolverEbosBda<TypeTag>;
+    using type = ISTLSolverBda<TypeTag>;
 #else
     using type = ISTLSolverEbos<TypeTag>;
 #endif

opm/simulators/linalg/ISTLSolverBda.cpp

@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <opm/common/TimingMacros.hpp>
-#include <opm/simulators/linalg/ISTLSolverEbosBda.hpp>
+#include <opm/simulators/linalg/ISTLSolverBda.hpp>
 
 #include <dune/istl/schwarz.hh>
 

opm/simulators/linalg/ISTLSolverBda.hpp

@@ -19,8 +19,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_ISTLSOLVER_EBOS_WITH_BDA_INCLUDED
-#define OPM_ISTLSOLVER_EBOS_WITH_BDA_INCLUDED
+#ifndef OPM_ISTLSOLVER_WITH_BDA_HEADER_INCLUDED
+#define OPM_ISTLSOLVER_WITH_BDA_HEADER_INCLUDED
 
 #include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 
@@ -98,7 +98,7 @@ private:
 /// as a block-structured matrix (one block for all cell variables) for a fixed
 /// number of cell variables np .
 template <class TypeTag>
-class ISTLSolverEbosBda : public ISTLSolverEbos<TypeTag>
+class ISTLSolverBda : public ISTLSolverEbos<TypeTag>
 {
 protected:
     using ParentType = ISTLSolverEbos<TypeTag>;
@@ -132,7 +132,7 @@ public:
     /// \param[in] simulator   The opm-models simulator object
     /// \param[in] parameters  Explicit parameters for solver setup, do not
     ///                        read them from command line parameters.
-    ISTLSolverEbosBda(const Simulator& simulator, const FlowLinearSolverParameters& parameters)
+    ISTLSolverBda(const Simulator& simulator, const FlowLinearSolverParameters& parameters)
         : ParentType(simulator, parameters)
     {
         initializeBda();
@@ -140,8 +140,8 @@ public:
 
     /// Construct a system solver.
     /// \param[in] simulator   The opm-models simulator object
-    explicit ISTLSolverEbosBda(const Simulator& simulator)
-    : ParentType(simulator)
+    explicit ISTLSolverBda(const Simulator& simulator)
+        : ParentType(simulator)
     {
         initializeBda();
     }
@@ -234,7 +234,7 @@ public:
             return ParentType::solve(x);
         }
 
-        OPM_TIMEBLOCK(istlSolverEbosBdaSolve);
+        OPM_TIMEBLOCK(istlSolverBdaSolve);
         this->solveCount_ += 1;
         // Write linear system if asked for.
         const int verbosity = this->prm_[this->activeSolverNum_].template get<int>("verbosity", 0);
@@ -279,4 +279,4 @@ protected:
 
 } // namespace Opm
 
-#endif // OPM_ISTLSOLVER_EBOS_BDA_HEADER_INCLUDED
+#endif // OPM_ISTLSOLVER_WITH_BDA_HEADER_INCLUDED