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 |
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 |
|
|
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); |
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 |
|
|