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

Comparing trunk/src/math/SeqRandNumGen.cpp (file contents):
Revision 392 by tim, Wed Mar 2 15:36:14 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include "math/SeqRandNumGen.hpp"
43  
44  
45 < namespace oopse {
45 > namespace OpenMD {
46  
47  
48  
49 < int SeqRandNumGen::nCreatedRNG_ = 0;
49 >  int SeqRandNumGen::nCreatedRNG_ = 0;
50  
51 < SeqRandNumGen::SeqRandNumGen( const uint32& oneSeed) {
51 >  SeqRandNumGen::SeqRandNumGen( const uint32& oneSeed) {
52  
53      //In order to generate independent random number stream, the actual seed used by random
54      //number generator is the seed passed to the constructor plus the number of random number
# Line 56 | Line 56 | SeqRandNumGen::SeqRandNumGen( const uint32& oneSeed) {
56      int newSeed = oneSeed + nCreatedRNG_;
57      mtRand_ = new MTRand(newSeed, 1, 0);
58      ++nCreatedRNG_;
59 < }
59 >  }
60  
61 < SeqRandNumGen::SeqRandNumGen() {
61 >  SeqRandNumGen::SeqRandNumGen() {
62  
63      //the default seeds generated by MTRand will make sure they are unique
64      mtRand_ = new MTRand(1, 0);      
65      ++nCreatedRNG_;
66 < }
66 >  }
67  
68  
69 < void SeqRandNumGen::seed( const uint32 oneSeed ) {
69 >  void SeqRandNumGen::seed( const uint32 oneSeed ) {
70  
71      int newSeed = oneSeed + nCreatedRNG_;
72      mtRand_->seed(newSeed);
73  
74      ++nCreatedRNG_;
75 < }
75 >  }
76          
77 < void SeqRandNumGen::seed() {
77 >  void SeqRandNumGen::seed() {
78  
79      mtRand_->seed();
80      ++nCreatedRNG_;
81 < }    
81 >  }    
82  
83  
84   }

Diff Legend

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