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

Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp

Browse Source
This commit is contained in:
Halvor Møll Nilsen 2012-11-15 15:01:12 +01:00
parent 6c666f90a8
commit c090eb618b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/simulators/SimulatorIncompTwophase.cpp
View File

@ -98,7 +98,20 @@ namespace Opm
const FlowBoundaryConditions* bcs_; const FlowBoundaryConditions* bcs_;
// Solvers // Solvers
IncompTpfa psolver_; IncompTpfa psolver_;
// this should maybe be packed in a separate file
typedef Opm::SimpleFluid2pWrappingProps TwophaseFluid;
typedef Opm::SinglePointUpwindTwoPhase<TwophaseFluid> TransportModel; typedef Opm::SinglePointUpwindTwoPhase<TwophaseFluid> TransportModel;
using namespace Opm::ImplicitTransportDefault;
typedef NewtonVectorCollection< ::std::vector<double> > NVecColl;
typedef JacobianSystem < struct CSRMatrix, NVecColl > JacSys;
template <class Vector>
class MaxNorm {
public:
static double
norm(const Vector& v) {
return AccumulationNorm <Vector, MaxAbs>::norm(v);
}
};
typedef Opm::ImplicitTransport<TransportModel, typedef Opm::ImplicitTransport<TransportModel,
JacSys , JacSys ,
MaxNorm , MaxNorm ,
@ -106,7 +119,8 @@ namespace Opm
VectorZero , VectorZero ,
MatrixZero , MatrixZero ,
VectorAssign > ImpliciteTwoPhaseTransportSolver; VectorAssign > ImpliciteTwoPhaseTransportSolver;
ImpliciteTwoPhaseTransporSolver tsolver_;
ImpliciteTwoPhaseTransportSolver tsolver_;
// Needed by column-based gravity segregation solver. // Needed by column-based gravity segregation solver.
std::vector< std::vector<int> > columns_; std::vector< std::vector<int> > columns_;
// Misc. data // Misc. data