From 88f257235ab6942600dfe31203c3925c1903095a Mon Sep 17 00:00:00 2001 From: young Date: Tue, 22 Oct 2013 22:33:52 +0000 Subject: [PATCH] Notes. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@31394 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/numerics/vector_tools.templates.h | 2 +- deal.II/source/fe/fe_tools_interpolate.cc | 7 ++++--- deal.II/source/grid/grid_refinement.cc | 4 ++-- deal.II/source/numerics/matrix_tools.cc | 1 - deal.II/source/numerics/point_value_history.cc | 6 ++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h index 640e7d6476..fbd443823b 100644 --- a/deal.II/include/deal.II/numerics/vector_tools.templates.h +++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h @@ -303,7 +303,7 @@ namespace VectorTools for (; h != endh; ++h, ++l) { // @whattodo Some of the problems in petsc_vector_base.h are instantiated here. - /* h->get_dof_values(data_1, cell_data_1); // <- complaint line 655 */ + /* h->get_dof_values(data_1, cell_data_1); // <- complaint line 655 */ Assert ((false), ExcMessage ("This function is corrupt: @whattodo")); transfer.vmult(cell_data_2, cell_data_1); diff --git a/deal.II/source/fe/fe_tools_interpolate.cc b/deal.II/source/fe/fe_tools_interpolate.cc index 405a8682a2..ce4ea5f3c8 100644 --- a/deal.II/source/fe/fe_tools_interpolate.cc +++ b/deal.II/source/fe/fe_tools_interpolate.cc @@ -211,7 +211,7 @@ namespace FETools // if we work on parallel distributed // vectors, we have to ensure, that we only // work on dofs this processor owns. - IndexSet locally_owned_dofs = dof2.locally_owned_dofs(); + IndexSet locally_owned_dofs = dof2.locally_owned_dofs(); // when a discontinuous element is // interpolated to a continuous @@ -222,14 +222,15 @@ namespace FETools for (types::global_dof_index i=0; i // to check vector_name is in the map. typename std::map > >::iterator data_store_field = data_store.find(vector_name); Assert (data_store_field != data_store.end(), ExcMessage("vector_name not in class")); + // Repeat for component_mask typename std::map ::iterator mask = component_mask.find(vector_name); Assert (mask != component_mask.end(), ExcMessage("vector_name not in class")); @@ -603,10 +604,11 @@ void PointValueHistory if (mask->second[comp]) { unsigned int solution_index = point->solution_indices[comp]; - //@whattodo + //@whattodo data_store_field shoud be typename VECTOR::value_type, but that cuase problems elsewhere... (void) solution_index; // stop g++ complaining: eventually remove this (void) n_stored; // stop g++ complaining: eventually remove this - // data_store_field->second[data_store_index * n_stored + store_index].push_back (solution (solution_index)); + + // data_store_field->second[data_store_index * n_stored + store_index].push_back (solution (solution_index)); Assert ((false), ExcMessage ("This function is corrupt: @whattodo")); store_index++; -- 2.39.5