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

Rename TwoPhaseTransportSolver -> TransportSolverTwophaseInterface.

Browse Source 
To be more consistent with naming practices elsewhere in opm-core.
This commit is contained in:
Atgeirr Flø Rasmussen
2013-03-14 22:24:36 +01:00
parent 4ef30e694d
commit d607849293
6 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists_files.cmake
View File

@@ -99,7 +99,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/simulator/SimulatorReport.cpp
opm/core/simulator/SimulatorTimer.cpp
opm/core/transport/ImplicitTwoPhaseTransportSolver.cpp
opm/core/transport/TwoPhaseTransportSolver.cpp
opm/core/transport/TransportSolverTwophaseInterface.cpp
opm/core/transport/reorder/DGBasis.cpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
opm/core/transport/reorder/ReorderSolverInterface.cpp
@@ -264,6 +264,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/simulator/BlackoilState.hpp
opm/core/simulator/SimulatorCompressibleTwophase.hpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/SimulatorIncompTwophaseReorder.hpp
opm/core/simulator/SimulatorReport.hpp
opm/core/simulator/SimulatorTimer.hpp
opm/core/simulator/TwophaseState.hpp
@@ -277,12 +278,16 @@ 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/SimpleFluid2pWrappingProps.hpp
opm/core/transport/SimpleFluid2pWrappingProps_impl.hpp
opm/core/transport/TransportSolverTwophaseInterface.hpp
opm/core/transport/reorder/DGBasis.hpp
opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp
opm/core/transport/reorder/TransportModelInterface.hpp
opm/core/transport/reorder/TransportModelTracerTof.hpp
opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp
opm/core/transport/reorder/TransportModelTwophase.hpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp
opm/core/transport/reorder/ReorderSolverInterface.hpp
opm/core/transport/reorder/TofReorder.hpp
opm/core/transport/reorder/TofDiscGalReorder.hpp
opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp
opm/core/transport/reorder/nlsolvers.h
opm/core/transport/reorder/reordersequence.h
opm/core/transport/reorder/tarjan.h

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

@@ -45,7 +45,6 @@
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
//#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
//#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp>
#include <boost/filesystem.hpp>
@@ -100,7 +99,7 @@ namespace Opm
// Solvers
IncompTpfa psolver_;
// this should maybe be packed in a separate file
boost::scoped_ptr<TwoPhaseTransportSolver> tsolver_;
boost::scoped_ptr<TransportSolverTwophaseInterface> tsolver_;
//ImpliciteTwoPhaseTransportSolver tsolver_;
// Needed by column-based gravity segregation solver.
std::vector< std::vector<int> > columns_;

2
opm/core/transport/ImplicitTwoPhaseTransportSolver.cpp
View File

@@ -56,7 +56,7 @@ namespace Opm{
const double* source,
const double dt,
TwophaseState& state,
WellState& well_state)
const WellState& well_state)
{
std::vector<double> porevol;
if (rock_comp_.isActive()) {

6
opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp
View File

@@ -30,7 +30,7 @@
#define IMPLICITTWOPHASETRANSPORTSOLVER_HPP
#include <vector>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/transport/TwoPhaseTransportSolver.hpp>
#include <opm/core/transport/TransportSolverTwophaseInterface.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/transport/SimpleFluid2pWrappingProps.hpp>
#include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
@@ -53,7 +53,7 @@
#include <opm/core/simulator/WellState.hpp>
namespace Opm{
// implicite transprot solver
class ImplicitTwoPhaseTransportSolver : public TwoPhaseTransportSolver
class ImplicitTwoPhaseTransportSolver : public TransportSolverTwophaseInterface
{
public:
/// Construct solver.
@@ -84,7 +84,7 @@ namespace Opm{
const double* source,
const double dt,
Opm::TwophaseState& state,
Opm::WellState& well_state);
const Opm::WellState& well_state);
private:
ImplicitTwoPhaseTransportSolver(const ImplicitTwoPhaseTransportSolver&);

6
opm/core/transport/TwoPhaseTransportSolver.cpp → opm/core/transport/TransportSolverTwophaseInterface.cpp
View File

@@ -27,6 +27,8 @@
*/
#include "TwoPhaseTransportSolver.hpp"
#include "TransportSolverTwophaseInterface.hpp"
Opm::TransportSolverTwophaseInterface::~TransportSolverTwophaseInterface()
{
}

45
opm/core/transport/TwoPhaseTransportSolver.hpp → opm/core/transport/TransportSolverTwophaseInterface.hpp
View File

@@ -1,60 +1,51 @@
/*===========================================================================
//
// File: TwoPhaseTransportSolver.hpp
//
// Author: hnil <hnil@sintef.no>
//
// Created: 9 Nov 2012
//==========================================================================*/
/*
Copyright 2011 SINTEF ICT, Applied Mathematics.
Copyright 2011 Statoil ASA.
Copyright 2012, 2013 SINTEF ICT, Applied Mathematics.
This file is part of the Open Porous Media Project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TWOPHASETRANSPORTSOLVER_HPP
#define TWOPHASETRANSPORTSOLVER_HPP
#ifndef OPM_TRANSPORTSOLVERTWOPHASEINTERFACE_HEADER_INCLUDED
#define OPM_TRANSPORTSOLVERTWOPHASEINTERFACE_HEADER_INCLUDED
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
namespace Opm
{
/// Base class for tranport solvers
class TwoPhaseTransportSolver
/// Base class for two-phase incompressible transport solvers.
class TransportSolverTwophaseInterface
{
public:
/// Virtual destructor to enable inheritance.
virtual ~TwoPhaseTransportSolver() {}
virtual ~TransportSolverTwophaseInterface();
/// Solve for saturation at next timestep.
/// \param[in] darcyflux Array of signed face fluxes.
/// \param[in] porevolume Array of pore volumes.
/// \param[in] source Transport source term.
/// \param[in] dt Time step.
/// \param[in, out] saturation Phase saturations.
/// \param[in] porevolume Array of pore volumes.
/// \param[in] source Transport source term.
/// \param[in] dt Time step.
/// \param[in, out] state Reservoir state. Saturation will be modified.
/// \param[in] wstate Well state.
virtual void solve(const double* porevolume,
const double* source,
const double dt,
TwophaseState& state,
WellState& wstate) = 0;
const WellState& wstate) = 0;
};
}
#endif // TWOPHASETRANSPORTSOLVER_HPP
#endif // OPM_TRANSPORTSOLVERTWOPHASEINTERFACE_HEADER_INCLUDED