--- trunk/OOPSE/libmdtools/mpiComponentPlan.h	2003/03/21 17:42:12	378
+++ trunk/OOPSE/libmdtools/mpiComponentPlan.h	2003/10/28 22:25:46	836
@@ -1,4 +1,7 @@
 #ifdef __C
+#ifndef __MPICOMPONENTPLAN_H__
+#define __MPICOMPONENTPLAN_H__
+
 /** This header provides dual access for mpiComponenPlan 
     structure in fortran and in c, C++. 
 */
@@ -10,11 +13,7 @@ typedef struct{
   int nBendsGlobal;
   int nTorsionsGlobal;
   int nSRIGlobal;
-  int myMolStart;
-  int myMolEnd;
-  int myAtomStart;
-  int myAtomEnd;
-  int myMol;
+  int myNMol;
   int myNlocal;
   int myNode;
   int numberProcessors;
@@ -28,8 +27,9 @@ typedef struct{
   int columnIndex;
 } mpiSimData;
 
+#endif // __MPICOMPONENTPLAN_H__
 
-#endif
+#endif // __C
 
 
 #ifdef __FORTRAN90
@@ -41,11 +41,7 @@ type, public :: mpiComponentPlan
      integer :: nBendsGlobal = 0
      integer :: nTorsionsGlobal = 0
      integer :: nSRIGlobal = 0
-     integer :: myMolStart = 0
-     integer :: myMolEnd = 0
-     integer :: myAtomStart = 0
-     integer :: myAtomEnd = 0
-     integer :: myMol = 0
+     integer :: myNMol = 0
      integer :: myNlocal = 0
      integer :: myNode = 0
      integer :: numberProcessors = 0