--- trunk/src/io/DumpWriter.cpp	2006/08/30 20:33:44	1025
+++ trunk/src/io/DumpWriter.cpp	2009/11/25 20:02:06	1390
@@ -1,24 +1,15 @@
 /*
- * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
+ * Copyright (c) 2009 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
  * non-exclusive, royalty free, license to use, modify and
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,15 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
  
 #include "io/DumpWriter.hpp"
@@ -50,7 +50,7 @@
 #include <mpi.h>
 #endif //is_mpi
 
-namespace oopse {
+namespace OpenMD {
 
   DumpWriter::DumpWriter(SimInfo* info) 
     : info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){
@@ -240,14 +240,15 @@ namespace oopse {
     os << "    <StuntDoubles>\n";
     for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
 
-      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; 
+      
+      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
            integrableObject = mol->nextIntegrableObject(ii)) { 	
-        os << prepareDumpLine(integrableObject);
-
+          os << prepareDumpLine(integrableObject);
+          
       }
     }    
     os << "    </StuntDoubles>\n";
-
+    
     os << "  </Snapshot>\n";
 
     os.flush();
@@ -255,10 +256,11 @@ namespace oopse {
     //every node prepares the dump lines for integrable objects belong to itself
     std::string buffer;
     for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
-      
+
+
       for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; 
            integrableObject = mol->nextIntegrableObject(ii)) { 	
-        buffer += prepareDumpLine(integrableObject);
+          buffer += prepareDumpLine(integrableObject);
       }
     }
     
@@ -285,7 +287,7 @@ namespace oopse {
         } else {
           MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus);
           os << recvBuffer;
-          delete recvBuffer;
+          delete [] recvBuffer;
         }
       }	
       os << "    </StuntDoubles>\n";
@@ -424,7 +426,7 @@ namespace oopse {
     newOStream = new std::ofstream(filename.c_str());
 #endif
     //write out MetaData first
-    (*newOStream) << "<OOPSE version=4>" << std::endl;
+    (*newOStream) << "<OpenMD version=1>" << std::endl;
     (*newOStream) << "  <MetaData>" << std::endl;
     (*newOStream) << info_->getRawMetaData();
     (*newOStream) << "  </MetaData>" << std::endl;
@@ -433,8 +435,8 @@ namespace oopse {
 
   void DumpWriter::writeClosing(std::ostream& os) {
 
-    os << "</OOPSE>\n";
+    os << "</OpenMD>\n";
     os.flush();
   }
 
-}//end namespace oopse
+}//end namespace OpenMD