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 1330 by skuang, Thu Mar 19 21:03:36 2009 UTC vs.
branches/development/src/integrators/RNEMD.hpp (file contents), Revision 1722 by gezelter, Thu May 24 14:23:40 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 51 | Line 51
51   #define INTEGRATORS_RNEMD_HPP
52   #include "brains/SimInfo.hpp"
53   #include "math/RandNumGen.hpp"
54 + #include "selection/SelectionEvaluator.hpp"
55 + #include "selection/SelectionManager.hpp"
56 + #include <iostream>
57  
58 < namespace oopse {
58 > using namespace std;
59 > namespace OpenMD {
60  
61    /**
62     * @class RNEMD RNEMD.hpp "integrators/RNEMD.hpp"
# Line 62 | Line 66 | namespace oopse {
66    public:
67      RNEMD(SimInfo* info);
68      virtual ~RNEMD();
69 <        
69 >    
70 >    void doRNEMD();
71      void doSwap();
72 <    void set_RNEMD_swapTime(RealType swapTime) { swapTime_ = swapTime; }
72 >    void doScale();
73 >    void doShiftScale();
74 >    void collectData();
75 >    void getStarted();
76 >    void getStatus();
77 >    void set_RNEMD_exchange_time(RealType exchangeTime) {
78 >      exchangeTime_ = exchangeTime;
79 >    }
80      void set_RNEMD_nBins(int nbins) { nBins_ = nbins; }
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 +    void set_RNEMD_target_JzKE(RealType targetJzKE) {targetJzKE_ = targetJzKE;}
85 +    void set_RNEMD_target_jzpx(RealType targetJzpx) {targetJzpx_ = targetJzpx;}
86 +    void set_RNEMD_target_jzpy(RealType targetJzpy) {targetJzpy_ = targetJzpy;}
87 +    void set_RNEMD_target_jzpz(RealType targetJzpz) {targetJzpz_ = targetJzpz;}
88      RealType get_RNEMD_exchange_total() { return exchangeSum_; }
89 <    void set_RNEMD_exchange_total(RealType et) {exchangeSum_ = et;}
71 <        
89 >
90    private:
91 <        
91 >
92      enum RNEMDTypeEnum {
93 <      rnemdKinetic,
93 >      rnemdKineticSwap,
94 >      rnemdKineticScale,
95 >      rnemdKineticScaleVAM,
96 >      rnemdKineticScaleAM,
97 >      rnemdPxScale,
98 >      rnemdPyScale,
99 >      rnemdPzScale,
100        rnemdPx,
101        rnemdPy,
102        rnemdPz,
103 +      rnemdShiftScaleV,
104 +      rnemdShiftScaleVAM,
105        rnemdUnknown
106      };
107 <    
107 >    
108      SimInfo* info_;
109      RandNumGen* randNumGen_;
110 <    int nBins_;  
85 <    RealType swapTime_;
86 <    RealType exchangeSum_;
110 >    map<string, RNEMDTypeEnum> stringToEnumMap_;
111      RNEMDTypeEnum rnemdType_;
112 <    std::map<std::string, RNEMDTypeEnum> stringToEnumMap_;
113 <
114 <
112 >    string rnemdObjectSelection_;
113 >    SelectionEvaluator evaluator_;
114 >    SelectionManager seleMan_;
115 >    bool usePeriodicBoundaryConditions_;
116 >    bool outputTemp_;
117 >    bool outputVx_;
118 >    bool outputVy_;
119 >    bool output3DTemp_;
120 >    bool outputRotTemp_;
121 >    int nBins_; /**< The number of bins to divide the simulation box into.  */
122 >    /*!
123 >      The middle bin for the RNEMD method. midBin_ = nBins_/2;
124 >      Depending on the setting of the flux, this box should contain the minimum energy (temperature)
125 >      within the simulation.
126 >    */
127 >    int midBin_;
128 >    int rnemdLogWidth_; /**< Number of elements to print out in logs */
129 >    RealType zShift_;
130 >    RealType exchangeTime_;
131 >    RealType targetFlux_;
132 >    RealType targetJzKE_;
133 >    RealType targetJzpx_;
134 >    RealType targetJzpy_;
135 >    RealType targetJzpz_;
136 >    Vector3d jzp_, njzp_;
137 >    RealType exchangeSum_;
138 >    int failTrialCount_;
139 >    int failRootCount_;
140 >    ofstream tempLog_, vxzLog_, vyzLog_;
141 >    ofstream xTempLog_, yTempLog_, zTempLog_, rotTempLog_;
142 >    // keeps track of what's being averaged
143 >    vector<RealType> tempHist_, pxzHist_, pyzHist_, mHist_;
144 >    vector<RealType> xTempHist_, yTempHist_, zTempHist_, rotTempHist_;
145 >    // keeps track of the number of degrees of freedom being averaged
146 >    //vector<int> pxzCount_, pyzCount_;
147 >    vector<int> tempCount_, xyzTempCount_, rotTempCount_;
148    };
149  
150   }
151 < #endif //INTEGRATORS_VELOCITIZER_HPP
151 > #endif //INTEGRATORS_RNEMD_HPP

Comparing:
trunk/src/integrators/RNEMD.hpp (property svn:keywords), Revision 1330 by skuang, Thu Mar 19 21:03:36 2009 UTC vs.
branches/development/src/integrators/RNEMD.hpp (property svn:keywords), Revision 1722 by gezelter, Thu May 24 14:23:40 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines