Changeset 942

Timestamp:

10/19/06 00:21:36 (7 years ago)

Author:

leo

Message:

modified the datatype definition

Location:

sandbox/trunk/pdp/src

Files:

• N-body.cpp (modified) (7 diffs)
• N-body.hpp (modified) (5 diffs)

sandbox/trunk/pdp/src/N-body.cpp

@@ -21 +21 @@
 // $Author$ 
 //--------------------------------------------------
-#include <mpi.h>
+
+#include "N-body.hpp"
 #include <iostream>
-#include "N-body.hpp"
+#include <boost/random.hpp>
 #include "MPIInitializer.hpp"
-#include <boost/random.hpp>
 #include "xerial/util/cui/OptionParser.hpp"
 #include "xerial/log/Logger.hpp"
@@ -39 +39 @@
 Particle::toString() const
 {
-        return XERIAL_MESSAGE(_coordinate.toString() << format(" m=%1%, v=%2%, a=%3%") % _mass % _velocity.toString() % _acceleration.toString());
+        return XERIAL_MESSAGE(_id << ": " << _coordinate.toString() << format(" m=%1%, v=%2%, a=%3%") % _mass % _velocity.toString() % _acceleration.toString());
 }
 
@@ -45 +45 @@
 : _particle(particle), _gravity(gravity), _time(0)
 {
-        
+        prepareMPIDatatype();
 }
 
@@ -99 +99 @@
         // When this MPIInitializer instance is deallocated, MPI::Finalize() will be invoked automatically.
         MPIInitializer m(argc, argv);   
-        Particle::prepareMPIDatatype(); 
+
         int processID = MPI::COMM_WORLD.Get_rank();
         XERIAL_INFO(_logger, "process id = " << processID);
