From eded8f735cf8a9a5a58cf6a037494a51c758614c Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Fri, 6 Dec 2013 22:25:22 +0800
Subject: [PATCH] chang include header from opm/autodiff to
 opm/polymer/fullyimplicit

---
 opm/polymer/fullyimplicit/AutoDiffHelpers.hpp             | 2 +-
 opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.cpp | 8 ++++----
 opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp | 6 +++---
 opm/polymer/fullyimplicit/IncompPropsAd.hpp               | 2 +-
 opm/polymer/fullyimplicit/IncompPropsAdBasic.cpp          | 6 +++---
 opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp          | 4 ++--
 opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp       | 4 ++--
 opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp       | 4 ++--
 opm/polymer/fullyimplicit/IncompPropsAdInterface.cpp      | 2 +-
 opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp      | 2 +-
 .../fullyimplicit/SimulatorFullyImplicitTwophase.cpp      | 6 +++---
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/opm/polymer/fullyimplicit/AutoDiffHelpers.hpp b/opm/polymer/fullyimplicit/AutoDiffHelpers.hpp
index 9d26a6d36..ba154a08b 100644
--- a/opm/polymer/fullyimplicit/AutoDiffHelpers.hpp
+++ b/opm/polymer/fullyimplicit/AutoDiffHelpers.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_AUTODIFFHELPERS_HEADER_INCLUDED
 #define OPM_AUTODIFFHELPERS_HEADER_INCLUDED
 
-#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 
diff --git a/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.cpp b/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.cpp
index d70ab1909..60e7a11be 100644
--- a/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.cpp
+++ b/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.cpp
@@ -1,11 +1,11 @@
 /**/
 
-#include <opm/autodiff/polymer/FullyImplicitTwoPhaseSolver.hpp>
+#include <opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp>
 
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
-#include <opm/autodiff/AutoDiffBlock.hpp>
-#include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffHelpers.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
 
 #include <opm/core/grid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
diff --git a/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp b/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp
index d579cff6b..add966c60 100644
--- a/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp
+++ b/opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp
@@ -3,9 +3,9 @@
 #ifndef OPM_FULLYIMPLICITTWOPHASESOLVER_HEADER_INCLUDED
 #define OPM_FULLYIMPLICITTWOPHASESOLVER_HEADER_INCLUDED
 
-#include <opm/autodiff/AutoDiffBlock.hpp>
-#include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
+#include <opm/polymer//fullyimplicit/AutoDiffHelpers.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 
 
diff --git a/opm/polymer/fullyimplicit/IncompPropsAd.hpp b/opm/polymer/fullyimplicit/IncompPropsAd.hpp
index 21bfa798e..b6f5f379b 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAd.hpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAd.hpp
@@ -10,7 +10,7 @@ Properties for incompressible immiscible two-phase flow
 #define  OPM_INCOMPROPSAD_HEADER_INCLUDED
 #include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/core/props/rock/RockBasic.hpp>
-#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
 #include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
 #include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
 
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdBasic.cpp b/opm/polymer/fullyimplicit/IncompPropsAdBasic.cpp
index a15cbcc30..a12eff445 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdBasic.cpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdBasic.cpp
@@ -1,9 +1,9 @@
 /**/
 
-#include <opm/autodiff/polymer/IncompPropsAdBasic.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/autodiff/AutoDiffBlock.hpp>
-#include <opm/autodiff/AutoDiffHelpers.hpp>
+#include <opm/polymer/fulluimplicit/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffHelpers.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
 
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp b/opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp
index 7c5faa932..3fc901298 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdBasic.hpp
@@ -3,11 +3,11 @@
 #ifndef OPM_INCOMPPROPSADBASIC_HEADER_INCLUDED
 #define OPM_INCOMPPROPSADBASIC_HEADER_INCLUDED
 
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
 #include <opm/core/props/rock/RockBasic.hpp>
 #include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
 #include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
-#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
 namespace Opm
 {
     class IncompPropsAdBasic : public IncompPropsAdInterface
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp b/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp
index 0cd44beb8..4781c85b8 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp
@@ -1,6 +1,6 @@
 /**/
-#include <opm/autodiff/polymer/IncompPropsAdFromDeck.hpp>
-#include <opm/autodiff/AutoDiffHelpers.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffHelpers.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp b/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp
index 3cd08793b..8058611d0 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdFromDeck.hpp
@@ -1,8 +1,8 @@
 /**/
 #ifndef OPM_INCOMPPROPSADFROMDECK_HEADER_INCLUDED
 #define OPM_INCOMPPROPSADFROMDECK_HEADER_INCLUDED
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
-#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
 #include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdInterface.cpp b/opm/polymer/fullyimplicit/IncompPropsAdInterface.cpp
index ff3ba971b..af33535ea 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdInterface.cpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdInterface.cpp
@@ -1,5 +1,5 @@
 
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
 
 Opm::IncompPropsAdInterface::~IncompPropsAdInterface()
 {
diff --git a/opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp b/opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp
index 8de4c8309..b74004c93 100644
--- a/opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp
+++ b/opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp
@@ -4,7 +4,7 @@
 
 #ifndef OPM_INCOMPPROPSADINTERFACE_HEADER_INCLUDED
 #define OPM_INCOMPPROPSADINTERFACE_HEADER_INCLUDED
-#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
 
 namespace Opm
 {
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitTwophase.cpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitTwophase.cpp
index 09a5c7852..377a42265 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitTwophase.cpp
+++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitTwophase.cpp
@@ -17,12 +17,12 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/autodiff/polymer/SimulatorFullyImplicitTwophase.hpp>
+#include <opm/polymer/fullyimplicit/SimulatorFullyImplicitTwophase.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 
-#include <opm/autodiff/polymer/FullyImplicitTwoPhaseSolver.hpp>
-#include <opm/autodiff/polymer/IncompPropsAdInterface.hpp>
+#include <opm/polymer/fullyimplicit/FullyImplicitTwoPhaseSolver.hpp>
+#include <opm/polymer/fullyimplicit/IncompPropsAdInterface.hpp>
 
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>