From 0a0670a38dd40101c81f46a2477f1df35ba10176 Mon Sep 17 00:00:00 2001 From: Jonathan Youett <youett@math.fu-berlin.de> Date: Thu, 15 May 2014 18:44:13 +0200 Subject: [PATCH] orientedsubface got removed from grid-glue. Include the one from fufem until I manage to remove it's necessarity at all. --- dune/contact/assemblers/dualmortarcoupling.cc | 2 +- dune/contact/assemblers/dualmortarcoupling.hh | 2 +- dune/contact/assemblers/dualmortarcouplinghierarchy.cc | 2 +- dune/contact/common/mortarcontactnonlinearity.hh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dune/contact/assemblers/dualmortarcoupling.cc b/dune/contact/assemblers/dualmortarcoupling.cc index 032dec48..635d6993 100755 --- a/dune/contact/assemblers/dualmortarcoupling.cc +++ b/dune/contact/assemblers/dualmortarcoupling.cc @@ -12,11 +12,11 @@ #include <dune/fufem/boundarypatchprolongator.hh> #include <dune/fufem/staticmatrixtools.hh> +#include <dune/fufem/orientedsubface.hh> #ifdef HAVE_DUNE_GRID_GLUE #include <dune/grid-glue/merging/psurfacemerge.hh> #include <dune/grid-glue/gridglue.hh> -#include <dune/grid-glue/common/orientedsubface.hh> #include <dune/grid-glue/extractors/codim1extractor.hh> //#include <dune/grid-glue/adapter/gridgluevtkwriter.hh> //#include <dune/grid-glue/adapter/gridglueamirawriter.hh> diff --git a/dune/contact/assemblers/dualmortarcoupling.hh b/dune/contact/assemblers/dualmortarcoupling.hh index 2912846b..43994928 100755 --- a/dune/contact/assemblers/dualmortarcoupling.hh +++ b/dune/contact/assemblers/dualmortarcoupling.hh @@ -6,10 +6,10 @@ #include <dune/istl/bvector.hh> #include <dune/common/array.hh> +#include <dune/fufem/orientedsubface.hh> #include <dune/fufem/boundarypatch.hh> #include <dune/grid-glue/merging/merger.hh> -#include <dune/grid-glue/common/orientedsubface.hh> #if HAVE_PSURFACE #include <psurface/DirectionFunction.h> diff --git a/dune/contact/assemblers/dualmortarcouplinghierarchy.cc b/dune/contact/assemblers/dualmortarcouplinghierarchy.cc index 3525cc1c..da42532f 100755 --- a/dune/contact/assemblers/dualmortarcouplinghierarchy.cc +++ b/dune/contact/assemblers/dualmortarcouplinghierarchy.cc @@ -12,13 +12,13 @@ #include <dune/fufem/boundarypatchprolongator.hh> #include <dune/fufem/boundarywriter.hh> +#include <dune/fufem/orientedsubface.hh> #include <dune/contact/solvers/dgtransfer.hh> #ifdef HAVE_DUNE_GRID_GLUE #include <dune/grid-glue/merging/psurfacemerge.hh> #include <dune/grid-glue/gridglue.hh> -#include <dune/grid-glue/common/orientedsubface.hh> #include <dune/grid-glue/extractors/codim1extractor.hh> //#include <dune/grid-glue/adapter/gridgluevtkwriter.hh> //#include <dune/grid-glue/adapter/gridglueamirawriter.hh> diff --git a/dune/contact/common/mortarcontactnonlinearity.hh b/dune/contact/common/mortarcontactnonlinearity.hh index b7cbb1b6..20802523 100644 --- a/dune/contact/common/mortarcontactnonlinearity.hh +++ b/dune/contact/common/mortarcontactnonlinearity.hh @@ -19,11 +19,11 @@ #include <dune/fufem/boundarypatch.hh> #include <dune/fufem/functions/deformationfunction.hh> #include <dune/fufem/arithmetic.hh> +#include <dune/fufem/orientedsubface.hh> #ifdef HAVE_DUNE_GRID_GLUE #include <dune/grid-glue/merging/psurfacemerge.hh> #include <dune/grid-glue/gridglue.hh> -#include <dune/grid-glue/common/orientedsubface.hh> #include <dune/grid-glue/extractors/codim1extractor.hh> #endif -- GitLab