@@ -137 +137 @@
                 for(int i=0; i<numParticle; i++)
                 {
-                        Particle p(die(), die(), die(), die());
+                        Particle p(i, die(), die(), die(), die());
                         p.setVelocity(Velocity(die(), die(), die()));
                         XERIAL_DEBUG(_logger, p);
@@ -165 +165 @@
 
 void
-Particle::prepareMPIDatatype() 
-{
+NBodySimulator::prepareMPIDatatype() 
+{
+        using namespace MPI;
+
         Triplet<double> t;
-        Vector<MPI::Aint> tripletDisplacement;
-        tripletDisplacement.add(MPI::Get_address(&t.x));
-        tripletDisplacement.add(MPI::Get_address(&t.y));
-        tripletDisplacement.add(MPI::Get_address(&t.z));
-        MPI::Aint base = tripletDisplacement[0];
+        Vector<Aint> tripletDisplacement;
+        tripletDisplacement.add(Get_address(&t.x));
+        tripletDisplacement.add(Get_address(&t.y));
+        tripletDisplacement.add(Get_address(&t.z));
+        Aint base = tripletDisplacement[0];
         for(int i=0; i<3; ++i)
                 tripletDisplacement[i] -= base;
         int tripletBlockLength[] = {1, 1, 1};
-        MPI::Datatype TripletType = MPI::DOUBLE.Create_hindexed(3, tripletBlockLength, &(tripletDisplacement[0]));
+        TripletType = DOUBLE.Create_hindexed(3, tripletBlockLength, &(tripletDisplacement[0]));
+        if(TripletType.Get_size() != sizeof(Triplet<double>))
+                TripletType = TripletType.Create_resized(Aint(0), Aint(sizeof(Triplet<double>)));
         TripletType.Commit();
         XERIAL_DEBUG(_logger, "Triplet displacement: " <<  tripletDisplacement);
@@ -182 +186 @@
         XERIAL_DEBUG(_logger, "sizeof(Triplet) = " << sizeof(Triplet<double>));
 
-        Particle p[3];
-        Vector<MPI::Aint> particleDisplacement;;
-        particleDisplacement.add(MPI::Get_address(&p[0]._coordinate));
-        particleDisplacement.add(MPI::Get_address(&p[0]._velocity));
-        particleDisplacement.add(MPI::Get_address(&p[0]._acceleration));
-        particleDisplacement.add(MPI::Get_address(&p[0]._mass));
-        base = particleDisplacement[0];
+        ParticleType = Particle::createMPIDatatype(TripletType);
+}
+
+MPI::Datatype
+Particle::createMPIDatatype(const MPI::Datatype& TripletType) 
+{
+        using namespace MPI;
+
+        Particle p;
+        Vector<Aint> particleDisplacement;
+        particleDisplacement.add(Get_address(&p._id));
+        particleDisplacement.add(Get_address(&p._coordinate));
+        particleDisplacement.add(Get_address(&p._velocity));
+        particleDisplacement.add(Get_address(&p._acceleration));
+        particleDisplacement.add(Get_address(&p._mass));
+        Aint base = particleDisplacement[0];
         for(size_t i=0; i<particleDisplacement.size(); ++i)
                 particleDisplacement[i] -= base;
 
-        int particleBlockLength[] = {1, 1, 1, 1};
-        MPI::Datatype particleDataType[] = {TripletType, TripletType, TripletType, MPI::DOUBLE};
-        MPI::Datatype ParticleType = MPI::Datatype::Create_struct(4, particleBlockLength, &(particleDisplacement[0]), particleDataType);
+        int particleBlockLength[] = {1, 1, 1, 1, 1};
+        Datatype particleDataType[] = {MPI::INT, TripletType, TripletType, TripletType, DOUBLE};
+        Datatype ParticleType = Datatype::Create_struct(5, particleBlockLength, &(particleDisplacement[0]), particleDataType);
+        if(ParticleType.Get_size() != sizeof(Particle))
+                ParticleType = ParticleType.Create_resized(Aint(0), Aint(sizeof(Particle)));
         ParticleType.Commit();
 
         XERIAL_DEBUG(_logger, "particle displacement: " <<  particleDisplacement);
         XERIAL_DEBUG(_logger, "particle size = " << ParticleType.Get_size());
+        Aint lb, ub;
+        ParticleType.Get_extent(lb, ub);
+        XERIAL_DEBUG(_logger, "extent of particle = " << format("(%1%, %2%)") % lb % ub);
         XERIAL_DEBUG(_logger, "sizeof(Particle) = " << sizeof(Particle));
 
-
-}
+        return ParticleType;
+}

sandbox/trunk/pdp/src/N-body.hpp

@@ -25 +25 @@
 #define __NBODY_HPP20061016161026
 
+#include <mpi.h>
 #include <cmath>
 #include <vector>
@@ -67 +68 @@
 public:
         Particle()
-                : _mass(0)
+                : _id(0), _mass(0)
         {}
-        Particle(double x, double y, double z, double mass) 
-                : _coordinate(x, y, z), _mass(mass)
+        Particle(int id, double x, double y, double z, double mass) 
+                : _id(id), _coordinate(x, y, z), _mass(mass)
         {}
         virtual ~Particle() {}
@@ -107 +108 @@
         }
 
+        int getID() const { return _id; }
         double getMass() const { return _mass; } 
 
@@ -122 +124 @@
         }
 
-        static void prepareMPIDatatype();
+        static MPI::Datatype createMPIDatatype(const MPI::Datatype& tripletDataType);
 private:
+        int _id;
         Triplet<double> _coordinate;
         Velocity _velocity;
@@ -139 +142 @@
         void parallelSimulation(double dt, size_t times);
 
+        
 protected:
         void naiveUpdate(double dt);
 
 private:
+        void prepareMPIDatatype();
+
         xerial::Vector<Particle>& _particle;
         double _time;
         double _gravity;
+
+        MPI::Datatype ParticleType;
+        MPI::Datatype TripletType;
 };