From 21a94c03402740b2b326a37d56c8383737b6ab46 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 10 Aug 1999 15:00:03 +0000 Subject: [PATCH] Fix some small problems. git-svn-id: https://svn.dealii.org/trunk@1661 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/mg_dof_accessor.cc | 10 +++++----- deal.II/deal.II/source/multigrid/mg_dof_accessor.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deal.II/deal.II/source/dofs/mg_dof_accessor.cc b/deal.II/deal.II/source/dofs/mg_dof_accessor.cc index 5b00e6f657..fe308761e7 100644 --- a/deal.II/deal.II/source/dofs/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/mg_dof_accessor.cc @@ -309,7 +309,7 @@ MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (Triangulation *tria, const int index, const AccessorData *local_data) : MGDoFAccessor (local_data), - MGDoFObjectAccessor_Inheritance<2,dim>::BaseClass(tria,level,index,local_data) {}; + MGDoFObjectAccessor_Inheritance<3,dim>::BaseClass(tria,level,index,local_data) {}; @@ -391,7 +391,7 @@ MGDoFObjectAccessor<3, dim>::get_mg_dof_indices (vector &dof_indices) const 12*dof_handler->get_fe().dofs_per_line + 6*dof_handler->get_fe().dofs_per_quad + dof_handler->get_fe().dofs_per_hex), - ExcVectorDoesNotMatch()); + DoFAccessor<3>::ExcVectorDoesNotMatch()); const unsigned int dofs_per_vertex = dof_handler->get_fe().dofs_per_vertex, dofs_per_line = dof_handler->get_fe().dofs_per_line, @@ -525,9 +525,9 @@ template <> void MGDoFCellAccessor<1>::get_mg_dof_values (const Vector &values, Vector &dof_values) const { - Assert (dof_handler != 0, ExcInvalidObject()); - Assert (mg_dof_handler != 0, ExcInvalidObject()); - Assert (&dof_handler->get_fe() != 0, ExcInvalidObject()); + Assert (dof_handler != 0, DoFAccessor<1>::ExcInvalidObject()); + Assert (mg_dof_handler != 0, DoFAccessor<1>::ExcInvalidObject()); + Assert (&dof_handler->get_fe() != 0, DoFAccessor<1>::ExcInvalidObject()); Assert (dof_values.size() == dof_handler->get_fe().total_dofs, ExcVectorDoesNotMatch()); Assert (values.size() == dof_handler->n_dofs(), diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index 5b00e6f657..fe308761e7 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -309,7 +309,7 @@ MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (Triangulation *tria, const int index, const AccessorData *local_data) : MGDoFAccessor (local_data), - MGDoFObjectAccessor_Inheritance<2,dim>::BaseClass(tria,level,index,local_data) {}; + MGDoFObjectAccessor_Inheritance<3,dim>::BaseClass(tria,level,index,local_data) {}; @@ -391,7 +391,7 @@ MGDoFObjectAccessor<3, dim>::get_mg_dof_indices (vector &dof_indices) const 12*dof_handler->get_fe().dofs_per_line + 6*dof_handler->get_fe().dofs_per_quad + dof_handler->get_fe().dofs_per_hex), - ExcVectorDoesNotMatch()); + DoFAccessor<3>::ExcVectorDoesNotMatch()); const unsigned int dofs_per_vertex = dof_handler->get_fe().dofs_per_vertex, dofs_per_line = dof_handler->get_fe().dofs_per_line, @@ -525,9 +525,9 @@ template <> void MGDoFCellAccessor<1>::get_mg_dof_values (const Vector &values, Vector &dof_values) const { - Assert (dof_handler != 0, ExcInvalidObject()); - Assert (mg_dof_handler != 0, ExcInvalidObject()); - Assert (&dof_handler->get_fe() != 0, ExcInvalidObject()); + Assert (dof_handler != 0, DoFAccessor<1>::ExcInvalidObject()); + Assert (mg_dof_handler != 0, DoFAccessor<1>::ExcInvalidObject()); + Assert (&dof_handler->get_fe() != 0, DoFAccessor<1>::ExcInvalidObject()); Assert (dof_values.size() == dof_handler->get_fe().total_dofs, ExcVectorDoesNotMatch()); Assert (values.size() == dof_handler->n_dofs(), -- 2.39.5