]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed an error that was caused by a different constructor in the new Trilinos 9.0...
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 27 Sep 2008 11:07:24 +0000 (11:07 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 27 Sep 2008 11:07:24 +0000 (11:07 +0000)
git-svn-id: https://svn.dealii.org/trunk@17017 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/trilinos_precondition.h
deal.II/lac/include/lac/trilinos_precondition_amg.h
deal.II/lac/source/trilinos_sparse_matrix.cc
deal.II/lac/source/trilinos_vector.cc

index dafff8725bbd45b1a5f6bf36bd5b41571eacc7ce..ac8def9bcafeef49e93883427c0f24e4be247506 100755 (executable)
@@ -80,12 +80,13 @@ namespace TrilinosWrappers
                                        */
       DeclException1 (ExcNonMatchingMaps,
                      std::string,
-                     << "The sparse matrix that the preconditioner is based "
-                     << "on a map that is not compatible to the one in vector "
+                     << "The sparse matrix the preconditioner is based on "
+                     << "uses a map that is not compatible to the one in vector "
                      << arg1
                      << ". Check preconditioner and matrix setup.");
 
       friend class SolverBase;
+      friend class SolverSaddlePoint;
 
     protected:
                                       /**
index 936d80da302d8b3fafd46b5a31d700d16552d6e1..c361615ba1b70f111bee3e6240a6746ac8cfd58e 100755 (executable)
@@ -178,8 +178,8 @@ namespace TrilinosWrappers
                                        */
       DeclException1 (ExcNonMatchingMaps,
                      std::string,
-                     << "The sparse matrix that the preconditioner is based "
-                     << "on a map that is not compatible to the one in vector"
+                     << "The sparse matrix the preconditioner is based on "
+                     << "uses a map that is not compatible to the one in vector"
                      << arg1
                      << ". Check preconditioner and matrix setup.");
 
@@ -218,6 +218,7 @@ namespace TrilinosWrappers
       boost::shared_ptr<SparseMatrix> Matrix;
 
       friend class SolverBase;
+      friend class SolverSaddlePoint;
   };
 }
 
index d77c84b2fb247f7f8c4938c656b5f2d0639e212e..0f8a43f187576179efebaad3219b5a4c609e7446 100755 (executable)
@@ -87,7 +87,7 @@ namespace TrilinosWrappers
                  last_action (Zero),
                  compressed (true),
                  matrix (std::auto_ptr<Epetra_FECrsMatrix>
-                               (new Epetra_FECrsMatrix(Copy, row_map, 0)))
+                               (new Epetra_FECrsMatrix(View, row_map, 0)))
   {}
 
   SparseMatrix::SparseMatrix (const Epetra_Map  &InputMap,
@@ -394,7 +394,8 @@ namespace TrilinosWrappers
     col_map = row_map;
 
     matrix = std::auto_ptr<Epetra_FECrsMatrix> 
-             (new Epetra_FECrsMatrix(Copy, row_map, 0));
+             (new Epetra_FECrsMatrix(View, row_map, 0));
+
     compressed = true;
   }
 
index c6ef3310cf97e7b846d59707983a021ef0e6994f..3501c8818154f14166f61f5a727d9510128ac33a 100755 (executable)
@@ -38,7 +38,7 @@ namespace TrilinosWrappers
 #endif
     {
       last_action = Zero;
-      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
     }
 
 
@@ -48,7 +48,7 @@ namespace TrilinosWrappers
                    map (InputMap)
     {
       last_action = Zero;
-      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
     }
   
 
@@ -80,7 +80,7 @@ namespace TrilinosWrappers
        vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(*v.vector));
       else
        {
-         vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map, false));
+         vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
          reinit (v, false, true);
        }
 
@@ -96,7 +96,7 @@ namespace TrilinosWrappers
       map = input_map;
       (void)fast;
       
-      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
       last_action = Zero;
     }
 
@@ -120,7 +120,7 @@ namespace TrilinosWrappers
          if (map.SameAs(v.vector->Map()) == false)
            map = Epetra_Map(v.vector->GlobalLength(),0,v.vector->Comm());
 
-         vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+         vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
          last_action = Zero;
        }
 
@@ -195,7 +195,7 @@ namespace TrilinosWrappers
       Assert (size() == v.size(),
              ExcDimensionMismatch(size(), v.size()));
 
-      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map, false));
+      vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
       
       const int min_my_id = map.MinMyGID();
       const unsigned int size = map.NumMyElements();
@@ -229,8 +229,7 @@ namespace TrilinosWrappers
 #endif
   {
     last_action = Zero;
-    vector = std::auto_ptr<Epetra_FEVector>
-                     (new Epetra_FEVector(map,false));
+    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
   }
 
 
@@ -253,8 +252,7 @@ namespace TrilinosWrappers
                  map (InputMap.NumGlobalElements(), 0, InputMap.Comm())
   {
     last_action = Zero;
-    vector = std::auto_ptr<Epetra_FEVector>
-                     (new Epetra_FEVector(map,false));
+    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
   }
 
 
@@ -264,7 +262,7 @@ namespace TrilinosWrappers
                  map (v.vector->Map().NumGlobalElements(), 0, v.vector->Comm())
   {
     last_action = Zero;
-    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
 
     if (vector->Map().SameAs(v.vector->Map()) == true)
       *vector = *v.vector;
@@ -291,7 +289,7 @@ namespace TrilinosWrappers
 
     last_action = Zero;
 
-    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map,false));
+    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map));
   }
 
 
@@ -311,7 +309,7 @@ namespace TrilinosWrappers
     last_action = Zero;
 
     (void)fast;
-    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map, false));
+    vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map));
   }
 
 
@@ -334,7 +332,7 @@ namespace TrilinosWrappers
        if (map.SameAs(v.vector->Map()) == false)
          map = Epetra_LocalMap (v.vector->GlobalLength(),0,v.vector->Comm());
 
-       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
        last_action = Zero;
       }
 
@@ -373,7 +371,7 @@ namespace TrilinosWrappers
       {
        map = Epetra_LocalMap (v.vector->Map().NumGlobalElements(), 0,
                               v.vector->Comm());
-       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
       }
 
     reinit (v, false, true);
@@ -389,7 +387,7 @@ namespace TrilinosWrappers
       {
        map = Epetra_LocalMap (v.vector->Map().NumGlobalElements(), 0,
                               v.vector->Comm());
-       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
       }
 
     *vector = *v.vector;
@@ -406,7 +404,7 @@ namespace TrilinosWrappers
     if (size() != v.size())
       {
        map = LocalMap (v.size(), 0, vector->Comm());
-       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map,false));
+       vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
       }
 
     std::vector<int> indices (v.size());

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.