From 7fb66ca602502915177b3e21961633ffbf420584 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Mon, 8 Sep 2008 15:11:34 +0000 Subject: [PATCH] Corrected an error. git-svn-id: https://svn.dealii.org/trunk@16765 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/source/trilinos_sparse_matrix.cc | 12 ++++++------ deal.II/lac/source/trilinos_vector.cc | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/lac/source/trilinos_sparse_matrix.cc b/deal.II/lac/source/trilinos_sparse_matrix.cc index d224a27364..09dadcdb54 100755 --- a/deal.II/lac/source/trilinos_sparse_matrix.cc +++ b/deal.II/lac/source/trilinos_sparse_matrix.cc @@ -249,9 +249,9 @@ namespace TrilinosWrappers // is initialized with both row and // column map. Maybe find something // more out about this... - //reinit (input_map, input_map, sparsity_pattern); + reinit (input_map, input_map, sparsity_pattern); - matrix.reset(); + /* matrix.reset(); unsigned int n_rows = sparsity_pattern.n_rows(); @@ -277,7 +277,7 @@ namespace TrilinosWrappers (new Epetra_FECrsMatrix(Copy, *row_map, &n_entries_per_row[0], false)); - reinit (sparsity_pattern); + reinit (sparsity_pattern);*/ } @@ -420,9 +420,9 @@ namespace TrilinosWrappers { // flush buffers int ierr; - if (row_map->SameAs(*col_map)) - ierr = matrix->GlobalAssemble (); - else + //if (row_map->SameAs(*col_map)) + //ierr = matrix->GlobalAssemble (); + //else ierr = matrix->GlobalAssemble (*col_map, *row_map); AssertThrow (ierr == 0, ExcTrilinosError(ierr)); diff --git a/deal.II/lac/source/trilinos_vector.cc b/deal.II/lac/source/trilinos_vector.cc index 4d7ae7d37f..547d2bd5d2 100755 --- a/deal.II/lac/source/trilinos_vector.cc +++ b/deal.II/lac/source/trilinos_vector.cc @@ -38,7 +38,7 @@ namespace TrilinosWrappers AssertThrow ((static_cast(index) >= vector.map->MinMyGID()) && (static_cast(index) <= vector.map->MaxMyGID()), ExcAccessToNonLocalElement (index, vector.map->MinMyGID(), - vector.map->MaxMyGID()-1)); + vector.map->MaxMyGID())); return (*(vector.vector))[0][index]; } @@ -226,7 +226,7 @@ namespace TrilinosWrappers { // Extract local indices in // the vector. - int trilinos_i = map->LID(index); + int trilinos_i = vector->Map().LID(index); TrilinosScalar value = 0.; if (trilinos_i == -1 ) { -- 2.39.5