Commit 43a3f732 authored by Johannes Hommel's avatar Johannes Hommel
Browse files

Merge branch 'fix/test-boxadaptive' into 'master'

[boxadaptive] Update of boxadaptive reference file



See merge request !224
parents 33ac1f58 fd8e1788
......@@ -27,7 +27,7 @@ add_dumux_test(test_boxadaptive2p test_boxadaptive2p test_boxadaptive2p.cc
python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lensboxadaptive-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/lensboxadaptive-00015.vtu
${CMAKE_CURRENT_BINARY_DIR}/lensboxadaptive-00014.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_boxadaptive2p")
add_dumux_test(test_generalizeddirichlet test_generalizeddirichlet test_generalizeddirichlet.cc
......
......@@ -57,6 +57,7 @@ NEW_TYPE_TAG(LensCCAdaptiveProblem, INHERITS_FROM(CCModel, LensProblem));
#if HAVE_UG
SET_TYPE_PROP(LensCCProblem, Grid, Dune::UGGrid<2>);
SET_TYPE_PROP(LensBoxProblem, Grid, Dune::UGGrid<2>);
SET_TYPE_PROP(LensBoxAdaptiveProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensCCProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(LensBoxProblem, Grid, Dune::YaspGrid<2>);
......@@ -66,8 +67,6 @@ SET_TYPE_PROP(LensBoxProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(LensCCAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#endif
SET_TYPE_PROP(LensBoxAdaptiveProblem, Grid, Dune::UGGrid<2>);
// Set the problem property
SET_TYPE_PROP(LensProblem, Problem, LensProblem<TypeTag>);
......@@ -101,18 +100,22 @@ SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionInitializationIndicator, ImplicitG
SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>);
#endif
#if HAVE_UG
SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
SET_BOOL_PROP(LensBoxAdaptiveProblem, AdaptiveGrid, true);
SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>);
#endif
NEW_PROP_TAG(BaseProblem);
SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
SET_TYPE_PROP(LensCCProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
#if HAVE_DUNE_ALUGRID
SET_TYPE_PROP(LensCCAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
#endif
#if HAVE_UG
SET_TYPE_PROP(LensBoxAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
#endif
}
......
......@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
#if HAVE_DUNE_ALUGRID
#if HAVE_UG
typedef TTAG(LensBoxAdaptiveProblem) TypeTag;
return Dumux::start<TypeTag>(argc, argv, usage);
#else
#warning You need dune-ALUGrid to run this test.
std::cerr << "You need dune-ALUGrid to run this test." << std::endl;
#warning You need UGGrid to run this test.
std::cerr << "You need UGGrid to run this test." << std::endl;
return 77;
#endif
}
Markdown is supported
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