ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/integrators/NgammaT.cpp

Comparing trunk/src/integrators/NgammaT.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

#	Line 35 | Line 35
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).
38	>	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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 62 | Line 63 | namespace OpenMD {
63
64		}
65		void NgammaT::evolveEtaA() {
66	<	Mat3x3d hmat = currentSnapshot_->getHmat();
66	>	Mat3x3d hmat = snap->getHmat();
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);
#	Line 74 | Line 75 | namespace OpenMD {
75		}
76
77		void NgammaT::evolveEtaB() {
78	<	Mat3x3d hmat = currentSnapshot_->getHmat();
78	>	Mat3x3d hmat = snap->getHmat();
79		RealType hz = hmat(2, 2);
80		RealType Axy = hmat(0,0) * hmat(1, 1);
81		prevEta = eta;
#	Line 92 | Line 93 | namespace OpenMD {
93		vScale(i, j) = eta(i, j);
94
95		if (i == j) {
96	<	vScale(i, j) += chi;
96	>	vScale(i, j) += thermostat.first;
97		}
98		}
99		}
#	Line 119 | Line 120 | namespace OpenMD {
120		scaleMat(0, 0) = exp(dt*eta(0, 0));
121		scaleMat(1, 1) = exp(dt*eta(1, 1));
122		scaleMat(2, 2) = exp(dt*eta(2, 2));
123	<	Mat3x3d hmat = currentSnapshot_->getHmat();
123	>	Mat3x3d hmat = snap->getHmat();
124		hmat = hmat *scaleMat;
125	<	currentSnapshot_->setHmat(hmat);
125	>	snap->setHmat(hmat);
126
127		}
128
#	Line 141 | Line 142 | namespace OpenMD {
142
143		RealType NgammaT::calcConservedQuantity(){
144
145	<	chi= currentSnapshot_->getChi();
145	<	integralOfChidt = currentSnapshot_->getIntegralOfChiDt();
145	>	thermostat = snap->getThermostat();
146		loadEta();
147
148		// We need NkBT a lot, so just set it here: This is the RAW number
#	Line 156 | Line 156 | namespace OpenMD {
156		fkBT = info_->getNdf()*PhysicalConstants::kB *targetTemp;
157
158
159	<	RealType totalEnergy = thermo.getTotalE();
159	>	RealType totalEnergy = thermo.getTotalEnergy();
160
161	<	RealType thermostat_kinetic = fkBT * tt2 * chi * chi /(2.0 * PhysicalConstants::energyConvert);
161	>	RealType thermostat_kinetic = fkBT * tt2 * thermostat.first *
162	>	thermostat.first /(2.0 * PhysicalConstants::energyConvert);
163
164	<	RealType thermostat_potential = fkBT* integralOfChidt / PhysicalConstants::energyConvert;
164	>	RealType thermostat_potential = fkBT* thermostat.second / PhysicalConstants::energyConvert;
165
166		SquareMatrix<RealType, 3> tmp = eta.transpose() * eta;
167		RealType trEta = tmp.trace();
#	Line 169 | Line 170 | namespace OpenMD {
170
171		RealType barostat_potential = (targetPressure * thermo.getVolume() / PhysicalConstants::pressureConvert) /PhysicalConstants::energyConvert;
172
173	<	Mat3x3d hmat = currentSnapshot_->getHmat();
173	>	Mat3x3d hmat = snap->getHmat();
174		RealType hz = hmat(2, 2);
175		RealType area = hmat(0,0) * hmat(1, 1);
176
#	Line 181 | Line 182 | namespace OpenMD {
182		}
183
184		void NgammaT::loadEta() {
185	<	eta= currentSnapshot_->getEta();
185	>	eta= snap->getBarostat();
186
187		//if (!eta.isDiagonal()) {
188		//    sprintf( painCave.errMsg,
#	Line 192 | Line 193 | namespace OpenMD {
193		}
194
195		void NgammaT::saveEta() {
196	<	currentSnapshot_->setEta(eta);
196	>	snap->setBarostat(eta);
197		}
198
199		}

Comparing trunk/src/integrators/NgammaT.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines