Commit 007d1f8c authored by lisa_julia.nebel_at_tu-dresden.de's avatar lisa_julia.nebel_at_tu-dresden.de
Browse files

Only include amiramesh in linear-elasticity for dune-common <= 2.7

All versions including and after dune-common-2.8 do not support amiramesh anymore
parent 6caee983
Pipeline #48492 passed with stage
in 15 minutes and 31 seconds
#include <config.h>
#include <dune/common/version.hh>
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
#include <dune/grid/uggrid.hh>
#if HAVE_AMIRAMESH && DUNE_VERSION_LT(DUNE_COMMON, 2, 8)
#include <dune/grid/io/file/amirameshreader.hh>
#endif
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
......@@ -93,7 +96,7 @@ int main (int argc, char *argv[]) try
using GridView = GridType::LeafGridView;
grid->setRefinementType(GridType::COPY);
#if HAVE_AMIRAMESH
#if HAVE_AMIRAMESH && DUNE_VERSION_LT(DUNE_COMMON, 2, 8)
if (paramBoundaries)
grid = AmiraMeshReader<GridType>::read(path + gridFile, PSurfaceBoundary<dim-1>::read(path + parFile));
else
......@@ -107,7 +110,7 @@ int main (int argc, char *argv[]) try
readBoundaryPatch<GridType>(coarseDirichletBoundary, path + dirichletFile);
VectorType coarseDirichletValues(grid->size(0, dim));
#if HAVE_AMIRAMESH
#if HAVE_AMIRAMESH && DUNE_VERSION_LT(DUNE_COMMON, 2, 8)
AmiraMeshReader<GridType>::readFunction(coarseDirichletValues, path + dirichletValuesFile);
#else
#warning You need libamiramesh for this code!
......@@ -118,7 +121,7 @@ int main (int argc, char *argv[]) try
readBoundaryPatch<GridType>(coarseNeumannBoundary, path + neumannFile);
VectorType coarseNeumannValues(grid->size(0, dim));
#if HAVE_AMIRAMESH
#if HAVE_AMIRAMESH && DUNE_VERSION_LT(DUNE_COMMON, 2, 8)
AmiraMeshReader<GridType>::readFunction(coarseNeumannValues, path + neumannValuesFile);
#else
#warning You need libamiramesh for this code!
......
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