Skip to content
Snippets Groups Projects
Commit 7bd9a131 authored by Markus Wolff's avatar Markus Wolff
Browse files

make decoupled 1p-tests compile after model changes 


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7248 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 4776b9f8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/decoupled/1p/test_diffusion.cc
+ 34
− 34
View file @ 7bd9a131
...@@ -94,40 +94,40 @@ int main(int argc, char** argv) ...@@ -94,40 +94,40 @@ int main(int argc, char** argv)
fvProblem.model().calculateVelocity(); fvProblem.model().calculateVelocity();
double fvTime = timer.elapsed(); double fvTime = timer.elapsed();
fvProblem.writeOutput(); fvProblem.writeOutput();
Dumux::ResultEvaluation fvResult; // Dumux::ResultEvaluation fvResult;
fvResult.evaluate(grid.leafView(), fvProblem, fvProblem.variables().pressure(), fvProblem.variables().velocity(), consecutiveNumbering); // fvResult.evaluate(grid.leafView(), fvProblem, fvProblem.variables().pressure(), fvProblem.variables().velocity(), consecutiveNumbering);
typedef GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestProblem), PTAG(Problem)) MPFAOProblem; // typedef GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestProblem), PTAG(Problem)) MPFAOProblem;
MPFAOProblem mpfaProblem(grid.leafView(), delta); // MPFAOProblem mpfaProblem(grid.leafView(), delta);
mpfaProblem.setName("fvmpfaodiffusion"); // mpfaProblem.setName("fvmpfaodiffusion");
timer.reset(); // timer.reset();
mpfaProblem.init(); // mpfaProblem.init();
mpfaProblem.model().calculateVelocity(); // mpfaProblem.model().calculateVelocity();
double mpfaTime = timer.elapsed(); // double mpfaTime = timer.elapsed();
mpfaProblem.writeOutput(); // mpfaProblem.writeOutput();
Dumux::ResultEvaluation mpfaResult; // Dumux::ResultEvaluation mpfaResult;
mpfaResult.evaluate(grid.leafView(), mpfaProblem, mpfaProblem.variables().pressure(), mpfaProblem.variables().velocity(), consecutiveNumbering); // mpfaResult.evaluate(grid.leafView(), mpfaProblem, mpfaProblem.variables().pressure(), mpfaProblem.variables().velocity(), consecutiveNumbering);
//
typedef GET_PROP_TYPE(TTAG(MimeticPressure2PTestProblem), PTAG(Problem)) MimeticProblem; // typedef GET_PROP_TYPE(TTAG(MimeticPressure2PTestProblem), PTAG(Problem)) MimeticProblem;
MimeticProblem mimeticProblem(grid.leafView(), delta); // MimeticProblem mimeticProblem(grid.leafView(), delta);
mimeticProblem.setName("mimeticdiffusion"); // mimeticProblem.setName("mimeticdiffusion");
timer.reset(); // timer.reset();
mimeticProblem.init(); // mimeticProblem.init();
mimeticProblem.model().calculateVelocity(); // mimeticProblem.model().calculateVelocity();
double mimeticTime = timer.elapsed(); // double mimeticTime = timer.elapsed();
mimeticProblem.writeOutput(); // mimeticProblem.writeOutput();
Dumux::ResultEvaluation mimeticResult; // Dumux::ResultEvaluation mimeticResult;
mimeticResult.evaluate(grid.leafView(), mimeticProblem, mimeticProblem.variables().pressure(), mimeticProblem.variables().velocity(), consecutiveNumbering); // mimeticResult.evaluate(grid.leafView(), mimeticProblem, mimeticProblem.variables().pressure(), mimeticProblem.variables().velocity(), consecutiveNumbering);
std::cout.setf(std::ios_base::scientific, std::ios_base::floatfield); // std::cout.setf(std::ios_base::scientific, std::ios_base::floatfield);
std::cout.precision(2); // std::cout.precision(2);
std::cout << "\t error press \t error grad\t sumflux\t erflm\t\t uMin\t\t uMax\t\t time" << std::endl; // std::cout << "\t error press \t error grad\t sumflux\t erflm\t\t uMin\t\t uMax\t\t time" << std::endl;
std::cout << "2pfa\t " << fvResult.relativeL2Error << "\t " << fvResult.ergrad << "\t " << fvResult.sumflux // std::cout << "2pfa\t " << fvResult.relativeL2Error << "\t " << fvResult.ergrad << "\t " << fvResult.sumflux
<< "\t " << fvResult.erflm << "\t " << fvResult.uMin << "\t " << fvResult.uMax << "\t " << fvTime << std::endl; // << "\t " << fvResult.erflm << "\t " << fvResult.uMin << "\t " << fvResult.uMax << "\t " << fvTime << std::endl;
std::cout << "mpfa-o\t " << mpfaResult.relativeL2Error << "\t " << mpfaResult.ergrad << "\t " << mpfaResult.sumflux // std::cout << "mpfa-o\t " << mpfaResult.relativeL2Error << "\t " << mpfaResult.ergrad << "\t " << mpfaResult.sumflux
<< "\t " << mpfaResult.erflm << "\t " << mpfaResult.uMin << "\t " << mpfaResult.uMax << "\t " << mpfaTime << std::endl; // << "\t " << mpfaResult.erflm << "\t " << mpfaResult.uMin << "\t " << mpfaResult.uMax << "\t " << mpfaTime << std::endl;
std::cout << "mimetic\t " << mimeticResult.relativeL2Error << "\t " << mimeticResult.ergrad << "\t " << mimeticResult.sumflux // std::cout << "mimetic\t " << mimeticResult.relativeL2Error << "\t " << mimeticResult.ergrad << "\t " << mimeticResult.sumflux
<< "\t " << mimeticResult.erflm << "\t " << mimeticResult.uMin << "\t " << mimeticResult.uMax << "\t " << mimeticTime << std::endl; // << "\t " << mimeticResult.erflm << "\t " << mimeticResult.uMin << "\t " << mimeticResult.uMax << "\t " << mimeticTime << std::endl;
......
test/decoupled/1p/test_diffusion_problem.hh
+ 15
− 15
View file @ 7bd9a131
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#include <dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh> #include <dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh>
#include <dumux/decoupled/2p/diffusion/diffusionproblem2p.hh> #include <dumux/decoupled/2p/diffusion/diffusionproblem2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh> #include <dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh>
#include <dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh> //#include <dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh>
#include <dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh> //#include <dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh>
#include "test_diffusion_spatialparams.hh" #include "test_diffusion_spatialparams.hh"
...@@ -91,22 +91,22 @@ public: ...@@ -91,22 +91,22 @@ public:
// Enable gravity // Enable gravity
SET_BOOL_PROP(DiffusionTestProblem, EnableGravity, false); SET_BOOL_PROP(DiffusionTestProblem, EnableGravity, false);
// set the types for the 2PFA FV method //// set the types for the 2PFA FV method
NEW_TYPE_TAG(FVVelocity2PTestProblem, INHERITS_FROM(DiffusionTestProblem)); NEW_TYPE_TAG(FVVelocity2PTestProblem, INHERITS_FROM(DiffusionTestProblem));
SET_TYPE_PROP(FVVelocity2PTestProblem, Model, Dumux::FVVelocity2P<TTAG(FVVelocity2PTestProblem)>); SET_TYPE_PROP(FVVelocity2PTestProblem, Model, Dumux::FVVelocity2P<TTAG(FVVelocity2PTestProblem)>);
SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(FVVelocity2PTestProblem)>); SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(FVVelocity2PTestProblem)>);
// set the types for the MPFA-O FV method // set the types for the MPFA-O FV method
NEW_TYPE_TAG(FVMPFAOVelocity2PTestProblem, INHERITS_FROM(DiffusionTestProblem)); //NEW_TYPE_TAG(FVMPFAOVelocity2PTestProblem, INHERITS_FROM(DiffusionTestProblem));
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::ILUnBiCGSTABBackend<TypeTag>); //SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::ILUnBiCGSTABBackend<TypeTag>);
SET_INT_PROP(FVMPFAOVelocity2PTestProblem, PreconditionerIterations, 1); //SET_INT_PROP(FVMPFAOVelocity2PTestProblem, PreconditionerIterations, 1);
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Model, Dumux::FVMPFAOVelocity2P<TypeTag>); //SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Model, Dumux::FVMPFAOVelocity2P<TypeTag>);
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(FVMPFAOVelocity2PTestProblem)>); //SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(FVMPFAOVelocity2PTestProblem)>);
//
// set the types for the mimetic FD method //// set the types for the mimetic FD method
NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(DiffusionTestProblem, Mimetic)); //NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(DiffusionTestProblem, Mimetic));
SET_TYPE_PROP(MimeticPressure2PTestProblem, Model, Dumux::MimeticPressure2P<TTAG(MimeticPressure2PTestProblem)>); //SET_TYPE_PROP(MimeticPressure2PTestProblem, Model, Dumux::MimeticPressure2P<TTAG(MimeticPressure2PTestProblem)>);
SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(MimeticPressure2PTestProblem)>); //SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, Dumux::TestDiffusionProblem<TTAG(MimeticPressure2PTestProblem)>);
} }
/*! /*!
...@@ -120,7 +120,7 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag> ...@@ -120,7 +120,7 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
typedef DiffusionProblem2P<TypeTag> ParentType; typedef DiffusionProblem2P<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView; typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices; typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState; typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
...@@ -154,7 +154,7 @@ public: ...@@ -154,7 +154,7 @@ public:
TestDiffusionProblem(const GridView &gridView, const double delta = 1.0) : TestDiffusionProblem(const GridView &gridView, const double delta = 1.0) :
ParentType(gridView), delta_(delta) ParentType(gridView), delta_(delta)
{ {
this->variables().saturation() = 1.0; this->variables().primaryVariablesGlobal(pressEqIdx) = 1.0;
this->spatialParameters().setDelta(delta_); this->spatialParameters().setDelta(delta_);
} }
......
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