Undo r27234, 27235, 27237. It was a nice idea but it doesn't work.

git-svn-id: https://svn.dealii.org/trunk@27243 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
index 61309fb52d7cd4b79d2f35d2a51131fc772868c9..cefac603cc35b427951e6209697664cd3866093f 100644 (file)
--- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h
+++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
@@ -1477,11 +1477,6 @@ inline
 unsigned int
 DoFAccessor<dim,DH>::n_active_fe_indices () const
 {
-  if (dim == DH::dimension)
-    Assert (this->has_children() == false,
-           ExcMessage ("You can't query information about active FE indices on "
-                       "cells that have children and are therefore not active."));
-
                                    // access the respective DoF
   return
     dealii::internal::DoFAccessor::Implementation::
@@ -1498,11 +1493,6 @@ inline
 unsigned int
 DoFAccessor<dim,DH>::nth_active_fe_index (const unsigned int n) const
 {
-  if (dim == DH::dimension)
-    Assert (this->has_children() == false,
-           ExcMessage ("You can't query information about active FE indices on "
-                       "cells that have children and are therefore not active."));
-
                                    // access the respective DoF
   return
     dealii::internal::DoFAccessor::Implementation::
@@ -1520,11 +1510,6 @@ inline
 bool
 DoFAccessor<dim,DH>::fe_index_is_active (const unsigned int fe_index) const
 {
-  if (dim == DH::dimension)
-    Assert (this->has_children() == false,
-           ExcMessage ("You can't query information about active FE indices on "
-                       "cells that have children and are therefore not active."));
-
                                    // access the respective DoF
   return
     dealii::internal::DoFAccessor::Implementation::
@@ -3314,10 +3299,6 @@ inline
 unsigned int
 DoFCellAccessor<DH>::active_fe_index () const
 {
-  Assert (this->active(),
-         ExcMessage ("You can't query information about active FE indices on "
-                     "cells that have children and are therefore not active."));
-
   return dealii::internal::DoFCellAccessor::Implementation::active_fe_index (*this);
 }
 
@@ -3328,10 +3309,6 @@ inline
 void
 DoFCellAccessor<DH>::set_active_fe_index (const unsigned int i)
 {
-  Assert (this->active(),
-         ExcMessage ("You can't query information about active FE indices on "
-                     "cells that have children and are therefore not active."));
-
   dealii::internal::DoFCellAccessor::Implementation::set_active_fe_index (*this, i);
 }
 

diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc
index 14ec3c49ffe60e57574f1b01bcfa1b540c56d7be..1e162dcfb941618aebc1f5d8ce2ca5f42b61d9bb 100644 (file)
--- a/deal.II/source/hp/dof_handler.cc
+++ b/deal.II/source/hp/dof_handler.cc
@@ -3283,19 +3283,10 @@ template <>
             if (cell->has_children () &&
                 !(*has_children [cell->level ()])[cell->index ()])
               {
-                                                 // Set active_fe_index in
-                                                 // children to the same value
-                                                 // as in the parent
-                                                 // cell. note that we can't
-                                                 // access the active fe index
-                                                 // of an inactive cell any
-                                                 // more via
-                                                 // cell->active_fe_index, so
-                                                 // we have to do it through a
-                                                 // more indirect way
+                                                 // Set active_fe_index in children to the
+                                                 // same value as in the parent cell.
                 for (unsigned int i = 0; i < cell->n_children(); ++i)
-                  cell->child (i)->set_active_fe_index (levels[cell->level()]
-                                                       ->active_fe_indices[cell->index()]);
+                  cell->child (i)->set_active_fe_index (cell->active_fe_index ());
               }
           }
       }