]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
fix tests
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Jul 2013 18:32:49 +0000 (18:32 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Jul 2013 18:32:49 +0000 (18:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@30016 0785d39b-7218-0410-832d-ea1e28bc413d

tests/gla/block_mat_01.cc
tests/gla/gla.h
tests/gla/vec_00.cc
tests/gla/vec_01.cc
tests/gla/vec_02.cc
tests/gla/vec_03.cc

index 119fe5a3d55abf3a8494dde95648f76b25d8c3d3..12b6b59f42180bb63a7946ca99fae08bcb76ef67 100644 (file)
@@ -70,7 +70,7 @@ void test ()
 
   matrix.add(1,1,1.3);
 
-  matrix.compress();
+  matrix.compress(VectorOperation::add);
 
   if (myid==0)
     {
index d071575836e821bf6664bb80fbea3d135e354a41..1e0a53a05733dfcf006e727053f620f03f7931d0 100644 (file)
@@ -36,17 +36,20 @@ class LA_Dummy
        class Vector
        {
          public:
+
+           Vector()
+             {}
            
-           Vector(const IndexSet local, const MPI_Comm &comm=MPI_COMM_WORLD)
+           Vector(const IndexSet local, const MPI_Comm &comm)
              {}
            
-           Vector(const IndexSet &local, const IndexSet &ghost, const MPI_Comm &comm=MPI_COMM_WORLD
+           Vector(const IndexSet &local, const IndexSet &ghost, const MPI_Comm &comm) 
              {}
 
-           void reinit(const IndexSet local, const MPI_Comm &comm=MPI_COMM_WORLD)
+           void reinit(const IndexSet local, const MPI_Comm &comm)
              {}
 
-           void reinit(const IndexSet local, const IndexSet &ghost, const MPI_Comm &comm=MPI_COMM_WORLD)
+           void reinit(const IndexSet local, const IndexSet &ghost, const MPI_Comm &comm)
              {}
            
            void compress(VectorOperation::values op)
index 7b672cd99f5c6f5d25ea2c127b74e71ea5bc9d2e..02bf8a99c507f38731f062aae4bbb1e67fd6ea8b 100644 (file)
@@ -49,24 +49,13 @@ void test ()
 
   
   {
-                                    //implicit communicator:
-    typename LA::MPI::Vector v1(local_active);
-    Assert(!v1.has_ghost_elements(), ExcInternalError());
-    Assert(v1.size()==numproc*2, ExcInternalError());
-
-    v1.reinit(something);
-    Assert(!v1.has_ghost_elements(), ExcInternalError());
-    Assert(v1.size()==100, ExcInternalError());
-    
-    v1.reinit(local_active, local_relevant);
-    Assert(v1.has_ghost_elements(), ExcInternalError());
-    Assert(v1.size()==numproc*2, ExcInternalError());
+    typename LA::MPI::Vector v1;
     
     v1.reinit(something, MPI_COMM_WORLD);
     Assert(!v1.has_ghost_elements(), ExcInternalError());
     Assert(v1.size()==100, ExcInternalError());
 
-    typename LA::MPI::Vector v2(local_active, local_relevant);
+    typename LA::MPI::Vector v2(local_active, local_relevant, MPI_COMM_WORLD);
     Assert(v2.has_ghost_elements(), ExcInternalError());
     Assert(v2.size()==numproc*2, ExcInternalError());
 
index 3304b9382abbf5ad5fab1809140c81b667a50543..b780218407ea928e3ef9c3c2248fbd21193b3826 100644 (file)
@@ -40,14 +40,6 @@ void test ()
   local_active.add_range(myid*2,myid*2+2);
   IndexSet local_relevant(numproc*2);
   local_relevant.add_range(1,2);
-
-  {
-                                    //implicit communicator:
-    typename LA::MPI::Vector v1(local_active);
-    typename LA::MPI::Vector v2(local_active, local_relevant);
-    Assert(!v1.has_ghost_elements(), ExcInternalError());
-    Assert(v2.has_ghost_elements(), ExcInternalError());
-  }
   
   typename LA::MPI::Vector vb(local_active, MPI_COMM_WORLD);
   typename LA::MPI::Vector v(local_active, local_relevant, MPI_COMM_WORLD);
index 766738ce92f1bb1f6e18b2b451b1f388283677df..da40836c516404f9613c96c31a0fed4fc2e814f7 100644 (file)
@@ -41,9 +41,9 @@ void test ()
   IndexSet local_relevant(numproc*2);
   local_relevant.add_range(1,2);
 
-  typename LA::MPI::Vector vb(local_active);
-  typename LA::MPI::Vector v(local_active, local_relevant);
-  typename LA::MPI::Vector v2(local_active, local_relevant);
+  typename LA::MPI::Vector vb(local_active, MPI_COMM_WORLD);
+  typename LA::MPI::Vector v(local_active, local_relevant, MPI_COMM_WORLD);
+  typename LA::MPI::Vector v2(local_active, local_relevant, MPI_COMM_WORLD);
 
   vb = 1.0;
   v2 = vb;
index ef797088e88f64a044116bafb8897449d5b2aba9..2a7c732f504cb1f4c06bc3a0a31fe54a9eea0c6a 100644 (file)
@@ -42,8 +42,8 @@ void test ()
   IndexSet local_relevant(numproc*2);
   local_relevant.add_range(1,2);
 
-  typename LA::MPI::Vector vb(local_active);
-  typename LA::MPI::Vector v(local_active, local_relevant);
+  typename LA::MPI::Vector vb(local_active, MPI_COMM_WORLD);
+  typename LA::MPI::Vector v(local_active, local_relevant, MPI_COMM_WORLD);
 
   vb = 1.0;
 

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.