Changeset 153:81888f75e4f8

Timestamp:

03/15/2012 04:02:13 AM (14 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

• enabling PatchLink? to configure HiParSimulator?'s grid fragment,
• numerous minor clean-ups

Location:

src/parallelization

Files:

• hiparsimulator.h (modified) (2 diffs)
• hiparsimulator/parallelwriteradapter.h (modified) (2 diffs)
• hiparsimulator/patchlink.h (modified) (2 diffs)
• hiparsimulator/test/parallel_mpi_4/vanillasteppertest.h (modified) (2 diffs)
• test/parallel_mpi_1/hiparsimulatortest.h (modified) (2 diffs)

src/parallelization/hiparsimulator.h

@@ -94 +94 @@
         const Region<DIM> **validRegion) 
     {
-        *grid = &updateGroup->grid();
-        // fixme: we can't even guarantee this part
-        *validRegion = &partitionManager.ownRegion();
+        *grid = currentGrid;
+        *validRegion = currentValidRegion;
+    }
+
+    /**
+     * Since HiParSimulator doesn't store any Grid fragments on its
+     * own, external objects need to configure the pointers.
+     */
+    virtual void setGridFragment(
+        const GridType *grid,
+        const Region<DIM> *validRegion)
+    {
+        currentGrid = grid;
+        currentValidRegion = validRegion;
     }
 
@@ -143 +154 @@
     typename UpdateGroupType::PatchAccepterVec writerAdaptersGhost;
     typename UpdateGroupType::PatchAccepterVec writerAdaptersInner;
+    const GridType *currentGrid;
+    const Region<DIM> *currentValidRegion;
 
     SuperVector<long> initialWeights(const long& items, const long& size) const

src/parallelization/hiparsimulator/parallelwriteradapter.h

@@ -45 +45 @@
         this->requestedNanoSteps.erase_min();
 
-        // fixme: set simulator up to link to correct grid/validRegion
+        sim->setGridFragment(&grid, &validRegion);
+
         if (nanoStep == firstNanoStep) {
             writer->initialized();
@@ -55 +56 @@
             }
         }
+
+        // delete the pointers from the Simulator to prevent accesses
+        // to stale pointers:
+        sim->setGridFragment(0, 0);
 
         reload();

src/parallelization/hiparsimulator/patchlink.h

@@ -113 +113 @@
             this->mpiLayer.send(
                 &this->buffer[0], dest, this->buffer.size(), this->tag, cellMPIDatatype);
+
             long nextNanoStep = this->requestedNanoSteps.min() + this->stride;
             if ((this->lastNanoStep == ENDLESS) || 
@@ -159 +160 @@
             long nextNanoStep = this->storedNanoSteps.min() + this->stride;
             if ((this->lastNanoStep == ENDLESS) || 
-                (nextNanoStep < this->lastNanoStep))
+                (nextNanoStep < this->lastNanoStep)) {
                 recv(nextNanoStep);
-            // fixme: extract method for this
+            }
             this->storedNanoSteps.erase_min();
         }

src/parallelization/hiparsimulator/test/parallel_mpi_4/vanillasteppertest.h

@@ -160 +160 @@
 
         int tag = 4711;
-
-        // fixme: once working, use this code to reimplement the
-        // update group
 
         SuperVector<MyPatchProviderPtr> providers;
@@ -224 +221 @@
         // let's go
         checkInnerSet(0, 0);
-        //fixme: check rim, too
+
         stepper->update(1);
         checkInnerSet(1, 1);

src/parallelization/test/parallel_mpi_1/hiparsimulatortest.h

@@ -52 +52 @@
 
         s->step();
-        s->step();
-        s->step();
+        // s->step();
+        // s->step();
+        std::cout << "-----------got events : " << mockWriter->events() << "\n";
     }
 
@@ -59 +60 @@
     {
     //     std::cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n";
-        s->run();
+        // s->run();
         std::cout << "-----------got events : " << mockWriter->events() << "\n";
     }