--- trunk/src/io/ZConsWriter.cpp 2005/04/15 22:04:00 507 +++ trunk/src/io/ZConsWriter.cpp 2010/05/10 17:28:26 1442 @@ -6,19 +6,10 @@ * 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 @@ -46,9 +46,11 @@ #include "io/ZConsWriter.hpp" #include "utils/simError.h" +#ifdef IS_MPI +#include +#endif - -namespace oopse { +namespace OpenMD { ZConsWriter::ZConsWriter(SimInfo* info, const std::string& filename) : info_(info) { //use master - slave mode, only master node writes to disk #ifdef IS_MPI @@ -110,7 +112,7 @@ namespace oopse { MPI_Status ierr; int zmolIndex; - double data[3]; + RealType data[3]; if (masterNode == 0) { @@ -130,7 +132,7 @@ namespace oopse { } else { for(int k =0 ; k < nFixedZmolsInProc[i]; ++k) { MPI_Recv(&zmolIndex, 1, MPI_INT, i, 0, MPI_COMM_WORLD,&ierr); - MPI_Recv(data, 3, MPI_DOUBLE, i, 0, MPI_COMM_WORLD,&ierr); + MPI_Recv(data, 3, MPI_REALTYPE, i, 0, MPI_COMM_WORLD,&ierr); tmpData.zmolIndex = zmolIndex; tmpData.zforce= data[0]; tmpData.zpos = data[1]; @@ -159,7 +161,7 @@ namespace oopse { data[1] = j->zpos; data[2] = j->param.zTargetPos; MPI_Send(&zmolIndex, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); - MPI_Send(data, 3, MPI_DOUBLE, masterNode, 0, MPI_COMM_WORLD); + MPI_Send(data, 3, MPI_REALTYPE, masterNode, 0, MPI_COMM_WORLD); } }