Commit 693abb11 authored by Christoph Grüninger's avatar Christoph Grüninger

Merge branch 'feature/remove-old-alugrid' into 'master'

Feature/remove old alugrid



See merge request !7
parents 519d573d 6cd1bd98
...@@ -34,7 +34,7 @@ int main(int argc, char **argv) ...@@ -34,7 +34,7 @@ int main(int argc, char **argv)
UnitCube<Dune::AlbertaGrid<3,3>,1> uc9; UnitCube<Dune::AlbertaGrid<3,3>,1> uc9;
#endif #endif
#endif #endif
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID #if HAVE_DUNE_ALUGRID
UnitCube<Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>,1> uc8; UnitCube<Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>,1> uc8;
UnitCube<Dune::ALUGrid<3,3,Dune::cube,Dune::nonconforming>,1> uc10; UnitCube<Dune::ALUGrid<3,3,Dune::cube,Dune::nonconforming>,1> uc10;
#endif #endif
......
...@@ -97,8 +97,8 @@ int main (int argc , char ** argv) ...@@ -97,8 +97,8 @@ int main (int argc , char ** argv)
// UnitCube< GridType, 2 > uc2; // UnitCube< GridType, 2 > uc2;
#endif #endif
// ALUGRID supports parallelization in 3 dimensions only // ALUGRID supports parallelization in 2 or 3 dimensions
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID #if HAVE_DUNE_ALUGRID
// typedef Dune::ALUGrid< 3, 3, Dune::cube, Dune::nonconforming > GridType; // typedef Dune::ALUGrid< 3, 3, Dune::cube, Dune::nonconforming > GridType;
// typedef Dune::ALUGrid< 3, 3, Dune::simplex, Dune::nonconforming > GridType; // typedef Dune::ALUGrid< 3, 3, Dune::simplex, Dune::nonconforming > GridType;
// UnitCube< GridType , 1 > uc2; // UnitCube< GridType , 1 > uc2;
......
...@@ -8,15 +8,10 @@ ...@@ -8,15 +8,10 @@
#include "unitcube.hh" #include "unitcube.hh"
#if HAVE_ALUGRID #if HAVE_DUNE_ALUGRID
#include <dune/grid/alugrid.hh>
#include <dune/grid/alugrid/3d/alu3dgridfactory.hh>
#elif HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh> #include <dune/alugrid/grid.hh>
#include <dune/alugrid/3d/gridfactory.hh> #include <dune/alugrid/3d/gridfactory.hh>
#endif
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
// ALU3dGrid and ALU2dGrid simplex specialization. // ALU3dGrid and ALU2dGrid simplex specialization.
// Note: element type determined by type // Note: element type determined by type
template<int dim> template<int dim>
...@@ -70,6 +65,6 @@ public: ...@@ -70,6 +65,6 @@ public:
return *grid_; return *grid_;
} }
}; };
#endif // HAVE_ALUGRID || HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
#endif // UNITCUBE_ALUGRID_HH #endif // UNITCUBE_ALUGRID_HH
...@@ -75,7 +75,7 @@ int main(int argc, char **argv) ...@@ -75,7 +75,7 @@ int main(int argc, char **argv)
#endif // #if HAVE_ALBERTA #endif // #if HAVE_ALBERTA
*/ */
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID #if HAVE_DUNE_ALUGRID
UnitCube< Dune::ALUGrid< dimGrid, dimGrid, Dune::simplex, UnitCube< Dune::ALUGrid< dimGrid, dimGrid, Dune::simplex,
Dune::nonconforming > , 1 > uc5; Dune::nonconforming > , 1 > uc5;
dowork( uc5.grid(), 3 ); dowork( uc5.grid(), 3 );
...@@ -85,7 +85,7 @@ int main(int argc, char **argv) ...@@ -85,7 +85,7 @@ int main(int argc, char **argv)
Dune::nonconforming > , 1 > uc6; Dune::nonconforming > , 1 > uc6;
dowork( uc6.grid(), 3 ); dowork( uc6.grid(), 3 );
#endif // #if GRIDDIM == 2 || GRIDDIM == 3 #endif // #if GRIDDIM == 2 || GRIDDIM == 3
#endif // #if HAVE_ALUGRID #endif // #if HAVE_DUNE_ALUGRID
} }
catch (std::exception & e) { catch (std::exception & e) {
std::cout << "ERROR: " << e.what() << std::endl; std::cout << "ERROR: " << e.what() << std::endl;
......
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