ViewVC Help

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

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

Comparing:
trunk/src/io/Globals.cpp (file contents), Revision 866 by chuckv, Fri Jan 13 19:17:34 2006 UTC vs.
branches/development/src/io/Globals.cpp (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		#include <stdlib.h>
#	Line 49 | Line 50
50		#include "utils/MemoryUtils.hpp"
51		#include "utils/simError.h"
52
53	<	namespace oopse {
53	>	namespace OpenMD {
54		Globals::Globals() {
55		DefineParameter(ForceField, "forceField")
56
#	Line 57 | Line 58 | Globals::Globals() {
58		DefineOptionalParameter(Ensemble, "ensemble");
59		DefineOptionalParameter(Dt, "dt");
60		DefineOptionalParameter(RunTime, "runTime");
60	–	DefineOptionalParameter(InitialConfig, "initialConfig");
61		DefineOptionalParameter(FinalConfig, "finalConfig");
62		DefineOptionalParameter(SampleTime, "sampleTime");
63		DefineOptionalParameter(ResetTime, "resetTime");
64		DefineOptionalParameter(StatusTime, "statusTime");
65		DefineOptionalParameter(CutoffRadius, "cutoffRadius");
66		DefineOptionalParameter(SwitchingRadius, "switchingRadius");
67	–	DefineOptionalParameter(Dielectric, "dielectric");
67		DefineOptionalParameter(TempSet, "tempSet");
68		DefineOptionalParameter(ThermalTime, "thermalTime");
69	<	DefineOptionalParameter(TargetPressure, "targetPressure");
69	>	DefineOptionalParameter(TargetPressure, "targetPressure");
70		DefineOptionalParameter(TauThermostat, "tauThermostat");
71		DefineOptionalParameter(TauBarostat, "tauBarostat");
72		DefineOptionalParameter(ZconsTime, "zconsTime");
#	Line 76 | Line 75 | Globals::Globals() {
75		DefineOptionalParameter(Seed, "seed");
76		DefineOptionalParameter(Minimizer, "minimizer");
77		DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
78	<	DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
78	>	DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
79		DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
80		DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
81		DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
#	Line 89 | Line 88 | Globals::Globals() {
88		DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
89		DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
90		DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
91	<	DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
93	<	DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
94	<	DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
91	>	DefineOptionalParameter(DampingAlpha, "dampingAlpha");
92		DefineOptionalParameter(SurfaceTension, "surfaceTension");
93		DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
94	<	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
95	<	DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
96	<	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
94	>	DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
95	>	DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
96	>	DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
97		DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
98	<	DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
98	>	DefineOptionalParameter(HydroPropFile, "HydroPropFile");
99	>	DefineOptionalParameter(Viscosity, "viscosity");
100	>	DefineOptionalParameter(BeadSize, "beadSize");
101	>	DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
102	>	DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
103	>	DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
104	>	DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
105	>	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
106	>	DefineOptionalParameter(MTM_Ce, "MTM_Ce");
107	>	DefineOptionalParameter(MTM_G, "MTM_G");
108	>	DefineOptionalParameter(MTM_Io, "MTM_Io");
109	>	DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
110	>	DefineOptionalParameter(MTM_R, "MTM_R");
111	>	DefineOptionalParameter(Alpha, "alpha");
112	>
113	>
114		DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
115	+	DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
116		DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
117		DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
118		DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);
119	<	DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
120	<	DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
121	<	DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
122	<	DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
123	<	DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
124	<	DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
125	<	DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
126	<	DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
119	>	DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
120	>	DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
121	>	DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
122	>	DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
123	>	DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
124	>	DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
125	>	DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
126	>	DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false);
127		DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
128		DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");
129	+	DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
130	+	DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
131
132	+	DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
133	+	DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
134	+	DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
135	+	DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
136
137	<	deprecatedKeywords_.insert("nComponents");
138	<	deprecatedKeywords_.insert("nZconstraints");
137	>	deprecatedKeywords_.insert("nComponents");
138	>	deprecatedKeywords_.insert("nZconstraints");
139	>	deprecatedKeywords_.insert("initialConfig");
140	>	deprecatedKeywords_.insert("thermIntDistSpringConst");
141	>	deprecatedKeywords_.insert("thermIntThetaSpringConst");
142	>	deprecatedKeywords_.insert("thermIntOmegaSpringConst");
143	>	deprecatedKeywords_.insert("useSolidThermInt");
144	>	deprecatedKeywords_.insert("useLiquidThermInt");
145
146		}
147
148		Globals::~Globals() {
149		MemoryUtils::deletePointers(components_);
150		MemoryUtils::deletePointers(zconstraints_);
151	+	MemoryUtils::deletePointers(restraints_);
152		}
153
154		void Globals::validate() {
#	Line 130 | Line 156 | void Globals::validate() {
156
157		CheckParameter(ForceField, isNotEmpty());
158		CheckParameter(TargetTemp, isPositive());
159	<	CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  );
159	>	CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("LANGEVINHULL") || isEqualIgnoreCase("LHULL") || isEqualIgnoreCase("SMIPD"));
160		CheckParameter(Dt, isPositive());
161		CheckParameter(RunTime, isPositive());
136	–	CheckParameter(InitialConfig, isNotEmpty());
162		CheckParameter(FinalConfig, isNotEmpty());
163		CheckParameter(SampleTime, isNonNegative());
164		CheckParameter(ResetTime, isNonNegative());
#	Line 142 | Line 167 | void Globals::validate() {
167		CheckParameter(SwitchingRadius, isNonNegative());
168		CheckParameter(Dielectric, isPositive());
169		CheckParameter(ThermalTime,  isNonNegative());
145	–	CheckParameter(TargetPressure,  isPositive());
170		CheckParameter(TauThermostat, isPositive());
171		CheckParameter(TauBarostat, isPositive());
172		CheckParameter(ZconsTime, isPositive());
#	Line 150 | Line 174 | void Globals::validate() {
174		CheckParameter(Seed, isPositive());
175		CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
176		CheckParameter(MinimizerMaxIter, isPositive());
177	<	CheckParameter(MinimizerWriteFrq, isPositive());
177	>	CheckParameter(MinimizerWriteFreq, isPositive());
178		CheckParameter(MinimizerStepSize, isPositive());
179		CheckParameter(MinimizerFTol, isPositive());
180		CheckParameter(MinimizerGTol, isPositive());
#	Line 158 | Line 182 | void Globals::validate() {
182		CheckParameter(MinimizerLSMaxIter, isPositive());
183		CheckParameter(ZconsGap, isPositive());
184		CheckParameter(ZconsFixtime, isPositive());
185	<	CheckParameter(ThermodynamicIntegrationLambda, isPositive());
185	>	CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
186		CheckParameter(ThermodynamicIntegrationK, isPositive());
187		CheckParameter(ForceFieldVariant, isNotEmpty());
188		CheckParameter(ForceFieldFileName, isNotEmpty());
189	<	CheckParameter(ThermIntDistSpringConst, isPositive());
166	<	CheckParameter(ThermIntThetaSpringConst, isPositive());
167	<	CheckParameter(ThermIntOmegaSpringConst, isPositive());
168	<	CheckParameter(SurfaceTension, isPositive());
169	<	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
170	<	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
189	>	CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
190		CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
191	+	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
192	+	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
193		CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
173	–	//CheckParameter(StatFileFormat,);
174	–	//CheckParameter(MixingRule,);
194		CheckParameter(OrthoBoxTolerance, isPositive());
176	–	CheckParameter(ThermIntDistSpringConst, isPositive());
177	–	CheckParameter(ThermIntThetaSpringConst, isPositive());
178	–	CheckParameter(ThermIntOmegaSpringConst, isPositive());
195		CheckParameter(DampingAlpha,isNonNegative());
196		CheckParameter(SkinThickness, isPositive());
197	<
197	>	CheckParameter(Viscosity, isNonNegative());
198	>	CheckParameter(BeadSize, isPositive());
199	>	CheckParameter(FrozenBufferRadius, isPositive());
200	>	CheckParameter(LangevinBufferRadius, isPositive());
201	>	CheckParameter(NeighborListNeighbors, isPositive());
202	>	CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
203	>	CheckParameter(Alpha, isPositive());
204	>
205		for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
206		if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
207		std::ostringstream oss;
208		oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
209	<	throw OOPSEException(oss.str());
209	>	throw OpenMDException(oss.str());
210		}
211		}
212		}
213	<
213	>
214		bool Globals::addComponent(Component* comp) {
215		components_.push_back(comp);
216		return true;
#	Line 198 | Line 221 | bool Globals::addZConsStamp(ZConsStamp* zcons) {
221		return true;
222		}
223
224	+	bool Globals::addRestraintStamp(RestraintStamp* rest) {
225	+	restraints_.push_back(rest);
226	+	return true;
227	+	}
228	+
229	+	bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
230	+	if (flucQpars_ != NULL)
231	+	delete flucQpars_;
232	+
233	+	flucQpars_ = fqp;
234	+	return true;
235	+	}
236	+
237	+	bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
238	+	if (rnemdPars_ != NULL)
239	+	delete rnemdPars_;
240	+
241	+	rnemdPars_ = rnemdPars;
242	+	return true;
243	+	}
244	+
245		bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
246		std::string molStampName = molStamp->getName();
247		std::map<std::string, MoleculeStamp*>::iterator i;
#	Line 209 | Line 253 | bool Globals::addMoleculeStamp(MoleculeStamp* molStamp
253		} else {
254		std::ostringstream oss;
255		oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
256	<	throw OOPSEException(oss.str());
256	>	throw OpenMDException(oss.str());
257		}
258		return ret;
259		}

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 866 by chuckv, Fri Jan 13 19:17:34 2006 UTC vs.
branches/development/src/io/Globals.cpp (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