Move linelast.cc into the 'src' directory

This is where such files should reside nowadays.

CMakeLists.txt

@@ -16,7 +16,7 @@ add_subdirectory("dune")
 add_subdirectory("src")
 
 if(HAVE_AMIRAMESH AND HAVE_IPOPT AND HAVE_PSURFACE AND HAVE_UG)
-  set(programs linelast viscoelast nonlinelast)
+  set(programs viscoelast nonlinelast)
   foreach(_program ${programs})
     add_executable(${_program} ${_program}.cc)
     add_dune_amiramesh_flags(${_program})

src/CMakeLists.txt

 if(ADOLC_FOUND AND IPOPT_FOUND AND PYTHONLIBS_FOUND AND dune-uggrid_FOUND)
-  set(programs finite-strain-elasticity)
+  set(programs finite-strain-elasticity
+               linear-elasticity)
+
   foreach(_program ${programs})
     add_executable(${_program} ${_program}.cc)
     add_dune_adolc_flags(${_program})

linelast.cc → src/linear-elasticity.cc

@@ -89,24 +89,36 @@ int main (int argc, char *argv[]) try
     GridType* grid= new GridType;
     grid->setRefinementType(GridType::COPY);
 
+#if HAVE_AMIRAMESH
     if (paramBoundaries)
         grid = AmiraMeshReader<GridType>::read(path + gridFile, PSurfaceBoundary<dim-1>::read(path + parFile));
     else
         grid = AmiraMeshReader<GridType>::read(path + gridFile);
+#else
+#warning You need libamiramesh for this code!
+#endif
 
     LevelBoundaryPatch coarseDirichletBoundary;
     coarseDirichletBoundary.setup(grid->levelGridView(0));
     readBoundaryPatch<GridType>(coarseDirichletBoundary, path + dirichletFile);
 
     VectorType coarseDirichletValues(grid->size(0, dim));
+#if HAVE_AMIRAMESH
     AmiraMeshReader<GridType>::readFunction(coarseDirichletValues, path + dirichletValuesFile);
+#else
+#warning You need libamiramesh for this code!
+#endif
 
     LevelBoundaryPatch coarseNeumannBoundary;
     coarseNeumannBoundary.setup(grid->levelGridView(0));
     readBoundaryPatch<GridType>(coarseNeumannBoundary, path + neumannFile);
 
     VectorType coarseNeumannValues(grid->size(0, dim));
+#if HAVE_AMIRAMESH
     AmiraMeshReader<GridType>::readFunction(coarseNeumannValues, path + neumannValuesFile);
+#else
+#warning You need libamiramesh for this code!
+#endif
     P1NodalBasis<GridType::LevelGridView> coarseBasis(grid->levelGridView(0));
 
     auto coarseDir = ::Functions::makeFunction(coarseBasis,coarseDirichletValues);
@@ -284,10 +296,14 @@ int main (int argc, char *argv[]) try
     }
 
   // Output result
+#if HAVE_AMIRAMESH
   LeafAmiraMeshWriter<GridType> amiramesh;
   amiramesh.addLeafGrid(*grid,true);
   amiramesh.addVertexData(x, grid->leafGridView(),true);
   amiramesh.write("resultGrid",1);
+#else
+#warning You need libamiramesh for this code!
+#endif
 
  } catch (Exception e) {