From bd44127bd631ce38804bc93951021137fd1faad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 8 Apr 2014 16:11:08 +0200 Subject: [PATCH] Renamed more classes. FullyImplicitSystemSolver{Interface, Simple} -> NewtonIterationBlackoil{Interface, Simple}. Change suggested by B. Skaflestad. --- CMakeLists_files.cmake | 6 +++--- examples/sim_fibo_ad.cpp | 4 ++-- examples/test_implicit_ad.cpp | 4 ++-- opm/autodiff/FullyImplicitBlackoilSolver.cpp | 2 +- opm/autodiff/FullyImplicitBlackoilSolver.hpp | 8 ++++---- ...face.hpp => NewtonIterationBlackoilInterface.hpp} | 8 ++++---- ...rSimple.cpp => NewtonIterationBlackoilSimple.cpp} | 8 ++++---- ...rSimple.hpp => NewtonIterationBlackoilSimple.hpp} | 12 ++++++------ opm/autodiff/SimulatorFullyImplicitBlackoil.cpp | 6 +++--- opm/autodiff/SimulatorFullyImplicitBlackoil.hpp | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) rename opm/autodiff/{FullyImplicitSystemSolverInterface.hpp => NewtonIterationBlackoilInterface.hpp} (86%) rename opm/autodiff/{FullyImplicitSystemSolverSimple.cpp => NewtonIterationBlackoilSimple.cpp} (88%) rename opm/autodiff/{FullyImplicitSystemSolverSimple.hpp => NewtonIterationBlackoilSimple.hpp} (79%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index bdbef21c0..efbfbe77b 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -29,7 +29,7 @@ list (APPEND MAIN_SOURCE_FILES opm/autodiff/BlackoilPropsAd.cpp opm/autodiff/BlackoilPropsAdInterface.cpp opm/autodiff/FullyImplicitBlackoilSolver.cpp - opm/autodiff/FullyImplicitSystemSolverSimple.cpp + opm/autodiff/NewtonIterationBlackoilSimple.cpp opm/autodiff/ImpesTPFAAD.cpp opm/autodiff/SimulatorCompressibleAd.cpp opm/autodiff/SimulatorFullyImplicitBlackoil.cpp @@ -102,8 +102,8 @@ list (APPEND PUBLIC_HEADER_FILES opm/autodiff/GeoProps.hpp opm/autodiff/ImpesTPFAAD.hpp opm/autodiff/FullyImplicitBlackoilSolver.hpp - opm/autodiff/FullyImplicitBlackoilSystemSolverInterface.hpp - opm/autodiff/FullyImplicitBlackoilSystemSolverSimple.hpp + opm/autodiff/NewtonIterationBlackoilInterface.hpp + opm/autodiff/NewtonIterationBlackoilSimple.hpp opm/autodiff/LinearisedBlackoilResidual.hpp opm/autodiff/SimulatorCompressibleAd.hpp opm/autodiff/SimulatorFullyImplicitBlackoil.hpp diff --git a/examples/sim_fibo_ad.cpp b/examples/sim_fibo_ad.cpp index a331c819f..cc59135c5 100644 --- a/examples/sim_fibo_ad.cpp +++ b/examples/sim_fibo_ad.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -142,7 +142,7 @@ try // Linear solver. LinearSolverFactory linsolver(param); - FullyImplicitSystemSolverSimple fis_solver(linsolver); + NewtonIterationBlackoilSimple fis_solver(linsolver); // Write parameters used for later reference. bool output = param.getDefault("output", true); diff --git a/examples/test_implicit_ad.cpp b/examples/test_implicit_ad.cpp index 48c586d40..8e45e2177 100644 --- a/examples/test_implicit_ad.cpp +++ b/examples/test_implicit_ad.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ try Opm::DerivedGeology geo(*g, props, grav); Opm::LinearSolverFactory linsolver(param); - Opm::FullyImplicitSystemSolverSimple fis_solver(linsolver); + Opm::NewtonIterationBlackoilSimple fis_solver(linsolver); Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, fis_solver); diff --git a/opm/autodiff/FullyImplicitBlackoilSolver.cpp b/opm/autodiff/FullyImplicitBlackoilSolver.cpp index 6201b9be4..d665f9cc1 100644 --- a/opm/autodiff/FullyImplicitBlackoilSolver.cpp +++ b/opm/autodiff/FullyImplicitBlackoilSolver.cpp @@ -195,7 +195,7 @@ namespace { const DerivedGeology& geo , const RockCompressibility* rock_comp_props, const Wells& wells, - const FullyImplicitSystemSolverInterface& linsolver) + const NewtonIterationBlackoilInterface& linsolver) : grid_ (grid) , fluid_ (fluid) , geo_ (geo) diff --git a/opm/autodiff/FullyImplicitBlackoilSolver.hpp b/opm/autodiff/FullyImplicitBlackoilSolver.hpp index 8cc202ce8..65a1784d8 100644 --- a/opm/autodiff/FullyImplicitBlackoilSolver.hpp +++ b/opm/autodiff/FullyImplicitBlackoilSolver.hpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include struct UnstructuredGrid; struct Wells; @@ -33,7 +33,7 @@ namespace Opm { class DerivedGeology; class RockCompressibility; - class FullyImplicitSystemSolverInterface; + class NewtonIterationBlackoilInterface; class BlackoilState; class WellStateFullyImplicitBlackoil; @@ -64,7 +64,7 @@ namespace Opm { const DerivedGeology& geo , const RockCompressibility* rock_comp_props, const Wells& wells, - const FullyImplicitSystemSolverInterface& linsolver); + const NewtonIterationBlackoilInterface& linsolver); /// Take a single forward step, modifiying /// state.pressure() @@ -125,7 +125,7 @@ namespace Opm { const DerivedGeology& geo_; const RockCompressibility* rock_comp_props_; const Wells& wells_; - const FullyImplicitSystemSolverInterface& linsolver_; + const NewtonIterationBlackoilInterface& linsolver_; // For each canonical phase -> true if active const std::vector active_; // Size = # active faces. Maps active -> canonical phase indices. diff --git a/opm/autodiff/FullyImplicitSystemSolverInterface.hpp b/opm/autodiff/NewtonIterationBlackoilInterface.hpp similarity index 86% rename from opm/autodiff/FullyImplicitSystemSolverInterface.hpp rename to opm/autodiff/NewtonIterationBlackoilInterface.hpp index 262704ad2..7046a7b83 100644 --- a/opm/autodiff/FullyImplicitSystemSolverInterface.hpp +++ b/opm/autodiff/NewtonIterationBlackoilInterface.hpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#ifndef OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED -#define OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED +#ifndef OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED +#define OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED #include @@ -26,7 +26,7 @@ namespace Opm { /// Interface class for (linear) solvers for the fully implicit black-oil system. - class FullyImplicitSystemSolverInterface + class NewtonIterationBlackoilInterface { public: /// Return type for linearSolve(). A simple, non-ad vector type. @@ -43,4 +43,4 @@ namespace Opm } // namespace Opm -#endif // OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED +#endif // OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED diff --git a/opm/autodiff/FullyImplicitSystemSolverSimple.cpp b/opm/autodiff/NewtonIterationBlackoilSimple.cpp similarity index 88% rename from opm/autodiff/FullyImplicitSystemSolverSimple.cpp rename to opm/autodiff/NewtonIterationBlackoilSimple.cpp index cba3f1828..6b5002186 100644 --- a/opm/autodiff/FullyImplicitSystemSolverSimple.cpp +++ b/opm/autodiff/NewtonIterationBlackoilSimple.cpp @@ -18,7 +18,7 @@ */ -#include +#include #include #include @@ -27,7 +27,7 @@ namespace Opm /// Construct a system solver. /// \param[in] linsolver linear solver to use - FullyImplicitSystemSolverSimple::FullyImplicitSystemSolverSimple(const LinearSolverInterface& linsolver) + NewtonIterationBlackoilSimple::NewtonIterationBlackoilSimple(const LinearSolverInterface& linsolver) : linsolver_(linsolver) { } @@ -37,8 +37,8 @@ namespace Opm /// being the residual itself. /// \param[in] residual residual object containing A and b. /// \return the solution x - FullyImplicitSystemSolverSimple::SolutionVector - FullyImplicitSystemSolverSimple::linearSolve(const LinearisedBlackoilResidual& residual) const + NewtonIterationBlackoilSimple::SolutionVector + NewtonIterationBlackoilSimple::linearSolve(const LinearisedBlackoilResidual& residual) const { typedef LinearisedBlackoilResidual::ADB ADB; const int np = residual.material_balance_eq.size(); diff --git a/opm/autodiff/FullyImplicitSystemSolverSimple.hpp b/opm/autodiff/NewtonIterationBlackoilSimple.hpp similarity index 79% rename from opm/autodiff/FullyImplicitSystemSolverSimple.hpp rename to opm/autodiff/NewtonIterationBlackoilSimple.hpp index 2d5070bc5..d4da29daf 100644 --- a/opm/autodiff/FullyImplicitSystemSolverSimple.hpp +++ b/opm/autodiff/NewtonIterationBlackoilSimple.hpp @@ -17,11 +17,11 @@ along with OPM. If not, see . */ -#ifndef OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED -#define OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED +#ifndef OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED +#define OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED -#include +#include #include namespace Opm @@ -31,12 +31,12 @@ namespace Opm /// simply concatenating the Jacobian matrices and passing the /// resulting system to a linear solver. The linear solver used /// can be passed in as a constructor argument. - class FullyImplicitSystemSolverSimple : public FullyImplicitSystemSolverInterface + class NewtonIterationBlackoilSimple : public NewtonIterationBlackoilInterface { public: /// Construct a system solver. /// \param[in] linsolver linear solver to use - FullyImplicitSystemSolverSimple(const LinearSolverInterface& linsolver); + NewtonIterationBlackoilSimple(const LinearSolverInterface& linsolver); /// Solve the system of linear equations Ax = b, with A being the /// combined derivative matrix of the residual and b @@ -52,4 +52,4 @@ namespace Opm } // namespace Opm -#endif // OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED +#endif // OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp b/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp index cedfe9b71..53c124513 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp @@ -70,7 +70,7 @@ namespace Opm BlackoilPropsAdInterface& props, const RockCompressibility* rock_comp_props, WellsManager& wells_manager, - FullyImplicitSystemSolverInterface& linsolver, + NewtonIterationBlackoilInterface& linsolver, const double* gravity); SimulatorReport run(SimulatorTimer& timer, @@ -110,7 +110,7 @@ namespace Opm BlackoilPropsAdInterface& props, const RockCompressibility* rock_comp_props, WellsManager& wells_manager, - FullyImplicitSystemSolverInterface& linsolver, + NewtonIterationBlackoilInterface& linsolver, const double* gravity) { @@ -257,7 +257,7 @@ namespace Opm BlackoilPropsAdInterface& props, const RockCompressibility* rock_comp_props, WellsManager& wells_manager, - FullyImplicitSystemSolverInterface& linsolver, + NewtonIterationBlackoilInterface& linsolver, const double* gravity) : grid_(grid), props_(props), diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp index 0ce3aa8cf..d5aabee3f 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp @@ -33,7 +33,7 @@ namespace Opm class BlackoilPropsAdInterface; class RockCompressibility; class WellsManager; - class FullyImplicitSystemSolverInterface; + class NewtonIterationBlackoilInterface; class SimulatorTimer; class BlackoilState; class WellStateFullyImplicitBlackoil; @@ -70,7 +70,7 @@ namespace Opm BlackoilPropsAdInterface& props, const RockCompressibility* rock_comp_props, WellsManager& wells_manager, - FullyImplicitSystemSolverInterface& linsolver, + NewtonIterationBlackoilInterface& linsolver, const double* gravity); /// Run the simulation.