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 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/integrators/Integrator.hpp (file contents), Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC

#	Line 36 | Line 36
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).
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		/**
#	Line 54 | Line 55
55		#include "restraints/ThermoIntegrationForceManager.hpp"
56		#include "io/DumpWriter.hpp"
57		#include "io/StatWriter.hpp"
58	+	#include "integrators/RotationAlgorithm.hpp"
59	+	#include "flucq/FluctuatingChargePropagator.hpp"
60		#include "integrators/Velocitizer.hpp"
61	<	#include "integrators/RNEMD.hpp"
61	>	#include "rnemd/RNEMD.hpp"
62	>	#include "constraints/Rattle.hpp"
63
64		namespace OpenMD {
65
#	Line 75 | Line 79 | namespace OpenMD {
79		doIntegrate();
80		}
81
82	<	void update() {
83	<	doUpdate();
82	>	void updateSizes() {
83	>	doUpdateSizes();
84	>	flucQ_->updateSizes();
85		}
86
87		void setForceManager(ForceManager* forceMan) {
#	Line 85 | Line 90 | namespace OpenMD {
90		delete forceMan_;
91		}
92		forceMan_ = forceMan;
93	+	// forward this on:
94	+	if (flucQ_ != NULL) {
95	+	flucQ_->setForceManager(forceMan_);
96	+	}
97		}
98
99		void setVelocitizer(Velocitizer* velocitizer) {
#	Line 94 | Line 103 | namespace OpenMD {
103		velocitizer_ = velocitizer;
104		}
105
106	+	void setFluctuatingChargePropagator(FluctuatingChargePropagator* prop) {
107	+	if (prop != flucQ_ && flucQ_ != NULL){
108	+	delete flucQ_;
109	+	}
110	+	flucQ_ = prop;
111	+	if (forceMan_ != NULL) {
112	+	flucQ_->setForceManager(forceMan_);
113	+	}
114	+	}
115	+
116	+	void setRotationAlgorithm(RotationAlgorithm* algo) {
117	+	if (algo != rotAlgo_ && rotAlgo_ != NULL){
118	+	delete rotAlgo_;
119	+	}
120	+
121	+	rotAlgo_ = algo;
122	+	}
123	+
124		void setRNEMD(RNEMD* rnemd) {
125		if (rnemd_ != rnemd && rnemd_  != NULL) {
126		delete rnemd_;
#	Line 107 | Line 134 | namespace OpenMD {
134
135		virtual void doIntegrate() = 0;
136
137	<	virtual void doUpdate() {}
137	>	virtual void doUpdateSizes() {}
138
139		void saveConservedQuantity() {
140		currentSnapshot_->statData[Stats::CONSERVED_QUANTITY] = calcConservedQuantity();
#	Line 116 | Line 143 | namespace OpenMD {
143		SimInfo* info_;
144		Globals* simParams;
145		ForceManager* forceMan_;
146	+	RotationAlgorithm* rotAlgo_;
147	+	FluctuatingChargePropagator* flucQ_;
148	+	Rattle* rattle_;
149	+	Velocitizer* velocitizer_;
150	+	RNEMD* rnemd_;
151	+
152		bool needPotential;
153		bool needStress;
154		bool needReset;
122	–	Velocitizer* velocitizer_;
123	–	RNEMD* rnemd_;
155		bool needVelocityScaling;
156		RealType targetScalingTemp;
157

Comparing:
trunk/src/integrators/Integrator.hpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/integrators/Integrator.hpp (property svn:keywords), Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC

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

Diff Legend

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