Commit f48068c1 authored by Markus Wolff's avatar Markus Wolff
Browse files

made decoupled 2p tests run after model changes



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7414 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 464c9580
......@@ -38,9 +38,11 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/simplednapl.hh>
#include <dumux/material/components/oil.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh>
#include <dumux/decoupled/2p/transport/fv/fvsaturation2p.hh>
#include <dumux/decoupled/2p/transport/fv/capillarydiffusion.hh>
......@@ -76,17 +78,24 @@ SET_TYPE_PROP(IMPESTestProblem, Problem, Dumux::TestIMPESProblem<TTAG(IMPESTestP
// Set the model properties
SET_TYPE_PROP(IMPESTestProblem, TransportModel, Dumux::FVSaturation2P<TTAG(IMPESTestProblem)>);
SET_TYPE_PROP(IMPESTestProblem, DiffusivePart, Dumux::CapillaryDiffusion<TypeTag>);
SET_TYPE_PROP(IMPESTestProblem, ConvectivePart, Dumux::GravityPart<TypeTag>);
SET_TYPE_PROP(IMPESTestProblem, CapillaryFlux, Dumux::CapillaryDiffusion<TypeTag>);
SET_TYPE_PROP(IMPESTestProblem, GravityFlux, Dumux::GravityPart<TypeTag>);
SET_PROP(IMPESTestProblem, PressureModel)
{
typedef Dumux::FVVelocity2P<TTAG(IMPESTestProblem)> type;
typedef Dumux::FVPressure2P<TypeTag> type;
};
SET_TYPE_PROP(IMPESTestProblem, Velocity, Dumux::FVVelocity2P<TypeTag>);
//SET_INT_PROP(IMPESTestProblem, Formulation,
// DecoupledTwoPCommonIndices::pnSn);
//SET_INT_PROP(IMPESTestProblem, Formulation,
// DecoupledTwoPCommonIndices::pGlobalSw);
//SET_INT_PROP(IMPESTestProblem, VelocityFormulation,
// DecoupledTwoPCommonIndices::velocityTotal);
// Set the wetting phase
SET_PROP(IMPESTestProblem, WettingPhase)
......
......@@ -73,6 +73,12 @@ SET_PROP(TransportTestProblem, Model)
typedef Dumux::FVSaturation2P<TTAG(TransportTestProblem)> type;
};
// Set the model properties
SET_PROP(TransportTestProblem, TransportModel)
{
typedef Dumux::FVSaturation2P<TTAG(TransportTestProblem)> type;
};
// Set the wetting phase
SET_PROP(TransportTestProblem, WettingPhase)
{
......@@ -169,8 +175,6 @@ public:
CellData& cellData = this->variables().cellData(globalIdx);
cellData.fluxData().velocity(wPhaseIdx) = vel;
// run through all intersections with neighbors and boundary
IntersectionIterator isItEnd = gridView.iend(*eIt);
for (IntersectionIterator isIt = gridView.ibegin(*eIt); isIt != isItEnd; ++isIt)
......@@ -178,6 +182,8 @@ public:
// local number of facet
int indexInInside = isIt->indexInInside();
cellData.fluxData().setVelocity(wPhaseIdx, indexInInside, vel);
const GlobalPosition& unitOuterNormal = isIt->centerUnitOuterNormal();
Scalar pot = vel * unitOuterNormal;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment