]> https://gitweb.dealii.org/ - dealii.git/commitdiff
One more change to make things with the extra Trilinos vector really work (hopefully).
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Tue, 28 Jul 2009 15:18:39 +0000 (15:18 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Tue, 28 Jul 2009 15:18:39 +0000 (15:18 +0000)
git-svn-id: https://svn.dealii.org/trunk@19127 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/constraint_matrix.h
deal.II/lac/source/constraint_matrix.cc

index c6b8a39c7c9381cd167a596d7ebd014b4ab4d89e..ad67cbc78fd4d1dd67923b1a7e7ea969b1471bae 100644 (file)
@@ -328,6 +328,11 @@ class ConstraintMatrix : public Subscriptor
                                      */
     ConstraintMatrix ();
 
+                                    /**
+                                     * Copy constructor
+                                     */
+    ConstraintMatrix (const ConstraintMatrix &constraint_matrix);
+
                                     /**
                                      * @name Adding constraints
                                      * @{
@@ -1521,7 +1526,7 @@ class ConstraintMatrix : public Subscriptor
                                       * This vector is used to import data
                                       * within the distribute function.
                                       */
-    mutable std_cxx1x::shared_ptr<TrilinosWrappers::MPI::Vector> vec_distribute;
+    mutable std::auto_ptr<TrilinosWrappers::MPI::Vector> vec_distribute;
 #endif
 };
 
@@ -1537,6 +1542,19 @@ ConstraintMatrix::ConstraintMatrix ()
 {}
 
 
+
+inline
+ConstraintMatrix::ConstraintMatrix (const ConstraintMatrix &constraint_matrix)
+               :
+               lines (constraint_matrix.lines),
+               constraint_line_exists (constraint_matrix.constraint_line_exists),
+               sorted (constraint_matrix.sorted)
+#ifdef DEAL_II_USE_TRILINOS
+               ,vec_distribute ()
+#endif
+{}
+
+
 inline
 void
 ConstraintMatrix::add_line (const unsigned int line)
index 0624e8cfdf8c2eab879e8cacc85e3210e4c6c6fe..5bd0c374fe0c3a77e76efb0a4b75af10382f6c54 100644 (file)
@@ -1917,7 +1917,7 @@ ConstraintMatrix::distribute (TrilinosWrappers::MPI::Vector &vec) const
       my_indices.resize(index2);
 
       Epetra_Map map_exchange = Epetra_Map(-1,index2,(int*)&my_indices[0],0,vec.trilinos_vector().Comm());
-      vec_distribute = std_cxx1x::shared_ptr<TrilinosWrappers::MPI::Vector> 
+      vec_distribute = std::auto_ptr<TrilinosWrappers::MPI::Vector> 
        (new TrilinosWrappers::MPI::Vector(map_exchange));
     }
                                   // here we import the data

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.