ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/DataStorage.cpp
(Generate patch)

Comparing branches/development/src/brains/DataStorage.cpp (file contents):
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1711 by gezelter, Sat May 19 02:58:35 2012 UTC

# Line 88 | Line 88 | namespace OpenMD {
88        cerr << "size does not match"<< endl;        
89      }
90  
91 –    if (storageLayout_ & dslZAngle && zAngle.size() != size_) {
92 –      //error
93 –      cerr << "size does not match"<< endl;        
94 –    }
95 –
91      if (storageLayout_ & dslForce && force.size() != size_) {
92        //error
93        cerr << "size does not match"<< endl;        
# Line 174 | Line 169 | namespace OpenMD {
169        internalResize(electroFrame, newSize);
170      }
171      
177 –    if (storageLayout_ & dslZAngle) {
178 –      internalResize(zAngle, newSize);
179 –    }
180 –
172      if (storageLayout_ & dslForce) {
173        internalResize(force, newSize);
174      }
# Line 246 | Line 237 | namespace OpenMD {
237        electroFrame.reserve(size);
238      }
239      
249 –    if (storageLayout_ & dslZAngle) {
250 –      zAngle.reserve(size);
251 –    }
252 –
240      if (storageLayout_ & dslForce) {
241        force.reserve(size);
242      }
# Line 320 | Line 307 | namespace OpenMD {
307        internalCopy(electroFrame, source, num, target);
308      }
309      
323 –    if (storageLayout_ & dslZAngle) {
324 –      internalCopy(zAngle, source, num, target);
325 –    }
326 –
310      if (storageLayout_ & dslForce) {
311        internalCopy(force, source, num, target);
312      }
# Line 400 | Line 383 | namespace OpenMD {
383        return internalGetArrayPointer(electroFrame);
384        break;
385              
403 –    case dslZAngle:
404 –      return internalGetArrayPointer(zAngle);
405 –      break;
406 –
386      case dslForce:
387        return internalGetArrayPointer(force);
388        break;            
# Line 532 | Line 511 | namespace OpenMD {
511      if (layout & dslElectroFrame) {
512        bytes += sizeof(Mat3x3d);
513      }
535 –    if (layout & dslZAngle) {
536 –      bytes += sizeof(RealType);
537 –    }
514      if (layout & dslForce) {
515        bytes += sizeof(Vector3d);
516      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines