ViewVC Help

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

root/OpenMD/branches/development/src/integrators/VelocityVerletIntegrator.cpp

Comparing:
trunk/src/integrators/VelocityVerletIntegrator.cpp (file contents), Revision 417 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
branches/development/src/integrators/VelocityVerletIntegrator.cpp (file contents), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 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		/**
44		* @file VelocityVerletIntegrator.cpp
45		* @author tlin
46		* @date 11/09/2004
46	–	* @time 16:16am
47		* @version 1.0
48		*/
49
50		#include "integrators/VelocityVerletIntegrator.hpp"
51		#include "integrators/DLM.hpp"
52		#include "utils/StringUtils.hpp"
53	+	#include "utils/ProgressBar.hpp"
54
55	<	namespace oopse {
56	<	VelocityVerletIntegrator::VelocityVerletIntegrator(SimInfo *info) : Integrator(info), rotAlgo(NULL) {
55	>	namespace OpenMD {
56	>	VelocityVerletIntegrator::VelocityVerletIntegrator(SimInfo *info) : Integrator(info) {
57		dt2 = 0.5 * dt;
57	–	rotAlgo = new DLM();
58	–	rattle = new Rattle(info);
58		}
59
60		VelocityVerletIntegrator::~VelocityVerletIntegrator() {
62	–	delete rotAlgo;
63	–	delete rattle;
61		}
62
63		void VelocityVerletIntegrator::initialize(){
64
65	<	forceMan_->init();
65	>	forceMan_->initialize();
66
67	<	// remove center of mass drift velocity (in case we passed in a configuration
68	<	// that was drifting
67	>	// remove center of mass drift velocity (in case we passed in a
68	>	// configuration that was drifting)
69		velocitizer_->removeComDrift();
70	+
71	+	// find the initial fluctuating charges.
72	+	flucQ_->initialize();
73
74		// initialize the forces before the first step
75	<	calcForce(true, true);
75	>	calcForce();
76
77	<	//execute constraint algorithm to make sure at the very beginning the system is constrained
77	>	// execute the constraint algorithm to make sure that the system is
78	>	// constrained at the very beginning
79		if (info_->getNGlobalConstraints() > 0) {
80	<	rattle->constraintA();
81	<	calcForce(true, true);
82	<	rattle->constraintB();
83	<	info_->getSnapshotManager()->advance();//copy the current snapshot to previous snapshot
80	>	rattle_->constraintA();
81	>	calcForce();
82	>	rattle_->constraintB();
83	>	//copy the current snapshot to previous snapshot
84	>	info_->getSnapshotManager()->advance();
85		}
86
87		if (needVelocityScaling) {
#	Line 89 | Line 91 | namespace oopse {
91		dumpWriter = createDumpWriter();
92
93		statWriter = createStatWriter();
94	<
93	<	if (simParams->getUseSolidThermInt()) {
94	<	restWriter = createRestWriter();
95	<	restWriter->writeZangle();
96	<	}
97	<
94	>
95		dumpWriter->writeDumpAndEor();
96	<
97	<
96	>
97	>	progressBar = new ProgressBar();
98	>
99		//save statistics, before writeStat,  we must save statistics
102	–	thermo.saveStat();
100		saveConservedQuantity();
101	<	statWriter->writeStat(currentSnapshot_->statData);
101	>	stats->collectStats();
102	>
103	>	if (simParams->getRNEMDParameters()->getUseRNEMD())
104	>	rnemd_->getStarted();
105	>
106	>	statWriter->writeStat();
107
108	<	currSample = sampleTime + currentSnapshot_->getTime();
109	<	currStatus =  statusTime + currentSnapshot_->getTime();;
110	<	currThermal = thermalTime +  + currentSnapshot_->getTime();
108	>	currSample = sampleTime + snap->getTime();
109	>	currStatus =  statusTime + snap->getTime();
110	>	currThermal = thermalTime + snap->getTime();
111	>	if (needReset) {
112	>	currReset = resetTime + snap->getTime();
113	>	}
114	>	if (simParams->getRNEMDParameters()->getUseRNEMD()){
115	>	currRNEMD = RNEMD_exchangeTime + snap->getTime();
116	>	}
117		needPotential = false;
118		needStress = false;
119
112	–	}
113	–
114	–	void VelocityVerletIntegrator::doIntegrate() {
115	–
116	–
117	–	initialize();
118	–
119	–	while (currentSnapshot_->getTime() < runTime) {
120	–
121	–	preStep();
122	–
123	–	integrateStep();
124	–
125	–	postStep();
126	–
120		}
121	+
122	+	void VelocityVerletIntegrator::doIntegrate() {
123
124	<	finalize();
124	>	initialize();
125
126	<	}
126	>	while (snap->getTime() < runTime) {
127	>	preStep();
128	>	integrateStep();
129	>	postStep();
130	>	}
131	>	finalize();
132	>	}
133
134
135	<	void VelocityVerletIntegrator::preStep() {
136	<	double difference = currentSnapshot_->getTime() + dt - currStatus;
135	>	void VelocityVerletIntegrator::preStep() {
136	>	RealType difference = snap->getTime() + dt - currStatus;
137
138	<	if (difference > 0 || fabs(difference) < oopse::epsilon) {
139	<	needPotential = true;
140	<	needStress = true;
138	>	if (difference > 0 || fabs(difference) < OpenMD::epsilon) {
139	>	needPotential = true;
140	>	needStress = true;
141	>	}
142		}
141	–
142	–	}
143
144	<	void VelocityVerletIntegrator::postStep() {
144	>	void VelocityVerletIntegrator::postStep() {
145	>
146	>	//save snapshot
147	>	info_->getSnapshotManager()->advance();
148
149	<	//save snapshot
150	<	info_->getSnapshotManager()->advance();
151	<
152	<	//increase time
153	<	currentSnapshot_->increaseTime(dt);
154	<
155	<	if (needVelocityScaling) {
156	<	if (currentSnapshot_->getTime() >= currThermal) {
154	<	velocitizer_->velocitize(targetScalingTemp);
155	<	currThermal += thermalTime;
149	>	//increase time
150	>	snap->increaseTime(dt);
151	>
152	>	if (needVelocityScaling) {
153	>	if (snap->getTime() >= currThermal) {
154	>	velocitizer_->velocitize(targetScalingTemp);
155	>	currThermal += thermalTime;
156	>	}
157		}
158	<	}
159	<
160	<	if (currentSnapshot_->getTime() >= currSample) {
161	<	dumpWriter->writeDumpAndEor();
158	>	if (useRNEMD) {
159	>	if (snap->getTime() >= currRNEMD) {
160	>	rnemd_->doRNEMD();
161	>	currRNEMD += RNEMD_exchangeTime;
162	>	}
163	>	rnemd_->collectData();
164	>	}
165
166	<	if (simParams->getUseSolidThermInt())
167	<	restWriter->writeZangle();
166	>	if (snap->getTime() >= currSample) {
167	>	dumpWriter->writeDumpAndEor();
168	>
169	>	currSample += sampleTime;
170	>	}
171
172	<	currSample += sampleTime;
173	<	}
174	<
175	<	if (currentSnapshot_->getTime() >= currStatus) {
176	<	//save statistics, before writeStat,  we must save statistics
177	<	thermo.saveStat();
178	<	saveConservedQuantity();
179	<	statWriter->writeStat(currentSnapshot_->statData);
172	>	if (snap->getTime() >= currStatus) {
173	>	//save statistics, before writeStat,  we must save statistics
174	>	stats->collectStats();
175	>	saveConservedQuantity();
176	>
177	>	if (simParams->getRNEMDParameters()->getUseRNEMD()) {
178	>	rnemd_->writeOutputFile();
179	>	}
180	>
181	>	statWriter->writeStat();
182	>
183	>	progressBar->setStatus(snap->getTime(), runTime);
184	>	progressBar->update();
185	>
186	>	needPotential = false;
187	>	needStress = false;
188	>	currStatus += statusTime;
189	>	}
190
191	<	needPotential = false;
192	<	needStress = false;
193	<	currStatus += statusTime;
191	>	if (needReset && snap->getTime() >= currReset) {
192	>	resetIntegrator();
193	>	currReset += resetTime;
194	>	}
195		}
178	–
179	–
180	–	}
196
197
198	<	void VelocityVerletIntegrator::finalize() {
199	<	dumpWriter->writeEor();
198	>	void VelocityVerletIntegrator::finalize() {
199	>	dumpWriter->writeEor();
200	>	if (simParams->getRNEMDParameters()->getUseRNEMD()) {
201	>	rnemd_->writeOutputFile();
202	>	}
203	>
204	>	delete dumpWriter;
205	>	delete statWriter;
206
207	<	if (simParams->getUseSolidThermInt()) {
208	<	restWriter->writeZangle();
188	<	delete restWriter;
189	<	restWriter = NULL;
207	>	dumpWriter = NULL;
208	>	statWriter = NULL;
209		}
191	–
192	–	delete dumpWriter;
193	–	delete statWriter;
194	–
195	–	dumpWriter = NULL;
196	–	statWriter = NULL;
197	–
198	–	}
210
211	<	void VelocityVerletIntegrator::integrateStep() {
211	>	void VelocityVerletIntegrator::integrateStep() {
212
213	<	moveA();
214	<	calcForce(needPotential, needStress);
215	<	moveB();
216	<	}
213	>	moveA();
214	>	calcForce();
215	>	moveB();
216	>	}
217
218
219	<	void VelocityVerletIntegrator::calcForce(bool needPotential,
220	<	bool needStress) {
221	<	forceMan_->calcForces(needPotential, needStress);
222	<	}
219	>	void VelocityVerletIntegrator::calcForce() {
220	>	forceMan_->calcForces();
221	>	flucQ_->applyConstraints();
222	>	}
223
224	<	DumpWriter* VelocityVerletIntegrator::createDumpWriter() {
225	<	return new DumpWriter(info_);
226	<	}
224	>	DumpWriter* VelocityVerletIntegrator::createDumpWriter() {
225	>	return new DumpWriter(info_);
226	>	}
227
228	<	StatWriter* VelocityVerletIntegrator::createStatWriter() {
229	<	// if solidThermInt is true, add extra information to the statfile
230	<	if (simParams->getUseSolidThermInt()){
231	<	StatsBitSet mask;
232	<	mask.set(Stats::TIME);
233	<	mask.set(Stats::TOTAL_ENERGY);
223	<	mask.set(Stats::POTENTIAL_ENERGY);
224	<	mask.set(Stats::KINETIC_ENERGY);
225	<	mask.set(Stats::TEMPERATURE);
226	<	mask.set(Stats::PRESSURE);
227	<	mask.set(Stats::CONSERVED_QUANTITY);
228	<	mask.set(Stats::VRAW);
229	<	mask.set(Stats::VHARM);
230	<	return new StatWriter(info_->getStatFileName(), mask);
228	>	StatWriter* VelocityVerletIntegrator::createStatWriter() {
229	>
230	>	stats = new Stats(info_);
231	>	statWriter = new StatWriter(info_->getStatFileName(), stats);
232	>
233	>	return statWriter;
234		}
232	–
233	–	return new StatWriter(info_->getStatFileName());
234	–	}
235
236	<	RestWriter* VelocityVerletIntegrator::createRestWriter(){
237	<	return new RestWriter(info_);
238	<	}
239	<
240	<
241	<	} //end namespace oopse
236	>	} //end namespace OpenMD

Comparing:
trunk/src/integrators/VelocityVerletIntegrator.cpp (property svn:keywords), Revision 417 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
branches/development/src/integrators/VelocityVerletIntegrator.cpp (property svn:keywords), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

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

Diff Legend

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