--- trunk/src/brains/DataStorage.cpp	2005/04/15 22:04:00	507
+++ trunk/src/brains/DataStorage.cpp	2008/05/27 16:39:06	1245
@@ -101,7 +101,11 @@ namespace oopse {
       //error
       std::cerr << "size does not match"<< std::endl;        
     }
-
+    if (storageLayout_ & dslParticlePot && particlePot.size() != size_) {
+      //error
+      std::cerr << "size does not match"<< std::endl;        
+    }
+    
     return size_;
 
   }
@@ -140,6 +144,10 @@ namespace oopse {
       internalResize(torque, newSize);
     }
 
+    if (storageLayout_ & dslParticlePot) {
+      internalResize(particlePot, newSize);
+    }
+
     size_ = newSize;
   }
 
@@ -175,6 +183,10 @@ namespace oopse {
     if (storageLayout_ & dslTorque) {
       torque.reserve(size);
     }
+    
+    if (storageLayout_ & dslParticlePot) {
+      particlePot.reserve(size);
+    }
 
   }
 
@@ -214,6 +226,10 @@ namespace oopse {
     if (storageLayout_ & dslTorque) {
       internalCopy(torque, source, num, target); 
     }
+
+    if (storageLayout_ & dslParticlePot) {
+      internalCopy(particlePot, source, num, target); 
+    }
     
 
   }
@@ -227,7 +243,7 @@ namespace oopse {
     resize(size_);
   }
 
-  double* DataStorage::getArrayPointer(int whichArray) {
+  RealType* DataStorage::getArrayPointer(int whichArray) {
 
     switch (whichArray) {
     case dslPosition:
@@ -260,7 +276,11 @@ namespace oopse {
 
     case dslTorque:
       return internalGetArrayPointer(torque);
-      break;  
+      break;
+
+    case dslParticlePot:
+      return internalGetArrayPointer(particlePot);
+      break;
             
     default:
       //error message
@@ -269,7 +289,7 @@ namespace oopse {
     }
   }    
 
-  double* DataStorage::internalGetArrayPointer(std::vector<Vector3d>& v) {
+  RealType* DataStorage::internalGetArrayPointer(std::vector<Vector3d>& v) {
     if (v.size() == 0) {
       return NULL;
     } else {
@@ -277,7 +297,7 @@ namespace oopse {
     }
   }
 
-  double* DataStorage::internalGetArrayPointer(std::vector<RotMat3x3d>& v) {
+  RealType* DataStorage::internalGetArrayPointer(std::vector<RotMat3x3d>& v) {
     if (v.size() == 0) {
       return NULL;
     } else {
@@ -286,7 +306,7 @@ namespace oopse {
 
   }
 
-  double* DataStorage::internalGetArrayPointer(std::vector<double>& v) {
+  RealType* DataStorage::internalGetArrayPointer(std::vector<RealType>& v) {
     if (v.size() == 0) {
       return NULL;
     } else {
@@ -338,7 +358,7 @@ namespace oopse {
       bytes += sizeof(Vector3d);
     }
     if (layout & dslAmat) {
-      bytes += sizeof(Mat3x3d);    
+      bytes += sizeof(RotMat3x3d);    
     }
     if (layout & dslAngularMomentum) {
       bytes += sizeof(Vector3d);
@@ -347,7 +367,7 @@ namespace oopse {
       bytes += sizeof(Mat3x3d);
     }
     if (layout & dslZAngle) {
-      bytes += sizeof(Vector3d);
+      bytes += sizeof(RealType);
     }
     if (layout & dslForce) {
       bytes += sizeof(Vector3d);
@@ -355,6 +375,9 @@ namespace oopse {
     if (layout & dslTorque) {
       bytes += sizeof(Vector3d);
     }
+    if (layout & dslParticlePot) {
+      bytes += sizeof(RealType);
+    }
     return bytes;
   }