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 ImplicitBOStep -> FullyImplicitBlackoilSolver.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-24 10:49:59 +02:00
parent 6f55996441
commit 57a3bd2113
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -73,7 +73,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/BlackoilPropsAdInterface.hpp opm/autodiff/BlackoilPropsAdInterface.hpp
opm/autodiff/GeoProps.hpp opm/autodiff/GeoProps.hpp
opm/autodiff/ImpesTPFAAD.hpp opm/autodiff/ImpesTPFAAD.hpp
opm/autodiff/ImplicitBOStep.hpp opm/autodiff/FullyImplicitBlackoilSolver.hpp
opm/autodiff/SimulatorCompressibleAd.hpp opm/autodiff/SimulatorCompressibleAd.hpp
opm/autodiff/SimulatorIncompTwophaseAdfi.hpp opm/autodiff/SimulatorIncompTwophaseAdfi.hpp
opm/autodiff/TransportSolverTwophaseAd.hpp opm/autodiff/TransportSolverTwophaseAd.hpp

8
examples/test_implicit_ad.cpp
View File

@ -20,7 +20,7 @@
#include <config.h> #include <config.h>
#include <opm/autodiff/ImplicitBOStep.hpp> #include <opm/autodiff/FullyImplicitBlackoilSolver.hpp>
#include <opm/autodiff/GeoProps.hpp> #include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/BlackoilPropsAd.hpp> #include <opm/autodiff/BlackoilPropsAd.hpp>
@ -50,18 +50,18 @@ main(int argc, char* argv[])
const Opm::BlackoilPropertiesBasic props0(param, 2, nc); const Opm::BlackoilPropertiesBasic props0(param, 2, nc);
const Opm::BlackoilPropsAd props(props0); const Opm::BlackoilPropsAd props(props0);
typedef Opm::ImplicitBOStep<Opm::DerivedGeology> IStep; typedef Opm::FullyImplicitBlackoilSolver<Opm::DerivedGeology> BOSolver;
double grav[] = { 1.0, 0.0 }; double grav[] = { 1.0, 0.0 };
Opm::DerivedGeology geo(*g, props, grav); Opm::DerivedGeology geo(*g, props, grav);
IStep is(*g, props, geo); BOSolver solver(*g, props, geo);
Opm::BlackoilState state; Opm::BlackoilState state;
initStateBasic(*g, props0, param, 0.0, state); initStateBasic(*g, props0, param, 0.0, state);
initBlackoilSurfvol(*g, props0, state); initBlackoilSurfvol(*g, props0, state);
is.step(1.0, state); solver.step(1.0, state);
#if 0 #if 0
Opm::WellState well_state; Opm::WellState well_state;

18
opm/autodiff/ImplicitBOStep.hpp → opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -1,8 +1,7 @@
/* /*
Copyright 2013 SINTEF ICT, Applied Mathematics. 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 OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by 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/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_IMPLICITBO_HPP_HEADER_INCLUDED #ifndef OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED
#define OPM_IMPLICITBO_HPP_HEADER_INCLUDED #define OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED
#include <opm/autodiff/AutoDiffBlock.hpp> #include <opm/autodiff/AutoDiffBlock.hpp>
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
@ -123,11 +122,11 @@ namespace {
namespace Opm { namespace Opm {
template <class GeoProps> template <class GeoProps>
class ImplicitBOStep { class FullyImplicitBlackoilSolver {
public: public:
ImplicitBOStep(const UnstructuredGrid& grid , FullyImplicitBlackoilSolver(const UnstructuredGrid& grid ,
const BlackoilPropsAdInterface& fluid, const BlackoilPropsAdInterface& fluid,
const GeoProps& geo ) const GeoProps& geo )
: grid_ (grid) : grid_ (grid)
, fluid_ (fluid) , fluid_ (fluid)
, geo_ (geo) , geo_ (geo)
@ -518,4 +517,5 @@ namespace Opm {
}; };
} // namespace Opm } // namespace Opm
#endif /* OPM_IMPLICITBO_HPP_HEADER_INCLUDED */
#endif // OPM_FULLYIMPLICITBLACKOILSOLVER_HEADER_INCLUDED