From 57a3bd21131da61995cb83f1d6b665a0c777cba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Fri, 24 May 2013 10:49:59 +0200
Subject: [PATCH] Renamed ImplicitBOStep -> FullyImplicitBlackoilSolver.

---
 CMakeLists_files.cmake                         |  2 +-
 examples/test_implicit_ad.cpp                  |  8 ++++----
 ...tep.hpp => FullyImplicitBlackoilSolver.hpp} | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename opm/autodiff/{ImplicitBOStep.hpp => FullyImplicitBlackoilSolver.hpp} (97%)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 05292aab2..36363840f 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -73,7 +73,7 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/autodiff/BlackoilPropsAdInterface.hpp
 	opm/autodiff/GeoProps.hpp
 	opm/autodiff/ImpesTPFAAD.hpp
-	opm/autodiff/ImplicitBOStep.hpp
+	opm/autodiff/FullyImplicitBlackoilSolver.hpp
 	opm/autodiff/SimulatorCompressibleAd.hpp
 	opm/autodiff/SimulatorIncompTwophaseAdfi.hpp
 	opm/autodiff/TransportSolverTwophaseAd.hpp
diff --git a/examples/test_implicit_ad.cpp b/examples/test_implicit_ad.cpp
index f11366884..fb53b662f 100644
--- a/examples/test_implicit_ad.cpp
+++ b/examples/test_implicit_ad.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <opm/autodiff/ImplicitBOStep.hpp>
+#include <opm/autodiff/FullyImplicitBlackoilSolver.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/BlackoilPropsAd.hpp>
 
@@ -50,18 +50,18 @@ main(int argc, char* argv[])
     const Opm::BlackoilPropertiesBasic   props0(param, 2, nc);
     const Opm::BlackoilPropsAd           props(props0);
 
-    typedef Opm::ImplicitBOStep<Opm::DerivedGeology> IStep;
+    typedef Opm::FullyImplicitBlackoilSolver<Opm::DerivedGeology> BOSolver;
 
     double grav[] = { 1.0, 0.0 };
     Opm::DerivedGeology geo(*g, props, grav);
 
-    IStep is(*g, props, geo);
+    BOSolver solver(*g, props, geo);
 
     Opm::BlackoilState state;
     initStateBasic(*g, props0, param, 0.0, state);
     initBlackoilSurfvol(*g, props0, state);
 
-    is.step(1.0, state);
+    solver.step(1.0, state);
 
 #if 0
     Opm::WellState well_state;
diff --git a/opm/autodiff/ImplicitBOStep.hpp b/opm/autodiff/FullyImplicitBlackoilSolver.hpp
similarity index 97%
rename from opm/autodiff/ImplicitBOStep.hpp
rename to opm/autodiff/FullyImplicitBlackoilSolver.hpp
index 05bef156c..657c8e390 100644
--- a/opm/autodiff/ImplicitBOStep.hpp
+++ b/opm/autodiff/FullyImplicitBlackoilSolver.hpp
@@ -1,8 +1,7 @@
 /*
   Copyright 2013 SINTEF ICT, Applied Mathematics.
-  Copyright 2013 Statoil ASA.
 
-  This file is part of the Open Porous Media Project (OPM).
+  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
@@ -18,8 +17,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_IMPLICITBO_HPP_HEADER_INCLUDED
-#define OPM_IMPLICITBO_HPP_HEADER_INCLUDED
+#ifndef OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED
+#define OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
@@ -123,11 +122,11 @@ namespace {
 namespace Opm {
 
     template <class GeoProps>
-    class ImplicitBOStep {
+    class FullyImplicitBlackoilSolver {
     public:
-        ImplicitBOStep(const UnstructuredGrid&         grid ,
-                       const BlackoilPropsAdInterface& fluid,
-                       const GeoProps&                 geo  )
+        FullyImplicitBlackoilSolver(const UnstructuredGrid&         grid ,
+                                    const BlackoilPropsAdInterface& fluid,
+                                    const GeoProps&                 geo  )
             : grid_  (grid)
             , fluid_ (fluid)
             , geo_   (geo)
@@ -518,4 +517,5 @@ namespace Opm {
     };
 } // namespace Opm
 
-#endif  /* OPM_IMPLICITBO_HPP_HEADER_INCLUDED */
+
+#endif // OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED