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

Comparing:
trunk/src/integrators/NPTxyz.cpp (file contents), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/integrators/NPTxyz.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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]  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/NPTxyz.hpp"
47   #include "primitives/Molecule.hpp"
48 < #include "utils/OOPSEConstant.hpp"
48 > #include "utils/PhysicalConstants.hpp"
49   #include "utils/simError.h"
50  
51   // Basic non-isotropic thermostating and barostating via the Melchionna
# Line 57 | Line 58
58   //
59   //    Hoover, W. G., 1986, Phys. Rev. A, 34, 2499.
60  
61 < namespace oopse {
61 > namespace OpenMD {
62  
63      
64 < double NPTxyz::calcConservedQuantity(){
64 >  RealType NPTxyz::calcConservedQuantity(){
65  
66 +    chi= currentSnapshot_->getChi();
67 +    integralOfChidt = currentSnapshot_->getIntegralOfChiDt();
68 +    loadEta();
69 +
70      // We need NkBT a lot, so just set it here: This is the RAW number
71      // of integrableObjects, so no subtraction or addition of constraints or
72      // orientational degrees of freedom:
73 <    NkBT = info_->getNGlobalIntegrableObjects()*OOPSEConstant::kB *targetTemp;
73 >    NkBT = info_->getNGlobalIntegrableObjects()*PhysicalConstants::kB *targetTemp;
74  
75      // fkBT is used because the thermostat operates on more degrees of freedom
76      // than the barostat (when there are particles with orientational degrees
77      // of freedom).  
78 <    fkBT = info_->getNdf()*OOPSEConstant::kB *targetTemp;        
78 >    fkBT = info_->getNdf()*PhysicalConstants::kB *targetTemp;        
79  
80 <    double conservedQuantity;
81 <    double totalEnergy;
82 <    double thermostat_kinetic;
83 <    double thermostat_potential;
84 <    double barostat_kinetic;
85 <    double barostat_potential;
86 <    double trEta;
80 >    RealType conservedQuantity;
81 >    RealType totalEnergy;
82 >    RealType thermostat_kinetic;
83 >    RealType thermostat_potential;
84 >    RealType barostat_kinetic;
85 >    RealType barostat_potential;
86 >    RealType trEta;
87  
88      totalEnergy = thermo.getTotalE();
89  
90 <    thermostat_kinetic = fkBT * tt2 * chi * chi /(2.0 * OOPSEConstant::energyConvert);
90 >    thermostat_kinetic = fkBT * tt2 * chi * chi /(2.0 * PhysicalConstants::energyConvert);
91  
92 <    thermostat_potential = fkBT* integralOfChidt / OOPSEConstant::energyConvert;
92 >    thermostat_potential = fkBT* integralOfChidt / PhysicalConstants::energyConvert;
93  
94 <    SquareMatrix<double, 3> tmp = eta.transpose() * eta;
94 >    SquareMatrix<RealType, 3> tmp = eta.transpose() * eta;
95      trEta = tmp.trace();
96  
97 <    barostat_kinetic = NkBT * tb2 * trEta /(2.0 * OOPSEConstant::energyConvert);
97 >    barostat_kinetic = NkBT * tb2 * trEta /(2.0 * PhysicalConstants::energyConvert);
98  
99 <    barostat_potential = (targetPressure * thermo.getVolume() / OOPSEConstant::pressureConvert) /OOPSEConstant::energyConvert;
99 >    barostat_potential = (targetPressure * thermo.getVolume() / PhysicalConstants::pressureConvert) /PhysicalConstants::energyConvert;
100  
101      conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential +
102 <        barostat_kinetic + barostat_potential;
102 >      barostat_kinetic + barostat_potential;
103  
104  
105      return conservedQuantity;
106  
107 < }
107 >  }
108  
109      
110 < void NPTxyz::scaleSimBox(){
110 >  void NPTxyz::scaleSimBox(){
111  
112      int i,j,k;
113      Mat3x3d scaleMat;
114 <    double eta2ij, scaleFactor;
115 <    double bigScale, smallScale, offDiagMax;
114 >    RealType eta2ij, scaleFactor;
115 >    RealType bigScale, smallScale, offDiagMax;
116      Mat3x3d hm;
117      Mat3x3d hmnew;
118  
119  
120  
121 <  // Scale the box after all the positions have been moved:
121 >    // Scale the box after all the positions have been moved:
122  
123 <  // Use a taylor expansion for eta products:  Hmat = Hmat . exp(dt * etaMat)
124 <  //  Hmat = Hmat . ( Ident + dt * etaMat  + dt^2 * etaMat*etaMat / 2)
123 >    // Use a taylor expansion for eta products:  Hmat = Hmat . exp(dt * etaMat)
124 >    //  Hmat = Hmat . ( Ident + dt * etaMat  + dt^2 * etaMat*etaMat / 2)
125  
126      bigScale = 1.0;
127      smallScale = 1.0;
128      offDiagMax = 0.0;
129  
130      for(i=0; i<3; i++){
131 <        for(j=0; j<3; j++){
132 <            scaleMat(i, j) = 0.0;
133 <            if(i==j) {
134 <                scaleMat(i, j) = 1.0;
135 <            }
136 <        }
131 >      for(j=0; j<3; j++){
132 >        scaleMat(i, j) = 0.0;
133 >        if(i==j) {
134 >          scaleMat(i, j) = 1.0;
135 >        }
136 >      }
137      }
138  
139      for(i=0;i<3;i++){
140  
141 <    // calculate the scaleFactors
141 >      // calculate the scaleFactors
142  
143 <        scaleFactor = exp(dt*eta(i, i));
143 >      scaleFactor = exp(dt*eta(i, i));
144  
145 <        scaleMat(i, i) = scaleFactor;
145 >      scaleMat(i, i) = scaleFactor;
146  
147 <        if (scaleMat(i, i) > bigScale) {
148 <            bigScale = scaleMat(i, i);
149 <        }
147 >      if (scaleMat(i, i) > bigScale) {
148 >        bigScale = scaleMat(i, i);
149 >      }
150          
151 <        if (scaleMat(i, i) < smallScale) {
152 <            smallScale = scaleMat(i, i);
153 <        }
151 >      if (scaleMat(i, i) < smallScale) {
152 >        smallScale = scaleMat(i, i);
153 >      }
154      }
155  
156      if ((bigScale > 1.1) || (smallScale < 0.9)) {
157 <        sprintf( painCave.errMsg,
158 <            "NPTxyz error: Attempting a Box scaling of more than 10 percent.\n"
159 <            " Check your tauBarostat, as it is probably too small!\n\n"
160 <            " scaleMat = [%lf\t%lf\t%lf]\n"
161 <            "            [%lf\t%lf\t%lf]\n"
162 <            "            [%lf\t%lf\t%lf]\n",
163 <        scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2),
164 <        scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2),
165 <        scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2));
166 <        painCave.isFatal = 1;
167 <        simError();
157 >      sprintf( painCave.errMsg,
158 >               "NPTxyz error: Attempting a Box scaling of more than 10 percent.\n"
159 >               " Check your tauBarostat, as it is probably too small!\n\n"
160 >               " scaleMat = [%lf\t%lf\t%lf]\n"
161 >               "            [%lf\t%lf\t%lf]\n"
162 >               "            [%lf\t%lf\t%lf]\n",
163 >               scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2),
164 >               scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2),
165 >               scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2));
166 >      painCave.isFatal = 1;
167 >      simError();
168      } else {
169  
170 <        Mat3x3d hmat = currentSnapshot_->getHmat();
171 <        hmat = hmat *scaleMat;
172 <        currentSnapshot_->setHmat(hmat);
170 >      Mat3x3d hmat = currentSnapshot_->getHmat();
171 >      hmat = hmat *scaleMat;
172 >      currentSnapshot_->setHmat(hmat);
173      }
174 < }
174 >  }
175  
176 < void NPTxyz::loadEta() {
176 >  void NPTxyz::loadEta() {
177      eta= currentSnapshot_->getEta();
178 < }
178 >  }
179  
180   }

Comparing:
trunk/src/integrators/NPTxyz.cpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/integrators/NPTxyz.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