ViewVC Help

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

root/OpenMD/branches/development/src/integrators/Integrator.hpp

Comparing:
trunk/src/integrators/Integrator.hpp (file contents), Revision 417 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
branches/development/src/integrators/Integrator.hpp (file contents), Revision 1715 by gezelter, Tue May 22 21:55:31 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 Integrator.hpp
45	<	* @author tlin
46	<	* @date 11/08/2004
47	<	* @time 13:25am
48	<	* @version 1.0
49	<	*/
43	>	/**
44	>	* @file Integrator.hpp
45	>	* @author tlin
46	>	* @date 11/08/2004
47	>	* @time 13:25am
48	>	* @version 1.0
49	>	*/
50
51		#ifndef INTEGRATORS_INTEGRATOR_HPP
52		#define INTEGRATORS_INTEGRATOR_HPP
#	Line 54 | Line 55
55		#include "restraints/ThermoIntegrationForceManager.hpp"
56		#include "io/DumpWriter.hpp"
57		#include "io/StatWriter.hpp"
58	<	#include "io/RestWriter.hpp"
58	>	#include "integrators/RotationAlgorithm.hpp"
59	>	#include "integrators/FluctuatingChargePropagator.hpp"
60		#include "integrators/Velocitizer.hpp"
61	+	#include "integrators/RNEMD.hpp"
62	+	#include "constraints/Rattle.hpp"
63
64	<	namespace oopse {
64	>	namespace OpenMD {
65
66
67	<	/**
68	<	* @class Integrator Integrator.hpp "integrators/Integrator.hpp"
69	<	* @brief Base class of Integrator
70	<	* @todo document
71	<	*/
72	<	class Integrator {
73	<	public:
67	>	/**
68	>	* @class Integrator Integrator.hpp "integrators/Integrator.hpp"
69	>	* @brief Base class of Integrator
70	>	* @todo document
71	>	*/
72	>	class Integrator {
73	>	public:
74
75	<	virtual ~Integrator();
75	>	virtual ~Integrator();
76
77	<	//avoid public virtual function
78	<	void integrate() {
79	<	doIntegrate();
80	<	}
77	>	//avoid public virtual function
78	>	void integrate() {
79	>	doIntegrate();
80	>	}
81
82	<	void update() {
83	<	doUpdate();
84	<	}
82	>	void updateSizes() {
83	>	doUpdateSizes();
84	>	flucQ_->updateSizes();
85	>	}
86
87	<	void setForceManager(ForceManager* forceMan) {
83	<	if (forceMan_ != forceMan && forceMan_  != NULL) {
84	<	delete forceMan_;
85	<	}
86	<	forceMan_ = forceMan;
87	<	}
87	>	void setForceManager(ForceManager* forceMan) {
88
89	<	void setVelocitizer(Velocitizer* velocitizer) {
90	<	if (velocitizer_ != velocitizer && velocitizer_  != NULL) {
91	<	delete velocitizer_;
92	<	}
93	<	velocitizer_  = velocitizer;
94	<	}
95	<
96	<	protected:
89	>	if (forceMan_ != forceMan && forceMan_  != NULL) {
90	>	delete forceMan_;
91	>	}
92	>	forceMan_ = forceMan;
93	>	}
94
95	<	Integrator(SimInfo* info);
95	>	void setVelocitizer(Velocitizer* velocitizer) {
96	>	if (velocitizer_ != velocitizer && velocitizer_ != NULL) {
97	>	delete velocitizer_;
98	>	}
99	>	velocitizer_ = velocitizer;
100	>	}
101
102	<	virtual void doIntegrate() = 0;
102	>	void setFluctuatingChargePropagator(FluctuatingChargePropagator* prop) {
103	>	if (prop != flucQ_ && flucQ_ != NULL){
104	>	delete flucQ_;
105	>	}
106	>	flucQ_ = prop;
107	>	}
108
109	<	virtual void doUpdate() {}
109	>	void setRotationAlgorithm(RotationAlgorithm* algo) {
110	>	if (algo != rotAlgo_ && rotAlgo_ != NULL){
111	>	delete rotAlgo_;
112	>	}
113	>
114	>	rotAlgo_ = algo;
115	>	}
116	>
117	>	void setRNEMD(RNEMD* rnemd) {
118	>	if (rnemd_ != rnemd && rnemd_  != NULL) {
119	>	delete rnemd_;
120	>	}
121	>	rnemd_ = rnemd;
122	>	}
123	>
124	>	protected:
125	>
126	>	Integrator(SimInfo* info);
127	>
128	>	virtual void doIntegrate() = 0;
129	>
130	>	virtual void doUpdateSizes() {}
131
132	<	void saveConservedQuantity() {
133	<	currentSnapshot_->statData[Stats::CONSERVED_QUANTITY] = calcConservedQuantity();
134	<	}
132	>	void saveConservedQuantity() {
133	>	currentSnapshot_->statData[Stats::CONSERVED_QUANTITY] = calcConservedQuantity();
134	>	}
135
136	<	SimInfo* info_;
137	<	Globals* simParams;
138	<	ForceManager* forceMan_;
139	<	bool needPotential;
140	<	bool needStress;
141	<
142	<	Velocitizer* velocitizer_;
143	<	bool needVelocityScaling;
144	<	double targetScalingTemp;
136	>	SimInfo* info_;
137	>	Globals* simParams;
138	>	ForceManager* forceMan_;
139	>	RotationAlgorithm* rotAlgo_;
140	>	FluctuatingChargePropagator* flucQ_;
141	>	Rattle* rattle_;
142	>	Velocitizer* velocitizer_;
143	>	RNEMD* rnemd_;
144	>
145	>	bool needPotential;
146	>	bool needStress;
147	>	bool needReset;
148	>	bool needVelocityScaling;
149	>	RealType targetScalingTemp;
150	>
151	>	bool useRNEMD;
152
153	<	DumpWriter* dumpWriter;
154	<	StatWriter* statWriter;
155	<	RestWriter* restWriter;
121	<	Thermo thermo;
153	>	DumpWriter* dumpWriter;
154	>	StatWriter* statWriter;
155	>	Thermo thermo;
156
157	<	double runTime;
158	<	double sampleTime;
159	<	double statusTime;
160	<	double thermalTime;
161	<	double dt;
157	>	RealType runTime;
158	>	RealType sampleTime;
159	>	RealType statusTime;
160	>	RealType thermalTime;
161	>	RealType resetTime;
162	>	RealType RNEMD_exchangeTime;
163	>	RealType dt;
164
165	<	Snapshot* currentSnapshot_; //During the integration, the address of currentSnapshot Will not change
165	>	Snapshot* currentSnapshot_; //During the integration, the address of currentSnapshot Will not change
166
167
168	<	private:
168	>	private:
169
170	<	virtual double calcConservedQuantity() = 0;
170	>	virtual RealType calcConservedQuantity() = 0;
171
172	<	virtual DumpWriter* createDumpWriter() = 0;
172	>	virtual DumpWriter* createDumpWriter() = 0;
173
174	<	virtual StatWriter* createStatWriter() = 0;
175	<	};
174	>	virtual StatWriter* createStatWriter() = 0;
175	>	};
176
177
178		}

Comparing:
trunk/src/integrators/Integrator.hpp (property svn:keywords), Revision 417 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
branches/development/src/integrators/Integrator.hpp (property svn:keywords), Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

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

Diff Legend

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