OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-14 22:39:08 +01:00
parent d607849293
commit e532250867
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -98,7 +98,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/simulator/SimulatorIncompTwophaseReorder.cpp
opm/core/simulator/SimulatorReport.cpp
opm/core/simulator/SimulatorTimer.cpp
opm/core/transport/ImplicitTwoPhaseTransportSolver.cpp
opm/core/transport/TransportSolverTwophaseImplicit.cpp
opm/core/transport/TransportSolverTwophaseInterface.cpp
opm/core/transport/reorder/DGBasis.cpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
@ -278,7 +278,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/transport/JacobianSystem.hpp
opm/core/transport/NormSupport.hpp
opm/core/transport/SinglePointUpwindTwoPhase.hpp
opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp
opm/core/transport/TransportSolverTwophaseImplicit.hpp
opm/core/transport/SimpleFluid2pWrappingProps.hpp
opm/core/transport/SimpleFluid2pWrappingProps_impl.hpp
opm/core/transport/TransportSolverTwophaseInterface.hpp

4
opm/core/simulator/SimulatorIncompTwophase.cpp
View File

@ -46,7 +46,7 @@
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
//#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp>
#include <opm/core/transport/TransportSolverTwophaseImplicit.hpp>
#include <boost/filesystem.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/lexical_cast.hpp>
@ -359,7 +359,7 @@ namespace Opm
SinglePointUpwindTwoPhase<Opm::SimpleFluid2pWrappingProps>
model(fluid, grid, porevol, gravity, guess_old_solution);
model.initGravityTrans(grid_, psolver_.getHalfTrans());
tsolver_.reset(new Opm::ImplicitTwoPhaseTransportSolver(
tsolver_.reset(new Opm::TransportSolverTwophaseImplicit(
wells_manager,
*rock_comp_props,
ctrl,

14
opm/core/transport/ImplicitTwoPhaseTransportSolver.cpp → opm/core/transport/TransportSolverTwophaseImplicit.cpp
View File

@ -27,12 +27,12 @@
*/
#include <opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp>
#include <opm/core/transport/TransportSolverTwophaseImplicit.hpp>
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/utility/miscUtilities.hpp>
namespace Opm{
ImplicitTwoPhaseTransportSolver::ImplicitTwoPhaseTransportSolver(
TransportSolverTwophaseImplicit::TransportSolverTwophaseImplicit(
const Opm::WellsManager& wells,
const Opm::RockCompressibility& rock_comp,
const ImplicitTransportDetails::NRControl& ctrl,
@ -52,11 +52,11 @@ namespace Opm{
//src_(num_cells, 0.0);
}
void ImplicitTwoPhaseTransportSolver::solve(const double* porevolume,
const double* source,
const double dt,
TwophaseState& state,
const WellState& well_state)
void TransportSolverTwophaseImplicit::solve(const double* porevolume,
const double* source,
const double dt,
TwophaseState& state,
const WellState& well_state)
{
std::vector<double> porevol;
if (rock_comp_.isActive()) {

24
opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp → opm/core/transport/TransportSolverTwophaseImplicit.hpp
View File

@ -1,11 +1,3 @@
/*===========================================================================
//
// File: ImpliciteTwoPhaseTransportSolver.hpp
//
// Author: hnil <hnil@sintef.no>
//
// Created: 9 Nov 2012
//==========================================================================*/
/*
Copyright 2011 SINTEF ICT, Applied Mathematics.
Copyright 2011 Statoil ASA.
@ -26,8 +18,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef IMPLICITETWOPHASETRANSPORTSOLVER_HPP
#define IMPLICITTWOPHASETRANSPORTSOLVER_HPP
#ifndef OPM_TRANSPORTSOLVERTWOPHASEIMPLICIT_HEADER_INCLUDED
#define OPM_TRANSPORTSOLVERTWOPHASEIMPLICIT_HEADER_INCLUDED
#include <vector>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/transport/TransportSolverTwophaseInterface.hpp>
@ -53,7 +45,7 @@
#include <opm/core/simulator/WellState.hpp>
namespace Opm{
// implicite transprot solver
class ImplicitTwoPhaseTransportSolver : public TransportSolverTwophaseInterface
class TransportSolverTwophaseImplicit : public TransportSolverTwophaseInterface
{
public:
/// Construct solver.
@ -61,7 +53,7 @@ namespace Opm{
/// \param[in] props Rock and fluid properties.
/// \param[in] tol Tolerance used in the solver.
/// \param[in] maxit Maximum number of non-linear iterations used.
ImplicitTwoPhaseTransportSolver(
TransportSolverTwophaseImplicit(
const Opm::WellsManager& wells,
const Opm::RockCompressibility& rock_comp,
const ImplicitTransportDetails::NRControl& ctrl,
@ -70,7 +62,7 @@ namespace Opm{
const Opm::IncompPropertiesInterface& props,
const parameter::ParameterGroup& param);
~ImplicitTwoPhaseTransportSolver(){
~TransportSolverTwophaseImplicit(){
destroy_transport_source(tsrc_);
}
@ -87,8 +79,8 @@ namespace Opm{
const Opm::WellState& well_state);
private:
ImplicitTwoPhaseTransportSolver(const ImplicitTwoPhaseTransportSolver&);
ImplicitTwoPhaseTransportSolver& operator=(const ImplicitTwoPhaseTransportSolver&);
TransportSolverTwophaseImplicit(const TransportSolverTwophaseImplicit&);
TransportSolverTwophaseImplicit& operator=(const TransportSolverTwophaseImplicit&);
typedef Opm::SimpleFluid2pWrappingProps TwophaseFluid;
typedef Opm::SinglePointUpwindTwoPhase<TwophaseFluid> TransportModel;
@ -126,4 +118,4 @@ namespace Opm{
};
}
#endif // IMPLICITETWOPHASETRANSPORTSOLVER_HPP
#endif // OPM_TRANSPORTSOLVERTWOPHASEIMPLICIT_HEADER_INCLUDED