Changeset 941

Timestamp:

10/18/06 17:50:27 (7 years ago)

Author:

leo

Message:

create derived types

Location:

sandbox/trunk/pdp

Files:

• assignment.txt (added)
• build/vc71/N-body/N-body.vcproj (modified) (1 diff)
• build/vc71/Replication/Replication.vcproj (modified) (1 diff)
• src/N-body.cpp (modified) (6 diffs)
• src/N-body.hpp (modified) (4 diffs)
• src/Replication.cpp (added)
• src/Replication.hpp (added)
• src/Triplet.hpp (modified) (2 diffs)

sandbox/trunk/pdp/build/vc71/N-body/N-body.vcproj

@@ -13 +13 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="Debug"
+                        OutputDirectory="../Debug"
                         IntermediateDirectory="Debug"
                         ConfigurationType="1"

sandbox/trunk/pdp/build/vc71/Replication/Replication.vcproj

@@ -112 +112 @@
                         Name="Source Files"
                         Filter="">
+                        <File
+                                RelativePath="..\..\..\src\Replication.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\Replication.hpp">
+                        </File>
                 </Filter>
                 <Filter

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

@@ -39 +39 @@
 Particle::toString() const
 {
-        return XERIAL_MESSAGE(Triplet<double>::toString() << format(" m=%1%, v=%2%, a=%3%") % _mass % _velocity.toString() % _acceleration.toString());
+        return XERIAL_MESSAGE(_coordinate.toString() << format(" m=%1%, v=%2%, a=%3%") % _mass % _velocity.toString() % _acceleration.toString());
 }
 
@@ -79 +79 @@
 NBodySimulator::parallelSimulation(double dt, size_t times) 
 {
+        XERIAL_INFO(_logger, "parallel mode");
+
         int numParticle = _particle.size();
-        MPI::COMM_WORLD.BCast(&numParticle, )
+        //MPI::COMM_WORLD.BCast(&numParticle, )
+
 
         for(size_t step=0; step<times; ++step)
@@ -93 +96 @@
 int main(int argc, char** argv)
 {
-        MPIInitializer m(argc, argv);
+        // Initialize the MPI library
+        // 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);
+        
+        // set up command line option parser
         enum
         {
@@ -110 +117 @@
         opt.add(Option(OPT_DISTRIBUTE, "d", "distribute", "distribute mode"));
         opt.add(OptionWithArgument(OPT_STEP, "s", "step", "STEP", "num calculation steps (default = 100)"));
-        opt.add(OptionWithArgument(OPT_PARTICLE, "p", "particle", "NUM", "num particles (default = 10)"));
+        opt.add(OptionWithArgument(OPT_NUM_PARTICLE, "p", "particle", "NUM", "num particles (default = 10)"));
 
         try
         {
-                opt.getContext(argc, argv);
+                // parse command line arguments
+                opt.getContext(argc, argv);     
                 if(opt.isSet(OPT_HELP))
                 {
@@ -134 +142 @@
                         randomParticle.add(p);
                 }
+
+                // simulation phase
                 NBodySimulator simulator(randomParticle);
-                
                 int step = Integer::parseInt(opt.getValue(OPT_STEP, "100"));
                 if(opt.isSet(OPT_DISTRIBUTE))
@@ -155 +164 @@
 }
 
+void
+Particle::prepareMPIDatatype() 
+{
+        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];
+        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.Commit();
+        XERIAL_DEBUG(_logger, "Triplet displacement: " <<  tripletDisplacement);
+        XERIAL_DEBUG(_logger, "Triplet size = " << TripletType.Get_size());
+        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];
+        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);
+        ParticleType.Commit();
+
+        XERIAL_DEBUG(_logger, "particle displacement: " <<  particleDisplacement);
+        XERIAL_DEBUG(_logger, "particle size = " << ParticleType.Get_size());
+        XERIAL_DEBUG(_logger, "sizeof(Particle) = " << sizeof(Particle));
+
+
+}

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

@@ -63 +63 @@
 * Particle class represents a two-dimensional point in the universe.
 */
-class Particle : public Triplet<double>
+class Particle : public xerial::Printable 
 {
 public:
+        Particle()
+                : _mass(0)
+        {}
         Particle(double x, double y, double z, double mass) 
-                : Triplet<double>(x, y, z), _mass(mass)
+                : _coordinate(x, y, z), _mass(mass)
         {}
         virtual ~Particle() {}
@@ -73 +76 @@
         Force gravitationalForce(const Particle& other, double G) const
         {
-                Triplet<double> d = *this - other;
+                Triplet<double> d = _coordinate - other._coordinate;
                 double distSquare = d.x * d.x + d.y * d.y + d.z * d.z;
                 double c  = G * _mass * other._mass / (distSquare * std::sqrt(distSquare));
@@ -101 +104 @@
         {
                 _velocity += _acceleration * dt;        // V' = V + A * dt
-                *this += _velocity * dt;                        // P' = P + V * dt
+                _coordinate += _velocity * dt;                  // P' = P + V * dt
         }
 
@@ -118 +121 @@
                 return this == boost::addressof(other);
         }
+
+        static void prepareMPIDatatype();
 private:
-        double _mass;
+        Triplet<double> _coordinate;
         Velocity _velocity;
         Acceleration _acceleration;
+        double _mass;
 };
 

sandbox/trunk/pdp/src/Triplet.hpp

@@ -25 +25 @@
 #define __TRIPLET_HPP20061016161105
 
-#include "xerial/util/Printable.hpp"
 #include "xerial/util/Message.hpp"
 #include "xerial/util/Format.hpp"
@@ -32 +31 @@
  */ 
 template <class T>
-struct Triplet : public xerial::Printable
+struct Triplet 
 {
         T x;