]> https://gitweb.dealii.org/ - dealii.git/commitdiff
guard implementation by check for p4est
authorDaniel Arndt <d.arndt@math.uni-goettingen.de>
Fri, 2 Sep 2016 21:35:21 +0000 (23:35 +0200)
committerDaniel Arndt <d.arndt@math.uni-goettingen.de>
Mon, 3 Oct 2016 16:20:58 +0000 (18:20 +0200)
include/deal.II/fe/fe_tools.h
source/fe/fe_tools_interpolate.cc
source/fe/fe_tools_interpolate.inst.in

index 274d2daf51f3bd4ff2a62aa3405fa1dc357aa375..22ea3ce8182012b9569fb14bd6a77520ca451bc7 100644 (file)
@@ -783,6 +783,7 @@ namespace FETools
                     const ConstraintMatrix         &constraints,
                     OutVector                      &z2);
 
+#ifdef DEAL_II_WITH_P4EST
   /*
    * Same as above for external parallel VectorTypes
    * on a parallel::distributed::Triangulation
@@ -804,6 +805,7 @@ namespace FETools
                             const DoFHandler<dim,spacedim> &dof2,
                             const ConstraintMatrix &constraints2,
                             LinearAlgebra::distributed::Vector<Number> &u2);
+#endif //DEAL_II_WITH_P4EST
 
   //@}
   /**
index f50176fdd9876b4ab94f5b691ad7c92328fb923e..bdde01876e7bb42a8ca3f93db52730e356fe19ab 100644 (file)
@@ -720,9 +720,9 @@ namespace FETools
   }
 
 
-
   namespace internal
   {
+#ifdef DEAL_II_WITH_P4EST
     /**
      * Implementation of the @p extrapolate function
      * on parallel distributed grids.
@@ -2075,8 +2075,7 @@ namespace FETools
 
       u2.compress(VectorOperation::insert);
     }
-
-
+#endif //DEAL_II_WITH_P4EST
 
     namespace
     {
@@ -2126,6 +2125,7 @@ namespace FETools
 
 
 
+#ifdef DEAL_II_WITH_P4EST
       template <int dim, class InVector, class OutVector, int spacedim>
       void extrapolate_parallel(const InVector &u2_relevant,
                                 const DoFHandler<dim,spacedim> &dof2,
@@ -2141,11 +2141,10 @@ namespace FETools
             extrapolate_serial (u2_relevant, dof2, u2);
           }
       }
+#endif //DEAL_II_WITH_P4EST
     }
   }
 
-
-
   template <int dim, class InVector, class OutVector, int spacedim>
   void extrapolate(const DoFHandler<dim,spacedim> &dof1,
                    const InVector &u1,
@@ -2194,7 +2193,7 @@ namespace FETools
   }
 
 
-
+#ifdef DEAL_II_WITH_P4EST
   template <int dim, class VectorType, int spacedim>
   void extrapolate_parallel(const DoFHandler<dim,spacedim> &dof1,
                             const VectorType &u1,
@@ -2243,7 +2242,7 @@ namespace FETools
 
     constraints2.distribute(u2);
   }
-
+#endif //DEAL_II_WITH_P4EST
 
 } // end of namespace FETools
 
index 58933f1833c56e38bf19f2bc1bd1ea096fdccb41..24fcd7dd1381966d3a2efd57763c4e5c63f46f3d 100644 (file)
@@ -114,6 +114,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 
 for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
 {
+#ifdef DEAL_II_WITH_P4EST
     namespace FETools
     \{
 #if deal_II_dimension == deal_II_space_dimension
@@ -140,10 +141,12 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 
 #endif
     \}
+#endif //DEAL_II_WITH_P4EST
 }
 
 for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS; scalar : REAL_SCALARS)
 {
+#ifdef DEAL_II_WITH_P4EST
     namespace FETools
     \{
 #if deal_II_dimension == deal_II_space_dimension
@@ -156,4 +159,5 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
      LinearAlgebra::distributed::Vector<scalar> &);
 #endif
     \}
+#endif //DEAL_II_WITH_P4EST
 }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.