]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Corrected an error.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Sep 2008 15:11:34 +0000 (15:11 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Sep 2008 15:11:34 +0000 (15:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@16765 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/trilinos_sparse_matrix.cc
deal.II/lac/source/trilinos_vector.cc

index d224a273641c1b5a6d11c248fe549ce68bf81294..09dadcdb54c12c097742c829afb937b2395f048a 100755 (executable)
@@ -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));
index 4d7ae7d37f1d202b30024563b333ef15cceeab92..547d2bd5d257e45a89c2137e4b77e98298e83673 100755 (executable)
@@ -38,7 +38,7 @@ namespace TrilinosWrappers
       AssertThrow ((static_cast<signed int>(index) >= vector.map->MinMyGID()) &&
                   (static_cast<signed int>(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 )
       {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.