ViewVC Help

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

root/OpenMD/branches/development/src/io/Globals.hpp

Comparing:
trunk/src/io/Globals.hpp (file contents), Revision 1331 by gezelter, Thu Apr 2 16:04:52 2009 UTC vs.
branches/development/src/io/Globals.hpp (file contents), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2	>	* Copyright (c) 2005, 2010 The University of Notre Dame. All Rights Reserved.
3		*
4		* The University of Notre Dame grants you ("Licensee") a
5		* non-exclusive, royalty free, license to use, modify and
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		#ifndef IO_GLOBALS_HPP
#	Line 51 | Line 52
52
53		#include "types/Component.hpp"
54		#include "types/ZconsStamp.hpp"
55	+	#include "types/RestraintStamp.hpp"
56		#include "types/MoleculeStamp.hpp"
57	+	#include "flucq/FluctuatingChargeParameters.hpp"
58	+	#include "rnemd/RNEMDParameters.hpp"
59		#include "utils/ParameterManager.hpp"
60
61	<	namespace oopse {
61	>	namespace OpenMD {
62		class Globals : public DataHolder {
63		public:
64		typedef std::pair<int, int> intPair;
#	Line 89 | Line 93 | namespace oopse {
93		DeclareParameter(OrthoBoxTolerance, RealType);
94		DeclareParameter(Minimizer, std::string);
95		DeclareParameter(MinimizerMaxIter, RealType);
96	<	DeclareParameter(MinimizerWriteFrq, int);
96	>	DeclareParameter(MinimizerWriteFreq, int);
97		DeclareParameter(MinimizerStepSize, RealType);
98		DeclareParameter(MinimizerFTol, RealType);
99		DeclareParameter(MinimizerGTol, RealType);
#	Line 98 | Line 102 | namespace oopse {
102		DeclareParameter(ZconsGap, RealType);
103		DeclareParameter(ZconsFixtime, RealType);
104		DeclareParameter(ZconsUsingSMD, bool);
105	<	DeclareParameter(UseSolidThermInt, bool);
102	<	DeclareParameter(UseLiquidThermInt, bool);
105	>	DeclareParameter(UseThermodynamicIntegration, bool);
106		DeclareParameter(ThermodynamicIntegrationLambda, RealType);
107		DeclareParameter(ThermodynamicIntegrationK, RealType);
108		DeclareParameter(ForceFieldVariant, std::string);
109		DeclareParameter(ForceFieldFileName, std::string);
107	–	DeclareParameter(ThermIntDistSpringConst, RealType);
108	–	DeclareParameter(ThermIntThetaSpringConst, RealType);
109	–	DeclareParameter(ThermIntOmegaSpringConst, RealType);
110		DeclareParameter(SurfaceTension, RealType);
111		DeclareParameter(PrintPressureTensor, bool);
112	+	DeclareParameter(PrintHeatFlux, bool);
113		DeclareParameter(TaggedAtomPair, intPair);
114		DeclareParameter(PrintTaggedPairDistance, bool);
115		DeclareParameter(ElectrostaticSummationMethod, std::string);
116		DeclareParameter(ElectrostaticScreeningMethod, std::string);
117		DeclareParameter(DampingAlpha, RealType);
118		DeclareParameter(Dielectric, RealType);
119	+	DeclareParameter(CutoffMethod, std::string);
120		DeclareParameter(CutoffPolicy, std::string);
121		DeclareParameter(SwitchingFunctionType, std::string);
122		DeclareParameter(CompressDumpFile, bool);
123		DeclareParameter(OutputForceVector, bool);
124	+	DeclareParameter(OutputParticlePotential, bool);
125	+	DeclareParameter(OutputElectricField, bool);
126	+	DeclareParameter(OutputFluctuatingCharges, bool);
127		DeclareParameter(SkinThickness, RealType);
128		DeclareParameter(StatFileFormat, std::string);
129		DeclareParameter(HydroPropFile, std::string);
#	Line 135 | Line 140 | namespace oopse {
140		DeclareParameter(MTM_Io, RealType);
141		DeclareParameter(MTM_Sigma, RealType);
142		DeclareParameter(MTM_R, RealType);
143	<	DeclareParameter(UseRNEMD, bool);
144	<	DeclareParameter(RNEMD_swapTime, RealType);
145	<	DeclareParameter(RNEMD_nBins, int);
146	<	DeclareParameter(RNEMD_swapType, std::string);
147	<	DeclareParameter(RNEMD_objectSelection, std::string);
148	<
143	>	DeclareParameter(UseRestraints, bool);
144	>	DeclareParameter(Restraint_file, std::string);
145	>	DeclareParameter(HULL_Method, std::string);
146	>	DeclareParameter(Alpha, RealType);
147	>	DeclareAlterableParameter(MDfileVersion, int);
148	>
149		public:
150		bool addComponent(Component* comp);
151		bool addZConsStamp(ZConsStamp* zcons);
152	+	bool addRestraintStamp(RestraintStamp* rest);
153		bool addMoleculeStamp(MoleculeStamp* molStamp);
154		int getNComponents() {return components_.size();}
155		std::vector<Component*> getComponents() {return components_;}
#	Line 152 | Line 158 | namespace oopse {
158		int getNZconsStamps() {return zconstraints_.size();}
159		std::vector<ZConsStamp*> getZconsStamps() {return zconstraints_;}
160		ZConsStamp* getZconsStampAt(int index) {return zconstraints_.at(index);}
161	+
162	+	int getNRestraintStamps() {return restraints_.size();}
163	+	std::vector<RestraintStamp*> getRestraintStamps() {return restraints_;}
164	+	RestraintStamp* getRestraintStampAt(int index) {return restraints_.at(index);}
165	+
166	+	bool addFluctuatingChargeParameters(FluctuatingChargeParameters* flucqPars);
167	+	FluctuatingChargeParameters* getFluctuatingChargeParameters() {return flucQpars_;}
168	+
169	+	bool addRNEMDParameters(RNEMDParameters* rnemdPars);
170	+	RNEMDParameters* getRNEMDParameters() {return rnemdPars_;}
171
172		virtual void validate();
173		private:
174
175		std::vector<Component*> components_;
176		std::vector<ZConsStamp*> zconstraints_;
177	+	std::vector<RestraintStamp*> restraints_;
178		std::map<std::string, MoleculeStamp*> moleculeStamps_;
179		std::pair<int, int> taggedAtomPair_;
180	+	FluctuatingChargeParameters* flucQpars_;
181	+	RNEMDParameters* rnemdPars_;
182		};
183		}
184		#endif
166	–

Comparing:
trunk/src/io/Globals.hpp (property svn:keywords), Revision 1331 by gezelter, Thu Apr 2 16:04:52 2009 UTC vs.
branches/development/src/io/Globals.hpp (property svn:keywords), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

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

Diff Legend

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