ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/integrators/RNEMD.hpp
(Generate patch)

Comparing trunk/src/integrators/RNEMD.hpp (file contents):
Revision 1368 by skuang, Mon Oct 19 13:39:04 2009 UTC vs.
Revision 1560 by skuang, Wed May 11 17:55:32 2011 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 55 | Line 55
55   #include "selection/SelectionManager.hpp"
56   #include <iostream>
57  
58 < namespace oopse {
58 > namespace OpenMD {
59  
60    /**
61     * @class RNEMD RNEMD.hpp "integrators/RNEMD.hpp"
# Line 76 | Line 76 | namespace oopse {
76        exchangeTime_ = exchangeTime;
77      }
78      void set_RNEMD_nBins(int nbins) { nBins_ = nbins; }
79 <    RealType get_RNEMD_exchange_total() { return exchangeSum_; }
79 >    void set_RNEMD_logWidth(int logWidth) { rnemdLogWidth_ = logWidth; }
80      void set_RNEMD_exchange_total(RealType et) { exchangeSum_ = et; }
81      void set_RNEMD_target_flux(RealType targetFlux) {targetFlux_ = targetFlux;}
82 +    RealType get_RNEMD_exchange_total() { return exchangeSum_; }
83  
84    private:
85  
# Line 102 | Line 103 | namespace oopse {
103      SelectionEvaluator evaluator_;
104      SelectionManager seleMan_;
105      bool usePeriodicBoundaryConditions_;
106 +    bool output3DTemp_;
107      int nBins_;
108      int midBin_;
109      int rnemdLogWidth_;
110 +    RealType zShift_;
111      RealType exchangeTime_;
112      RealType targetFlux_;
113      RealType exchangeSum_;
# Line 113 | Line 116 | namespace oopse {
116      std::ofstream rnemdLog_;
117      // keeps track of what's being averaged
118      std::vector<RealType> valueHist_;
119 <    std::vector<int> valueCount_;
119 >    std::vector<int> valueCount_, xyzTempCount_;
120      // keeps track of the number of degrees of freedom being averaged
121      std::vector<RealType> xTempHist_, yTempHist_, zTempHist_;
122      std::ofstream xTempLog_, yTempLog_, zTempLog_;

Comparing trunk/src/integrators/RNEMD.hpp (property svn:keywords):
Revision 1368 by skuang, Mon Oct 19 13:39:04 2009 UTC vs.
Revision 1560 by skuang, Wed May 11 17:55:32 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines