--- trunk/OOPSE-2.0/samples/water/spce/water.md	2005/12/05 23:37:56	2488
+++ trunk/OOPSE-2.0/samples/water/spce/water.md	2005/12/06 16:49:59	2489
@@ -3,7 +3,7 @@ molecule{
 
 molecule{
   name = "Cl-";
-  nAtoms = 1;
+  
   atom[0]{
     type = "Cl-";
     position(0.0, 0.0, 0.0);
@@ -12,7 +12,7 @@ molecule{
 
 molecule{
   name = "Na+";
-  nAtoms = 1;
+  
   atom[0]{
     type = "Na+";
     position(0.0, 0.0, 0.0);
@@ -21,7 +21,7 @@ molecule{
 
 molecule{
   name = "SSD_E";
-  nAtoms = 1;
+  
   atom[0]{
     type = "SSD_E";
     position( 0.0, 0.0, 0.0 );
@@ -31,7 +31,7 @@ molecule{
 
 molecule{
   name = "SSD_RF";
-  nAtoms = 1;
+  
   atom[0]{
     type = "SSD_RF";
     position( 0.0, 0.0, 0.0 );
@@ -41,7 +41,7 @@ molecule{
 
 molecule{
   name = "SSD";
-  nAtoms = 1;
+  
   atom[0]{
     type = "SSD";
     position( 0.0, 0.0, 0.0 );
@@ -51,7 +51,7 @@ molecule{
 
 molecule{
   name = "SSD1";
-  nAtoms = 1;
+  
   atom[0]{
     type = "SSD1";
     position( 0.0, 0.0, 0.0 );
@@ -61,7 +61,7 @@ molecule{
 
 molecule{
   name = "TIP3P";
-  nAtoms = 3;
+  
   atom[0]{
     type = "O_TIP3P";
     position( 0.0, 0.0, -0.06556 );
@@ -75,22 +75,22 @@ molecule{
     position( 0.0, -0.75695, 0.52032 );
   }
 
-  nRigidBodies = 1;
+  
   rigidBody[0]{ 
-    nMembers = 3;
+    
     members(0, 1, 2);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 3;
+  
+  cutoffGroup{
+    
     members(0, 1, 2);
   }
 }
 
 molecule{
   name = "TIP4P";
-  nAtoms = 4;
+  
   atom[0]{
     type = "O_TIP4P";
     position( 0.0, 0.0, -0.06556 );
@@ -107,22 +107,22 @@ molecule{
     type = "EP_TIP4P";
     position( 0.0, 0.0, 0.08444 );
   }
-  nRigidBodies = 1;
+  
   rigidBody[0]{
-    nMembers = 4;
+    
     members(0, 1, 2, 3);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 4;
+  
+  cutoffGroup{
+    
     members(0, 1, 2, 3);
   }
 }
 
 molecule{
   name = "TIP4P-Ew";
-  nAtoms = 4;
+  
   atom[0]{
     type = "O_TIP4P-Ew";
     position( 0.0, 0.0, -0.06556 );
@@ -139,22 +139,22 @@ molecule{
     type = "EP_TIP4P-Ew";
     position( 0.0, 0.0, 0.05944 );
   }
-  nRigidBodies = 1;
+  
   rigidBody[0]{
-    nMembers = 4;
+    
     members(0, 1, 2, 3);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 4;
+  
+  cutoffGroup{
+    
     members(0, 1, 2, 3);
   }
 }
 
 molecule{
   name = "TIP5P";
-  nAtoms = 5;
+  
   atom[0]{
     type = "O_TIP5P";
     position( 0.0, 0.0, -0.06556 );
@@ -175,22 +175,22 @@ molecule{
     type = "EP_TIP5P";
     position( -0.57154, 0.0, -0.46971 );
   }
-  nRigidBodies = 1;
+  
   rigidBody[0]{
-    nMembers = 5;
+    
     members(0, 1, 2, 3, 4);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 5;
+  
+  cutoffGroup{
+    
     members(0, 1, 2, 3, 4);
   }
 }
 
 molecule{
   name = "SPCE";
-  nAtoms = 3;
+  
   atom[0]{
     type = "O_SPCE";
     position( 0.0, 0.0, -0.06461 );
@@ -203,22 +203,22 @@ molecule{
     type = "H_SPCE";
     position( 0.0, -0.81649, 0.51275 );
   }
-  nRigidBodies = 1;
+  
   rigidBody[0]{
-    nMembers = 3;
+    
     members(0, 1, 2);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 3;
+  
+  cutoffGroup{
+    
     members(0, 1, 2);
   }
 }
 
 molecule{
   name = "SPC";
-  nAtoms = 3;
+  
   atom[0]{
     type = "O_SPC";
     position( 0.0, 0.0, -0.06461 );
@@ -231,22 +231,22 @@ molecule{
     type = "H_SPC";
     position( 0.0, -0.81649, 0.51275 );
   }
-  nRigidBodies = 1;
+  
   rigidBody[0]{
-    nMembers = 3;
+    
     members(0, 1, 2);
   }
 
-  nCutoffGroups = 1;
-  cutoffGroup[0]{
-    nMembers = 3;
+  
+  cutoffGroup{
+    
     members(0, 1, 2);
   }
 }
 
 molecule{
   name = "DPD";
-  nAtoms = 1;
+  
   atom[0]{
     type = "DPD";
     position(0.0, 0.0, 0.0);