--- branches/mmeineke/OOPSE/libmdtools/mpiComponentPlan.h	2003/03/21 17:42:12	377
+++ trunk/OOPSE/libmdtools/mpiComponentPlan.h	2004/05/07 21:35:05	1150
@@ -1,5 +1,8 @@
 #ifdef __C
-/** This header provides dual access for mpiComponenPlan 
+#ifndef __MPICOMPONENTPLAN_H__
+#define __MPICOMPONENTPLAN_H__
+
+/** This header provides dual access for mpiComponentPlan 
     structure in fortran and in c, C++. 
 */
 
@@ -10,12 +13,9 @@ typedef struct{
   int nBendsGlobal;
   int nTorsionsGlobal;
   int nSRIGlobal;
-  int myMolStart;
-  int myMolEnd;
-  int myAtomStart;
-  int myAtomEnd;
-  int myMol;
+  int myNMol;
   int myNlocal;
+  int myNgroup;
   int myNode;
   int numberProcessors;
   int rowComm;
@@ -24,12 +24,15 @@ typedef struct{
   int numberColumns;
   int nComponentsRow;
   int nComponentsColumn;
+  int nGroupRow;
+  int nGroupColumn;
   int rowIndex;
   int columnIndex;
 } mpiSimData;
 
+#endif // __MPICOMPONENTPLAN_H__
 
-#endif
+#endif // __C
 
 
 #ifdef __FORTRAN90
@@ -41,12 +44,9 @@ 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 :: myNgroup = 0
      integer :: myNode = 0
      integer :: numberProcessors = 0
      integer :: rowComm = 0
@@ -55,6 +55,8 @@ type, public :: mpiComponentPlan
      integer :: numberColumns = 0
      integer :: nComponentsRow = 0
      integer :: nComponentsColumn = 0
+     integer :: nGroupRow = 0
+     integer :: nGroupColumn = 0
      integer :: rowIndex = 0
      integer :: columnIndex = 0
 end type mpiComponentPlan