ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/rnemd/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.
branches/development/src/integrators/RNEMD.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 55 | Line 56
56   #include "selection/SelectionManager.hpp"
57   #include <iostream>
58  
59 < namespace oopse {
59 > using namespace std;
60 > namespace OpenMD {
61  
62    /**
63     * @class RNEMD RNEMD.hpp "integrators/RNEMD.hpp"
# Line 76 | Line 78 | namespace oopse {
78        exchangeTime_ = exchangeTime;
79      }
80      void set_RNEMD_nBins(int nbins) { nBins_ = nbins; }
81 <    RealType get_RNEMD_exchange_total() { return exchangeSum_; }
81 >    void set_RNEMD_logWidth(int logWidth) { rnemdLogWidth_ = logWidth; }
82      void set_RNEMD_exchange_total(RealType et) { exchangeSum_ = et; }
83      void set_RNEMD_target_flux(RealType targetFlux) {targetFlux_ = targetFlux;}
84 +    RealType get_RNEMD_exchange_total() { return exchangeSum_; }
85  
86    private:
87  
# Line 96 | Line 99 | namespace oopse {
99      
100      SimInfo* info_;
101      RandNumGen* randNumGen_;
102 <    std::map<std::string, RNEMDTypeEnum> stringToEnumMap_;
102 >    map<string, RNEMDTypeEnum> stringToEnumMap_;
103      RNEMDTypeEnum rnemdType_;
104 <    std::string rnemdObjectSelection_;
104 >    string rnemdObjectSelection_;
105      SelectionEvaluator evaluator_;
106      SelectionManager seleMan_;
107      bool usePeriodicBoundaryConditions_;
108 <    int nBins_;
108 >    bool output3DTemp_;
109 >    int nBins_; /**< The number of bins to divide the simulation box into.  */
110 >    /*!
111 >      The middle bin for the RNEMD method. midBin_ = nBins_/2;
112 >      Depending on the setting of the flux, this box should contain the minimum energy (temperature)
113 >      within the simulation.
114 >    */
115      int midBin_;
116 <    int rnemdLogWidth_;
116 >    int rnemdLogWidth_; /**< Number of elements to print out in logs */
117 >    RealType zShift_;
118      RealType exchangeTime_;
119      RealType targetFlux_;
120      RealType exchangeSum_;
121      int failTrialCount_;
122      int failRootCount_;
123 <    std::ofstream rnemdLog_;
123 >    ofstream rnemdLog_;
124      // keeps track of what's being averaged
125 <    std::vector<RealType> valueHist_;
126 <    std::vector<int> valueCount_;
125 >    vector<RealType> valueHist_;
126 >    vector<int> valueCount_, xyzTempCount_;
127      // keeps track of the number of degrees of freedom being averaged
128 <    std::vector<RealType> xTempHist_, yTempHist_, zTempHist_;
129 <    std::ofstream xTempLog_, yTempLog_, zTempLog_;
128 >    vector<RealType> xTempHist_, yTempHist_, zTempHist_;
129 >    ofstream xTempLog_, yTempLog_, zTempLog_;
130    };
131  
132   }

Comparing:
trunk/src/integrators/RNEMD.hpp (property svn:keywords), Revision 1368 by skuang, Mon Oct 19 13:39:04 2009 UTC vs.
branches/development/src/integrators/RNEMD.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines