chang include header from opm/autodiff to opm/polymer/fullyimplicit

2024-11-29 12:33:49 -06:00 · 2013-12-06 22:25:22 +08:00 · 2013-12-06 22:25:22 +08:00 · eded8f735c
commit eded8f735c
parent f6acccd396
11 changed files with 23 additions and 23 deletions
--- 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>

--- 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>
--- 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>


--- 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>

--- 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>

--- 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
--- 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>
--- 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>
--- 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()
 {
--- 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
 {
--- 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>