]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
more compilation fixes.
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 23 Oct 2010 19:07:29 +0000 (19:07 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 23 Oct 2010 19:07:29 +0000 (19:07 +0000)
git-svn-id: https://svn.dealii.org/trunk@22441 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/numerics/error_estimator.cc

index fac5c18221792505be51f1c54a0eb563af676709..bb75944abccaa326acc7f1edafdeb85d12bf0633 100644 (file)
@@ -1176,6 +1176,7 @@ estimate (const Mapping<1,spacedim>                    &mapping,
           const types::subdomain_id_t         subdomain_id_,
           const unsigned int                  material_id)
 {
+#ifdef DEAL_II_USE_P4EST
   if (dynamic_cast<const parallel::distributed::Triangulation<1,spacedim>*>
       (&dof_handler.get_tria())
       != 0)
@@ -1197,7 +1198,10 @@ estimate (const Mapping<1,spacedim>                    &mapping,
        (dof_handler.get_tria()).locally_owned_subdomain()
        :
        subdomain_id_);
-
+#else
+  const types::subdomain_id_t subdomain_id
+    = subdomain_id_;
+#endif
 
   const unsigned int n_components       = dof_handler.get_fe().n_components();
   const unsigned int n_solution_vectors = solutions.size();
@@ -1537,6 +1541,7 @@ estimate (const Mapping<dim, spacedim>                  &mapping,
           const types::subdomain_id_t          subdomain_id_,
           const unsigned int                   material_id)
 {
+#ifdef DEAL_II_USE_P4EST
   if (dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>
       (&dof_handler.get_tria())
       != 0)
@@ -1558,7 +1563,10 @@ estimate (const Mapping<dim, spacedim>                  &mapping,
        (dof_handler.get_tria()).locally_owned_subdomain()
        :
        subdomain_id_);
-
+#else
+  const types::subdomain_id_t subdomain_id
+    = subdomain_id_;
+#endif
 
   const unsigned int n_components = dof_handler.get_fe().n_components();
 

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.