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

Comparing trunk/src/integrators/NPTxyz.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 60 | Line 60 | namespace oopse {
60   namespace oopse {
61  
62      
63 <  double NPTxyz::calcConservedQuantity(){
63 >  RealType NPTxyz::calcConservedQuantity(){
64  
65      // We need NkBT a lot, so just set it here: This is the RAW number
66      // of integrableObjects, so no subtraction or addition of constraints or
# Line 72 | Line 72 | namespace oopse {
72      // of freedom).  
73      fkBT = info_->getNdf()*OOPSEConstant::kB *targetTemp;        
74  
75 <    double conservedQuantity;
76 <    double totalEnergy;
77 <    double thermostat_kinetic;
78 <    double thermostat_potential;
79 <    double barostat_kinetic;
80 <    double barostat_potential;
81 <    double trEta;
75 >    RealType conservedQuantity;
76 >    RealType totalEnergy;
77 >    RealType thermostat_kinetic;
78 >    RealType thermostat_potential;
79 >    RealType barostat_kinetic;
80 >    RealType barostat_potential;
81 >    RealType trEta;
82  
83      totalEnergy = thermo.getTotalE();
84  
# Line 86 | Line 86 | namespace oopse {
86  
87      thermostat_potential = fkBT* integralOfChidt / OOPSEConstant::energyConvert;
88  
89 <    SquareMatrix<double, 3> tmp = eta.transpose() * eta;
89 >    SquareMatrix<RealType, 3> tmp = eta.transpose() * eta;
90      trEta = tmp.trace();
91  
92      barostat_kinetic = NkBT * tb2 * trEta /(2.0 * OOPSEConstant::energyConvert);
# Line 106 | Line 106 | namespace oopse {
106  
107      int i,j,k;
108      Mat3x3d scaleMat;
109 <    double eta2ij, scaleFactor;
110 <    double bigScale, smallScale, offDiagMax;
109 >    RealType eta2ij, scaleFactor;
110 >    RealType bigScale, smallScale, offDiagMax;
111      Mat3x3d hm;
112      Mat3x3d hmnew;
113  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines