Commit 0d0e576f authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[co2ni]

Remove not working UG, ALUGrid must be used.
(thanks for reporting this bug goes to tatomir, reviewed by vishal)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9274 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent ad6d617f
......@@ -27,10 +27,8 @@
#if HAVE_ALUGRID
#include <dune/grid/alugrid/2d/alugrid.hh>
#elif HAVE_UG
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#else
#warning UG or ALUGrid necessary for this test.
#warning ALUGrid is necessary for this test.
#endif
#include <dune/grid/io/file/dgfparser/dgfs.hh>
......@@ -68,8 +66,6 @@ NEW_TYPE_TAG(HeterogeneousProblem, INHERITS_FROM(BoxTwoPTwoC, HeterogeneousSpati
// Set the grid type
#if HAVE_ALUGRID
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::YaspGrid<2>);
#endif
......
......@@ -66,11 +66,11 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
#if HAVE_ALUGRID || HAVE_UG
#if HAVE_ALUGRID
typedef TTAG(HeterogeneousProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
std::cout << "Test skipped, it needs ALUGrid or UG." << std::endl;
std::cout << "Test skipped, it needs ALUGrid." << std::endl;
return 77;
#endif
......
......@@ -26,10 +26,8 @@
#if HAVE_ALUGRID
#include <dune/grid/alugrid/2d/alugrid.hh>
#elif HAVE_UG
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#else
#warning UG or ALUGrid necessary for this test.
#warning ALUGrid is necessary for this test.
#endif
#include <dune/grid/io/file/dgfparser/dgfs.hh>
......@@ -59,8 +57,6 @@ NEW_TYPE_TAG(HeterogeneousProblem, INHERITS_FROM(BoxTwoPTwoCNI, HeterogeneousSpa
// Set the grid type
#if HAVE_ALUGRID
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::YaspGrid<2>);
#endif
......
......@@ -65,11 +65,11 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
#if HAVE_ALUGRID || HAVE_UG
#if HAVE_ALUGRID
typedef TTAG(HeterogeneousProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
std::cout << "Test skipped, it needs ALUGrid or UG." << std::endl;
std::cout << "Test skipped, it needs ALUGrid." << std::endl;
return 77;
#endif
......
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