Disallow calling certain functions that have to do with active_fe_index on cells...

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

diff --git a/tests/hp/get_interpolated_dof_values_01.cc b/tests/hp/get_interpolated_dof_values_01.cc
index 4eb4a8673a50353dfe3e129280f2d3f2cfd7ec77..3e1d9cdd700faaed99c52b425feb6cdff2e63a65 100644 (file)
--- a/tests/hp/get_interpolated_dof_values_01.cc
+++ b/tests/hp/get_interpolated_dof_values_01.cc
@@ -69,9 +69,21 @@ void test ()
 
   // try to interpolate from the active cell onto the coarsest cell,
   // which is definitely not active. this can't work, so expect an
-  // exception
+  // exception for both the call to cell->get_fe() and the call to
+  // cell->get_interpolated_dof_values
   typename hp::DoFHandler<dim>::cell_iterator cell=dof_handler.begin(0);
-  Vector<double> local (cell->get_fe().dofs_per_cell);
+
+  unsigned int dofs_per_cell = 4;
+  try
+    {
+      dofs_per_cell = cell->get_fe().dofs_per_cell;
+    }
+  catch (const ExceptionBase &e)
+    {
+      deallog << "Yes, exception 1!" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
+    }
+  Vector<double> local (dofs_per_cell);
 
   try
     {
@@ -79,7 +91,7 @@ void test ()
     }
   catch (const ExceptionBase &e)
     {
-      deallog << "Yes, exception!" << std::endl;
+      deallog << "Yes, exception 2!" << std::endl;
       deallog << e.get_exc_name() << std::endl;
     }
 }

diff --git a/tests/hp/get_interpolated_dof_values_01.debug.output b/tests/hp/get_interpolated_dof_values_01.debug.output
index ba7953b18d8d3a9ee17a31ddf3f4bb8eb6bc78ae..41ebc1842eec30d711b7f5ac0f0356f7678770e6 100644 (file)
--- a/tests/hp/get_interpolated_dof_values_01.debug.output
+++ b/tests/hp/get_interpolated_dof_values_01.debug.output
@@ -1,7 +1,13 @@
 
-DEAL::Yes, exception!
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
+DEAL::Yes, exception 2!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")
-DEAL::Yes, exception!
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
+DEAL::Yes, exception 2!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")
-DEAL::Yes, exception!
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
+DEAL::Yes, exception 2!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")

diff --git a/tests/hp/set_dof_values_by_interpolation_01.cc b/tests/hp/set_dof_values_by_interpolation_01.cc
index 676afac53f227345260d3f5ed9f1dd03e32a22b0..0fa4497cca9dcf1bc187b95d32f8164fd6fc72f1 100644 (file)
--- a/tests/hp/set_dof_values_by_interpolation_01.cc
+++ b/tests/hp/set_dof_values_by_interpolation_01.cc
@@ -69,13 +69,25 @@ void test ()
 
   // try to interpolate from the active cell onto the coarsest cell,
   // which is definitely not active. this can't work, so expect an
-  // exception
+  // exception for both the call to cell->get_fe() and the call to
+  // cell->get_interpolated_dof_values
   typename hp::DoFHandler<dim>::cell_iterator cell=dof_handler.begin(0);
-  Vector<double> local (cell->get_fe().dofs_per_cell);
 
+  unsigned int dofs_per_cell = 4;
   try
     {
-      cell->get_interpolated_dof_values (solution, local);
+      dofs_per_cell = cell->get_fe().dofs_per_cell;
+    }
+  catch (const ExceptionBase &e)
+    {
+      deallog << "Yes, exception 1!" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
+    }
+  Vector<double> local (dofs_per_cell);
+
+  try
+    {
+      cell->set_dof_values_by_interpolation (local, solution);
     }
   catch (const ExceptionBase &e)
     {

diff --git a/tests/hp/set_dof_values_by_interpolation_01.debug.output b/tests/hp/set_dof_values_by_interpolation_01.debug.output
index ba7953b18d8d3a9ee17a31ddf3f4bb8eb6bc78ae..57dc42ca7827f4125e4d2bedf6b976d90d337c96 100644 (file)
--- a/tests/hp/set_dof_values_by_interpolation_01.debug.output
+++ b/tests/hp/set_dof_values_by_interpolation_01.debug.output
@@ -1,7 +1,13 @@
 
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
 DEAL::Yes, exception!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
 DEAL::Yes, exception!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")
+DEAL::Yes, exception 1!
+DEAL::ExcMessage ("In hp::DoFHandler objects, finite elements are only associated " "with active cells. Consequently, you can not ask for the " "active finite element on cells with children.")
 DEAL::Yes, exception!
 DEAL::ExcMessage ("You cannot call this function on non-active cells " "of hp::DoFHandler objects unless you provide an explicit " "finite element index because they do not have naturally " "associated finite element spaces associated: degrees " "of freedom are only distributed on active cells for which " "the active_fe_index has been set.")