Changeset 418:cfb70bb62bed

Timestamp:

11/03/2012 01:56:16 AM (7 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Children:

419:79940a8687ac, 423:06105dbc4269

Message:

Steerer interface for HiParSimulator? now operational and tested

Location:

src

Files:

• io/teststeerer.h (modified) (1 diff)
• parallelization/hiparsimulator/updategroup.h (modified) (2 diffs)
• parallelization/test/parallel_mpi_1/hiparsimulatortest.h (modified) (5 diffs)
• parallelization/test/parallel_mpi_4/hiparsimulatortest.h (modified) (4 diffs)

src/io/teststeerer.h

@@ -36 +36 @@
             return;
         }
-        
+
         for (typename Region<DIM>::Iterator i = validRegion.begin();
              i != validRegion.end();

src/parallelization/hiparsimulator/updategroup.h

@@ -22 +22 @@
 class UpdateGroup
 {
+    friend class HiParSimulatorTest;
     friend class UpdateGroupPrototypeTest;
     friend class UpdateGroupTest;
@@ -121 +122 @@
         }
 
+        // add external PatchProviders last to allow them to override
+        // the local ghost zone providers (a.k.a. PatchLink::Source).
         for (typename PatchProviderVec::iterator i = patchProvidersGhost.begin();
              i != patchProvidersGhost.end(); 

src/parallelization/test/parallel_mpi_1/hiparsimulatortest.h

@@ -5 +5 @@
 #include <libgeodecomp/io/mocksteerer.h>
 #include <libgeodecomp/io/mockwriter.h>
+#include <libgeodecomp/io/teststeerer.h>
 #include <libgeodecomp/io/parallelmemorywriter.h>
 #include <libgeodecomp/io/testinitializer.h>
@@ -22 +23 @@
 {
 public:
+    typedef GridBase<TestCell<2>, 2> GridBaseType;
     // fixme: rename types a la "MyFoobar" to "FoobarType"
     typedef HiParSimulator<TestCell<2>, StripingPartition<2> > SimulatorType;
     typedef ParallelMemoryWriter<TestCell<2> > MemoryWriterType;
-    typedef MockSteerer<TestCell<2> > SteererType;
+    typedef MockSteerer<TestCell<2> > MockSteererType;
+    typedef TestSteerer<2 > TestSteererType;
 
     void setUp()
@@ -101 +104 @@
     {
         std::stringstream events;
-        s->addSteerer(new SteererType(5, &events));
+        s->addSteerer(new MockSteererType(5, &events));
         s->run();
         s.reset();        
@@ -107 +110 @@
         std::stringstream expected;
         expected << "created, period = 5\n";
-        for (int i = 20; i <= 200; i += 5) {
+        for (int i = 25; i <= 200; i += 5) {
+            expected << "nextStep(" << i << ")\n";
             expected << "nextStep(" << i << ")\n";
         }
@@ -113 +117 @@
 
         TS_ASSERT_EQUALS(events.str(), expected.str());
+    }
+
+    void testSteererFunctionality()
+    {
+        s->addSteerer(new TestSteererType(5, 25, 4711 * 27));
+        s->run();
+
+        const Region<2> *region = &s->updateGroup->partitionManager->ownRegion();
+        const GridBaseType *grid = &s->updateGroup->grid();
+        int cycle = 200 * 27 + 4711 * 27;
+
+        TS_ASSERT_TEST_GRID_REGION(
+            GridBaseType, 
+            *grid, 
+            *region, 
+            cycle);
     }
 

src/parallelization/test/parallel_mpi_4/hiparsimulatortest.h

@@ -2 +2 @@
 #include <cxxtest/TestSuite.h>
 #include <sstream>
+#include <libgeodecomp/io/mocksteerer.h>
 #include <libgeodecomp/io/mockwriter.h>
+#include <libgeodecomp/io/teststeerer.h>
 #include <libgeodecomp/io/parallelmemorywriter.h>
 #include <libgeodecomp/io/testinitializer.h>
@@ -20 +22 @@
 {
 public:
+    typedef GridBase<TestCell<2>, 2> GridBaseType;
     typedef HiParSimulator<TestCell<2>, ZCurvePartition<2> > SimulatorType;
     typedef ParallelMemoryWriter<TestCell<2> > MemoryWriterType;
+    typedef MockSteerer<TestCell<2> > MockSteererType;
+    typedef TestSteerer<2 > TestSteererType;
 
     void setUp()
@@ -106 +111 @@
     }
 
+    void testSteererCallback()
+    {
+        std::stringstream events;
+        s->addSteerer(new MockSteererType(5, &events));
+        s->run();
+        s.reset();        
+
+        std::stringstream expected;
+        expected << "created, period = 5\n";
+        for (int i = 25; i <= 100; i += 5) {
+            expected << "nextStep(" << i << ")\n";
+            expected << "nextStep(" << i << ")\n";
+        }
+        expected << "deleted\n";
+
+        TS_ASSERT_EQUALS(events.str(), expected.str());
+    }
+
+    void testSteererFunctionality()
+    {
+        s->addSteerer(new TestSteererType(5, 25, 4711 * 27));
+        s->run();
+
+        const Region<2> *region = &s->updateGroup->partitionManager->ownRegion();
+        const GridBaseType *grid = &s->updateGroup->grid();
+        int cycle = 100 * 27 + 4711 * 27;
+
+        TS_ASSERT_TEST_GRID_REGION(
+            GridBaseType, 
+            *grid, 
+            *region, 
+            cycle);
+    }
+
 private:
     boost::shared_ptr<SimulatorType> s;
@@ -119 +158 @@
 };
 
-};
-};
+}
+}