--- trunk/mdtools/headers/mpiSimulation.hpp	2002/12/10 21:41:23	201
+++ trunk/mdtools/headers/mpiSimulation.hpp	2003/01/02 20:14:08	221
@@ -3,7 +3,10 @@
 
 #include "SimInfo.hpp"
 #include "MakeStamps.hpp"
+#define __C
+#include "mpiComponentPlan.h"
 
+
 class mpiSimulation{
 public:
 
@@ -12,39 +15,28 @@ class mpiSimulation{ (public)
   
   void divideLabor( void );
   
-  int  getMyNode(void)        { return myNode; }
-  int  getMyMolStart( void )  { return myMolStart; }
-  int  getMyMolEnd( void )    { return myMlEnd; }
-  int  getMyMol( void )       { return myMol; }
-  int  getMyAtomStart( void ) { return myAtomStart; }
-  int  getMyAtomEnd( void )   { return myAtomEnd; }
-  int  getMyNlocal( void )    { return myNlocal; }
+  int  getMyNode(void)           { return myNode; }
+  int  getnumberProcessors(void) { return numberProcessors; }
+  int  getMyMolStart( void )     { return myMolStart; }
+  int  getMyMolEnd( void )       { return myMlEnd; }
+  int  getMyMol( void )          { return myMol; }
+  int  getMyAtomStart( void )    { return myAtomStart; }
+  int  getMyAtomEnd( void )      { return myAtomEnd; }
+  int  getMyNlocal( void )       { return myNlocal; }
+
+  int getTotAtoms( void )        { return simTotAtoms; }
   
 
 private:
 
 protected:
   SimInfo* entryPlug;
-  
-  int myMolStart;
-  int myMolEnd;
-  int myAtomStart, myAtomEnd;
-  int myMol;
-  int myNlocal;
-  int *myIdents;
-  int  numberProcessors;
-  int  myNode;
-  //  int  processorNameLen;
-  //  char* processorName;
-  int  natomsRow,natomsCol;
-  int  numberCols,numberRows;
-  int  nmolsRow,nmolsCol,nmolsLocal;
+  mpiSimData* mpiPlug;
 
+  // int *myIdents; // is needed by Cpp only. It tells the molecule which stamp it is.
 
-  int simTotAtoms, simTotBonds, simTotBends, simTotTorsions;
-  int simTotSRI, simTotNmol;
-
 };
 
+extern mpiSimulation* mpiSim;
 
 #endif