From 0101f0358a666efd050a3f66e6a2738157a1c325 Mon Sep 17 00:00:00 2001 From: wolf Date: Sun, 4 Apr 2004 23:32:02 +0000 Subject: [PATCH] Don't try to work on parallel vectors and matrices. git-svn-id: https://svn.dealii.org/trunk@8964 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/matrices.h | 10 +++++----- deal.II/deal.II/source/grid/grid_refinement.cc | 14 +++++++------- .../source/numerics/matrices.all_dimensions.cc | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index 5554f33e2a..978fa0baa1 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -39,8 +39,8 @@ template class FEValues; #ifdef DEAL_II_USE_PETSC namespace PETScWrappers { - class MatrixBase; - class VectorBase; + class SparseMatrix; + class Vector; } #endif @@ -779,9 +779,9 @@ class MatrixTools : public MatrixCreator #ifdef DEAL_II_USE_PETSC static void apply_boundary_values (const std::map &boundary_values, - PETScWrappers::MatrixBase &matrix, - PETScWrappers::VectorBase &solution, - PETScWrappers::VectorBase &right_hand_side, + PETScWrappers::SparseMatrix &matrix, + PETScWrappers::Vector &solution, + PETScWrappers::Vector &right_hand_side, const bool eliminate_columns = true); #endif diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index 3056bc1fee..ea6c0021f3 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -50,7 +50,7 @@ namespace #ifdef DEAL_II_USE_PETSC PetscScalar - max_element (const PETScWrappers::VectorBase &criteria) + max_element (const PETScWrappers::Vector &criteria) { // this is horribly slow (since we have // to get the array of values from PETSc @@ -63,7 +63,7 @@ namespace PetscScalar - min_element (const PETScWrappers::VectorBase &criteria) + min_element (const PETScWrappers::Vector &criteria) { // this is horribly slow (since we have // to get the array of values from PETSc @@ -432,14 +432,14 @@ template void GridRefinement:: refine (Triangulation &, - const PETScWrappers::VectorBase &, + const PETScWrappers::Vector &, const double); template void GridRefinement:: coarsen (Triangulation &, - const PETScWrappers::VectorBase &, + const PETScWrappers::Vector &, const double); @@ -447,7 +447,7 @@ template void GridRefinement:: refine_and_coarsen_fixed_number (Triangulation &, - const PETScWrappers::VectorBase &, + const PETScWrappers::Vector &, const double, const double); @@ -455,7 +455,7 @@ template void GridRefinement:: refine_and_coarsen_fixed_fraction (Triangulation &, - const PETScWrappers::VectorBase &, + const PETScWrappers::Vector &, const double, const double); @@ -463,5 +463,5 @@ template void GridRefinement:: refine_and_coarsen_optimize (Triangulation &, - const PETScWrappers::VectorBase &); + const PETScWrappers::Vector &); #endif diff --git a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc index 3301c70663..01f141fadf 100644 --- a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc +++ b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc @@ -20,8 +20,8 @@ #include #ifdef DEAL_II_USE_PETSC -# include -# include +# include +# include #endif #include @@ -519,9 +519,9 @@ MatrixTools::apply_boundary_values (const std::map &boundar void MatrixTools:: apply_boundary_values (const std::map &boundary_values, - PETScWrappers::MatrixBase &matrix, - PETScWrappers::VectorBase &solution, - PETScWrappers::VectorBase &right_hand_side, + PETScWrappers::SparseMatrix &matrix, + PETScWrappers::Vector &solution, + PETScWrappers::Vector &right_hand_side, const bool preserve_symmetry) { Assert (matrix.n() == right_hand_side.size(), -- 2.39.5