]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
There was an error in the constructor for a parallel Epetra_FECrsMatrix that did...
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Sep 2008 17:53:10 +0000 (17:53 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Sep 2008 17:53:10 +0000 (17:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@16840 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 3d0c4cb17e6862954327bce757bf5da982d92ad1..7f2513239efd6e988e00b01be21bb9225fd3126a 100755 (executable)
@@ -112,7 +112,7 @@ namespace TrilinosWrappers
                  matrix (std::auto_ptr<Epetra_FECrsMatrix>
                    (new Epetra_FECrsMatrix(Copy, row_map, 
                      (int*)const_cast<unsigned int*>(&(n_entries_per_row[0])),
-                                           true)))
+                                           false)))
   {}
 
   SparseMatrix::SparseMatrix (const Epetra_Map  &InputRowMap,
@@ -139,7 +139,7 @@ namespace TrilinosWrappers
                  matrix (std::auto_ptr<Epetra_FECrsMatrix>
                    (new Epetra_FECrsMatrix(Copy, row_map, col_map, 
                      (int*)const_cast<unsigned int*>(&(n_entries_per_row[0])),
-                                           true)))
+                                           false)))
   {}
 
 
@@ -263,7 +263,7 @@ namespace TrilinosWrappers
                                  // correct values.
     matrix = std::auto_ptr<Epetra_FECrsMatrix>
                (new Epetra_FECrsMatrix(Copy, row_map,
-                                       &n_entries_per_row[0], true));
+                                       &n_entries_per_row[0], false));
 
     reinit (sparsity_pattern);
   }
@@ -334,7 +334,7 @@ namespace TrilinosWrappers
                                  // correct values.
     matrix = std::auto_ptr<Epetra_FECrsMatrix>
                (new Epetra_FECrsMatrix(Copy, row_map,
-                                       &n_entries_per_row[0], true));
+                                       &n_entries_per_row[0], false));
 
     std::vector<double> values;
     std::vector<int> row_indices;
index 29d2302c94f61bb7cafc6f6d824954bbeb871dcc..1eebe8e5a9d7beb31fb3b5a1d72a93786bc6849c 100755 (executable)
@@ -129,9 +129,8 @@ namespace TrilinosWrappers
                                        // create an object for the data
                                        // exchange and then insert all
                                        // the data. The first assertion
-                                       // is basically there to check
-                                       // whether the user knows what
-                                       // she is doing.
+                                       // is only a check whether the
+                                       // user knows what she is doing.
       else
         {
          Assert (fast == false,
@@ -146,6 +145,8 @@ namespace TrilinosWrappers
 
          const int ierr = vector->Import(*v.vector, data_exchange, Insert);
          AssertThrow (ierr == 0, ExcTrilinosError(ierr));
+
+         last_action = Insert;
        }
 
     }
@@ -179,6 +180,8 @@ namespace TrilinosWrappers
 
       AssertThrow (ierr == 0, ExcTrilinosError(ierr));
 
+      last_action = Insert;
+
       return *this;
     }
 
@@ -353,6 +356,8 @@ namespace TrilinosWrappers
 
        const int ierr = vector->Import(*v.vector, data_exchange, Insert);
        AssertThrow (ierr == 0, ExcTrilinosError(ierr));
+
+       last_action = Insert;
       }
 
   }
index dda97c4bca6e287d1f73cf590c80d276a8113d58..6f2fd67d23f89a507a4445f4115a87fcc92eb7a6 100644 (file)
@@ -617,6 +617,8 @@ namespace TrilinosWrappers
 
        int ierr = vector->Import(*v.vector, data_exchange, Add);
        AssertThrow (ierr == 0, ExcTrilinosError(ierr));
+
+       last_action = Insert;
       }
   }
 

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.