ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/math/ParallelRandNumGen.cpp

Comparing trunk/src/math/ParallelRandNumGen.cpp (file contents):
Revision 1313 by gezelter, Wed Oct 22 20:01:49 2008 UTC vs.
Revision 1793 by gezelter, Fri Aug 31 21:16:10 2012 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		#include "math/ParallelRandNumGen.hpp"
#	Line 44 | Line 45
45		#include <mpi.h>
46		#endif
47
48	<	namespace oopse {
48	>	namespace OpenMD {
49
50		int ParallelRandNumGen::nCreatedRNG_ = 0;
51
52		ParallelRandNumGen::ParallelRandNumGen(const uint32& oneSeed) {
53
53	–	const int masterNode = 0;
54		unsigned long seed = oneSeed;
55
56		#ifdef IS_MPI
57	+	const int masterNode = 0;
58		MPI_Bcast(&seed, 1, MPI_UNSIGNED_LONG, masterNode, MPI_COMM_WORLD);
59		#endif
60
#	Line 85 | Line 86 | namespace oopse {
86		ParallelRandNumGen::ParallelRandNumGen() {
87
88		std::vector<uint32> bigSeed;
88	–	const int masterNode = 0;
89		int nProcessors;
90		#ifdef IS_MPI
91	+	const int masterNode = 0;
92		MPI_Comm_size( MPI_COMM_WORLD, &nProcessors);
93		MPI_Comm_rank( MPI_COMM_WORLD, &myRank_);
94		#else
#	Line 103 | Line 104 | namespace oopse {
104
105		void ParallelRandNumGen::seed( const uint32 oneSeed ) {
106
106	–	const int masterNode = 0;
107		unsigned long seed = oneSeed;
108		#ifdef IS_MPI
109	+	const int masterNode = 0;
110		MPI_Bcast(&seed, 1, MPI_UNSIGNED_LONG, masterNode, MPI_COMM_WORLD);
111		#endif
112		if (seed != oneSeed) {
#	Line 125 | Line 126 | namespace oopse {
126
127		std::vector<uint32> bigSeed;
128		int size;
129	<	const int masterNode = 0;
129	>
130		#ifdef IS_MPI
131	+	const int masterNode = 0;
132		if (worldRank == masterNode) {
133		#endif
134

Comparing trunk/src/math/ParallelRandNumGen.cpp (property svn:keywords):
Revision 1313 by gezelter, Wed Oct 22 20:01:49 2008 UTC vs.
Revision 1793 by gezelter, Fri Aug 31 21:16:10 2012 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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