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

Comparing:
trunk/src/integrators/NPrT.cpp (file contents), Revision 539 by tim, Fri May 20 16:01:38 2005 UTC vs.
branches/development/src/integrators/NPrT.cpp (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   #include "brains/SimInfo.hpp"
# Line 44 | Line 45
45   #include "integrators/IntegratorCreator.hpp"
46   #include "integrators/NPrT.hpp"
47   #include "primitives/Molecule.hpp"
48 < #include "utils/OOPSEConstant.hpp"
48 > #include "utils/PhysicalConstants.hpp"
49   #include "utils/simError.h"
50  
51 < namespace oopse {
51 > namespace OpenMD {
52    NPrT::NPrT(SimInfo* info) : NPT(info) {
53      Globals* simParams = info_->getSimParams();
54      if (!simParams->haveSurfaceTension()) {
55        sprintf(painCave.errMsg,
56                "If you use the NPT integrator, you must set tauBarostat.\n");
57 <      painCave.severity = OOPSE_ERROR;
57 >      painCave.severity = OPENMD_ERROR;
58        painCave.isFatal = 1;
59        simError();
60      } else {
61 <      surfaceTension= simParams->getSurfaceTension();
61 >      surfaceTension= simParams->getSurfaceTension()* PhysicalConstants::surfaceTensionConvert * PhysicalConstants::energyConvert;
62      }
63  
64    }
65    void NPrT::evolveEtaA() {
66      Mat3x3d hmat = currentSnapshot_->getHmat();
67 <    double hz = hmat(2, 2);
68 <    double Axy = hmat(0,0) * hmat(1, 1);
69 <    double sx = -hz * (press(0, 0) - targetPressure/OOPSEConstant::pressureConvert);
70 <    double sy = -hz * (press(1, 1) - targetPressure/OOPSEConstant::pressureConvert);
71 <    eta(0,0) -= Axy * (sx - surfaceTension) / (NkBT*tb2);
72 <    eta(1,1) -= Axy * (sy - surfaceTension) / (NkBT*tb2);
73 <    eta(2,2) += dt2 *  instaVol * (press(2, 2) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2);
67 >    RealType hz = hmat(2, 2);
68 >    RealType Axy = hmat(0,0) * hmat(1, 1);
69 >    RealType sx = -hz * (press(0, 0) - targetPressure/PhysicalConstants::pressureConvert);
70 >    RealType sy = -hz * (press(1, 1) - targetPressure/PhysicalConstants::pressureConvert);
71 >    eta(0,0) -= dt2* Axy * (sx - surfaceTension) / (NkBT*tb2);
72 >    eta(1,1) -= dt2* Axy * (sy - surfaceTension) / (NkBT*tb2);
73 >    eta(2,2) += dt2 *  instaVol * (press(2, 2) - targetPressure/PhysicalConstants::pressureConvert) / (NkBT*tb2);
74      oldEta = eta;  
75    }
76  
77    void NPrT::evolveEtaB() {
78      Mat3x3d hmat = currentSnapshot_->getHmat();
79 <    double hz = hmat(2, 2);
80 <    double Axy = hmat(0,0) * hmat(1, 1);
79 >    RealType hz = hmat(2, 2);
80 >    RealType Axy = hmat(0,0) * hmat(1, 1);
81      prevEta = eta;
82 <    double sx = -hz * (press(0, 0) - targetPressure/OOPSEConstant::pressureConvert);
83 <    double sy = -hz * (press(1, 1) - targetPressure/OOPSEConstant::pressureConvert);
84 <    eta(0,0) = oldEta(0, 0) - Axy * (sx -surfaceTension) / (NkBT*tb2);
85 <    eta(1,1) = oldEta(1, 1) - Axy * (sy -surfaceTension) / (NkBT*tb2);
82 >    RealType sx = -hz * (press(0, 0) - targetPressure/PhysicalConstants::pressureConvert);
83 >    RealType sy = -hz * (press(1, 1) - targetPressure/PhysicalConstants::pressureConvert);
84 >    eta(0,0) = oldEta(0, 0) - dt2 * Axy * (sx -surfaceTension) / (NkBT*tb2);
85 >    eta(1,1) = oldEta(1, 1) - dt2 * Axy * (sy -surfaceTension) / (NkBT*tb2);
86      eta(2,2) = oldEta(2, 2) + dt2 *  instaVol *
87 <            (press(2, 2) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2);
87 >            (press(2, 2) - targetPressure/PhysicalConstants::pressureConvert) / (NkBT*tb2);
88    }
89  
90    void NPrT::calcVelScale(){
# Line 110 | Line 111 | namespace oopse {
111    void NPrT::getPosScale(const Vector3d& pos, const Vector3d& COM, int index, Vector3d& sc) {
112  
113      /**@todo */
114 <    Vector3d rj = (oldPos[index] + pos)/2.0 -COM;
114 >    Vector3d rj = (oldPos[index] + pos)/(RealType)2.0 -COM;
115      sc = eta * rj;
116    }
117  
# Line 128 | Line 129 | namespace oopse {
129  
130    bool NPrT::etaConverged() {
131      int i;
132 <    double diffEta, sumEta;
132 >    RealType diffEta, sumEta;
133  
134      sumEta = 0;
135      for(i = 0; i < 3; i++) {
# Line 140 | Line 141 | namespace oopse {
141      return ( diffEta <= etaTolerance );
142    }
143  
144 <  double NPrT::calcConservedQuantity(){
144 >  RealType NPrT::calcConservedQuantity(){
145  
146      chi= currentSnapshot_->getChi();
147      integralOfChidt = currentSnapshot_->getIntegralOfChiDt();
# Line 149 | Line 150 | namespace oopse {
150      // We need NkBT a lot, so just set it here: This is the RAW number
151      // of integrableObjects, so no subtraction or addition of constraints or
152      // orientational degrees of freedom:
153 <    NkBT = info_->getNGlobalIntegrableObjects()*OOPSEConstant::kB *targetTemp;
153 >    NkBT = info_->getNGlobalIntegrableObjects()*PhysicalConstants::kB *targetTemp;
154  
155      // fkBT is used because the thermostat operates on more degrees of freedom
156      // than the barostat (when there are particles with orientational degrees
157      // of freedom).  
158 <    fkBT = info_->getNdf()*OOPSEConstant::kB *targetTemp;    
158 >    fkBT = info_->getNdf()*PhysicalConstants::kB *targetTemp;    
159      
160  
161 <    double totalEnergy = thermo.getTotalE();
161 >    RealType totalEnergy = thermo.getTotalE();
162  
163 <    double thermostat_kinetic = fkBT * tt2 * chi * chi /(2.0 * OOPSEConstant::energyConvert);
163 >    RealType thermostat_kinetic = fkBT * tt2 * chi * chi /(2.0 * PhysicalConstants::energyConvert);
164  
165 <    double thermostat_potential = fkBT* integralOfChidt / OOPSEConstant::energyConvert;
165 >    RealType thermostat_potential = fkBT* integralOfChidt / PhysicalConstants::energyConvert;
166  
167 <    SquareMatrix<double, 3> tmp = eta.transpose() * eta;
168 <    double trEta = tmp.trace();
167 >    SquareMatrix<RealType, 3> tmp = eta.transpose() * eta;
168 >    RealType trEta = tmp.trace();
169      
170 <    double barostat_kinetic = NkBT * tb2 * trEta /(2.0 * OOPSEConstant::energyConvert);
170 >    RealType barostat_kinetic = NkBT * tb2 * trEta /(2.0 * PhysicalConstants::energyConvert);
171  
172 <    double barostat_potential = (targetPressure * thermo.getVolume() / OOPSEConstant::pressureConvert) /OOPSEConstant::energyConvert;
172 >    RealType barostat_potential = (targetPressure * thermo.getVolume() / PhysicalConstants::pressureConvert) /PhysicalConstants::energyConvert;
173  
174      Mat3x3d hmat = currentSnapshot_->getHmat();
175 <    double hz = hmat(2, 2);
176 <    double area = hmat(0,0) * hmat(1, 1);
175 >    RealType hz = hmat(2, 2);
176 >    RealType area = hmat(0,0) * hmat(1, 1);
177  
178 <    double conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential +
179 <      barostat_kinetic + barostat_potential - surfaceTension * area;
178 >    RealType conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential +
179 >      barostat_kinetic + barostat_potential - surfaceTension * area/ PhysicalConstants::energyConvert;
180  
181      return conservedQuantity;
182  

Comparing:
trunk/src/integrators/NPrT.cpp (property svn:keywords), Revision 539 by tim, Fri May 20 16:01:38 2005 UTC vs.
branches/development/src/integrators/NPrT.cpp (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