OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed more classes.

Browse Source 
FullyImplicitSystemSolver{Interface, Simple} -> NewtonIterationBlackoil{Interface, Simple}.
Change suggested by B. Skaflestad.
This commit is contained in:
Atgeirr Flø Rasmussen
2014-04-08 16:11:08 +02:00
parent a434d39363
commit bd44127bd6
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists_files.cmake
View File

@@ -29,7 +29,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/autodiff/BlackoilPropsAd.cpp opm/autodiff/BlackoilPropsAd.cpp
opm/autodiff/BlackoilPropsAdInterface.cpp opm/autodiff/BlackoilPropsAdInterface.cpp
opm/autodiff/FullyImplicitBlackoilSolver.cpp opm/autodiff/FullyImplicitBlackoilSolver.cpp
opm/autodiff/FullyImplicitSystemSolverSimple.cpp opm/autodiff/NewtonIterationBlackoilSimple.cpp
opm/autodiff/ImpesTPFAAD.cpp opm/autodiff/ImpesTPFAAD.cpp
opm/autodiff/SimulatorCompressibleAd.cpp opm/autodiff/SimulatorCompressibleAd.cpp
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
@@ -102,8 +102,8 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/GeoProps.hpp opm/autodiff/GeoProps.hpp
opm/autodiff/ImpesTPFAAD.hpp opm/autodiff/ImpesTPFAAD.hpp
opm/autodiff/FullyImplicitBlackoilSolver.hpp opm/autodiff/FullyImplicitBlackoilSolver.hpp
opm/autodiff/FullyImplicitBlackoilSystemSolverInterface.hpp opm/autodiff/NewtonIterationBlackoilInterface.hpp
opm/autodiff/FullyImplicitBlackoilSystemSolverSimple.hpp opm/autodiff/NewtonIterationBlackoilSimple.hpp
opm/autodiff/LinearisedBlackoilResidual.hpp opm/autodiff/LinearisedBlackoilResidual.hpp
opm/autodiff/SimulatorCompressibleAd.hpp opm/autodiff/SimulatorCompressibleAd.hpp
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp opm/autodiff/SimulatorFullyImplicitBlackoil.hpp

4
examples/sim_fibo_ad.cpp
View File

@@ -37,7 +37,7 @@
#include <opm/core/props/rock/RockCompressibility.hpp> #include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
#include <opm/autodiff/FullyImplicitSystemSolverSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
#include <opm/core/simulator/BlackoilState.hpp> #include <opm/core/simulator/BlackoilState.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp> #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
@@ -142,7 +142,7 @@ try
// Linear solver. // Linear solver.
LinearSolverFactory linsolver(param); LinearSolverFactory linsolver(param);
FullyImplicitSystemSolverSimple fis_solver(linsolver); NewtonIterationBlackoilSimple fis_solver(linsolver);
// Write parameters used for later reference. // Write parameters used for later reference.
bool output = param.getDefault("output", true); bool output = param.getDefault("output", true);

4
examples/test_implicit_ad.cpp
View File

@@ -24,7 +24,7 @@
#include <opm/autodiff/GeoProps.hpp> #include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/BlackoilPropsAd.hpp> #include <opm/autodiff/BlackoilPropsAd.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp> #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/FullyImplicitSystemSolverSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/wells.h> #include <opm/core/wells.h>
@@ -104,7 +104,7 @@ try
Opm::DerivedGeology geo(*g, props, grav); Opm::DerivedGeology geo(*g, props, grav);
Opm::LinearSolverFactory linsolver(param); Opm::LinearSolverFactory linsolver(param);
Opm::FullyImplicitSystemSolverSimple fis_solver(linsolver); Opm::NewtonIterationBlackoilSimple fis_solver(linsolver);
Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, fis_solver); Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, fis_solver);

2
opm/autodiff/FullyImplicitBlackoilSolver.cpp
View File

@@ -195,7 +195,7 @@ namespace {
const DerivedGeology& geo , const DerivedGeology& geo ,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
const Wells& wells, const Wells& wells,
const FullyImplicitSystemSolverInterface& linsolver) const NewtonIterationBlackoilInterface& linsolver)
: grid_ (grid) : grid_ (grid)
, fluid_ (fluid) , fluid_ (fluid)
, geo_ (geo) , geo_ (geo)

8
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@@ -24,7 +24,7 @@
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp> #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/LinearisedBlackoilResidual.hpp> #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
#include <opm/autodiff/FullyImplicitSystemSolverInterface.hpp> #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
struct UnstructuredGrid; struct UnstructuredGrid;
struct Wells; struct Wells;
@@ -33,7 +33,7 @@ namespace Opm {
class DerivedGeology; class DerivedGeology;
class RockCompressibility; class RockCompressibility;
class FullyImplicitSystemSolverInterface; class NewtonIterationBlackoilInterface;
class BlackoilState; class BlackoilState;
class WellStateFullyImplicitBlackoil; class WellStateFullyImplicitBlackoil;
@@ -64,7 +64,7 @@ namespace Opm {
const DerivedGeology& geo , const DerivedGeology& geo ,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
const Wells& wells, const Wells& wells,
const FullyImplicitSystemSolverInterface& linsolver); const NewtonIterationBlackoilInterface& linsolver);
/// Take a single forward step, modifiying /// Take a single forward step, modifiying
/// state.pressure() /// state.pressure()
@@ -125,7 +125,7 @@ namespace Opm {
const DerivedGeology& geo_; const DerivedGeology& geo_;
const RockCompressibility* rock_comp_props_; const RockCompressibility* rock_comp_props_;
const Wells& wells_; const Wells& wells_;
const FullyImplicitSystemSolverInterface& linsolver_; const NewtonIterationBlackoilInterface& linsolver_;
// For each canonical phase -> true if active // For each canonical phase -> true if active
const std::vector<bool> active_; const std::vector<bool> active_;
// Size = # active faces. Maps active -> canonical phase indices. // Size = # active faces. Maps active -> canonical phase indices.

8
opm/autodiff/FullyImplicitSystemSolverInterface.hpp → opm/autodiff/NewtonIterationBlackoilInterface.hpp
View File

@@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED #ifndef OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED
#define OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED #define OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED
#include <opm/autodiff/LinearisedBlackoilResidual.hpp> #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
@@ -26,7 +26,7 @@ namespace Opm
{ {
/// Interface class for (linear) solvers for the fully implicit black-oil system. /// Interface class for (linear) solvers for the fully implicit black-oil system.
class FullyImplicitSystemSolverInterface class NewtonIterationBlackoilInterface
{ {
public: public:
/// Return type for linearSolve(). A simple, non-ad vector type. /// Return type for linearSolve(). A simple, non-ad vector type.
@@ -43,4 +43,4 @@ namespace Opm
} // namespace Opm } // namespace Opm
#endif // OPM_FULLYIMPLICITSYSTEMSOLVERINTERFACE_HEADER_INCLUDED #endif // OPM_NEWTONITERATIONBLACKOILINTERFACE_HEADER_INCLUDED

8
opm/autodiff/FullyImplicitSystemSolverSimple.cpp → opm/autodiff/NewtonIterationBlackoilSimple.cpp
View File

@@ -18,7 +18,7 @@
*/ */
#include <opm/autodiff/FullyImplicitSystemSolverSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
#include <opm/autodiff/AutodiffHelpers.hpp> #include <opm/autodiff/AutodiffHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
@@ -27,7 +27,7 @@ namespace Opm
/// Construct a system solver. /// Construct a system solver.
/// \param[in] linsolver linear solver to use /// \param[in] linsolver linear solver to use
FullyImplicitSystemSolverSimple::FullyImplicitSystemSolverSimple(const LinearSolverInterface& linsolver) NewtonIterationBlackoilSimple::NewtonIterationBlackoilSimple(const LinearSolverInterface& linsolver)
: linsolver_(linsolver) : linsolver_(linsolver)
{ {
} }
@@ -37,8 +37,8 @@ namespace Opm
/// being the residual itself. /// being the residual itself.
/// \param[in] residual residual object containing A and b. /// \param[in] residual residual object containing A and b.
/// \return the solution x /// \return the solution x
FullyImplicitSystemSolverSimple::SolutionVector NewtonIterationBlackoilSimple::SolutionVector
FullyImplicitSystemSolverSimple::linearSolve(const LinearisedBlackoilResidual& residual) const NewtonIterationBlackoilSimple::linearSolve(const LinearisedBlackoilResidual& residual) const
{ {
typedef LinearisedBlackoilResidual::ADB ADB; typedef LinearisedBlackoilResidual::ADB ADB;
const int np = residual.material_balance_eq.size(); const int np = residual.material_balance_eq.size();

12
opm/autodiff/FullyImplicitSystemSolverSimple.hpp → opm/autodiff/NewtonIterationBlackoilSimple.hpp
View File

@@ -17,11 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED #ifndef OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED
#define OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED #define OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED
#include <opm/autodiff/FullyImplicitSystemSolverInterface.hpp> #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
#include <opm/core/linalg/LinearSolverInterface.hpp> #include <opm/core/linalg/LinearSolverInterface.hpp>
namespace Opm namespace Opm
@@ -31,12 +31,12 @@ namespace Opm
/// simply concatenating the Jacobian matrices and passing the /// simply concatenating the Jacobian matrices and passing the
/// resulting system to a linear solver. The linear solver used /// resulting system to a linear solver. The linear solver used
/// can be passed in as a constructor argument. /// can be passed in as a constructor argument.
class FullyImplicitSystemSolverSimple : public FullyImplicitSystemSolverInterface class NewtonIterationBlackoilSimple : public NewtonIterationBlackoilInterface
{ {
public: public:
/// Construct a system solver. /// Construct a system solver.
/// \param[in] linsolver linear solver to use /// \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 /// Solve the system of linear equations Ax = b, with A being the
/// combined derivative matrix of the residual and b /// combined derivative matrix of the residual and b
@@ -52,4 +52,4 @@ namespace Opm
} // namespace Opm } // namespace Opm
#endif // OPM_FULLYIMPLICITSYSTEMSOLVERSIMPLE_HEADER_INCLUDED #endif // OPM_NEWTONITERATIONBLACKOILSIMPLE_HEADER_INCLUDED

6
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
View File

@@ -70,7 +70,7 @@ namespace Opm
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager, WellsManager& wells_manager,
FullyImplicitSystemSolverInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity); const double* gravity);
SimulatorReport run(SimulatorTimer& timer, SimulatorReport run(SimulatorTimer& timer,
@@ -110,7 +110,7 @@ namespace Opm
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager, WellsManager& wells_manager,
FullyImplicitSystemSolverInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity) const double* gravity)
{ {
@@ -257,7 +257,7 @@ namespace Opm
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager, WellsManager& wells_manager,
FullyImplicitSystemSolverInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity) const double* gravity)
: grid_(grid), : grid_(grid),
props_(props), props_(props),

4
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
View File

@@ -33,7 +33,7 @@ namespace Opm
class BlackoilPropsAdInterface; class BlackoilPropsAdInterface;
class RockCompressibility; class RockCompressibility;
class WellsManager; class WellsManager;
class FullyImplicitSystemSolverInterface; class NewtonIterationBlackoilInterface;
class SimulatorTimer; class SimulatorTimer;
class BlackoilState; class BlackoilState;
class WellStateFullyImplicitBlackoil; class WellStateFullyImplicitBlackoil;
@@ -70,7 +70,7 @@ namespace Opm
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager, WellsManager& wells_manager,
FullyImplicitSystemSolverInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity); const double* gravity);
/// Run the simulation. /// Run the simulation.