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 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1877 by gezelter, Thu Jun 6 15:43:35 2013 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, 234107 (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 45 | Line 46
46		#include <string>
47
48		#include "io/Globals.hpp"
49	+	#include "io/ParamConstraint.hpp"
50	+	#include "utils/MemoryUtils.hpp"
51		#include "utils/simError.h"
52
53	<	#include "io/ParamConstraint.hpp"
53	>	namespace OpenMD {
54	>	Globals::Globals() {
55	>
56	>	flucQpars_ = new FluctuatingChargeParameters();
57	>	rnemdPars_ = new RNEMDParameters();
58	>	minimizerPars_ = new MinimizerParameters();
59
60	<	namespace oopse {
53	<	Globals::Globals() {
54	<	DefineParameter(ForceField, "forceField")
55	<
56	<	DefineOptionalParameter(TargetTemp, "targetTemp");
57	<	DefineOptionalParameter(Ensemble, "ensemble");
58	<	DefineOptionalParameter(Dt, "dt");
59	<	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");
68	<	DefineOptionalParameter(TempSet, "tempSet");
69	<	DefineOptionalParameter(ThermalTime, "thermalTime");
70	<	DefineOptionalParameter(TargetPressure, "targetPressure");
71	<	DefineOptionalParameter(TauThermostat, "tauThermostat");
72	<	DefineOptionalParameter(TauBarostat, "tauBarostat");
73	<	DefineOptionalParameter(ZconsTime, "zconsTime");
74	<	DefineOptionalParameter(ZconsTol, "zconsTol");
75	<	DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
76	<	DefineOptionalParameter(Seed, "seed");
77	<	DefineOptionalParameter(Minimizer, "minimizer");
78	<	DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
79	<	DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
80	<	DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
81	<	DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
82	<	DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
83	<	DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
84	<	DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
85	<	DefineOptionalParameter(ZconsGap, "zconsGap");
86	<	DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
87	<	DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
88	<	DefineOptionalParameter(ThermodynamicIntegrationLambda, "thermodynamicIntegrationLambda");
89	<	DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
90	<	DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
91	<	DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
92	<	DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
93	<	DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
94	<	DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
95	<	DefineOptionalParameter(SurfaceTension, "surfaceTension");
96	<	DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
97	<	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
98	<	DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
99	<	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
100	<	DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101	<	DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
102	<	DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
103	<	DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
104	<	DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
105	<	DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);
106	<	DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
107	<	DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
108	<	DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
109	<	DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
110	<	DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
111	<	DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
112	<	DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
113	<	DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
114	<	DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
115	<	DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");
116	<
117	<
118	<	deprecatedKeywords_.insert("nComponents");
119	<	deprecatedKeywords_.insert("nZconstraints");
60	>	DefineParameter(ForceField, "forceField");
61
62	<	}
62	>	DefineOptionalParameter(TargetTemp, "targetTemp");
63	>	DefineOptionalParameter(Ensemble, "ensemble");
64	>	DefineOptionalParameter(Dt, "dt");
65	>	DefineOptionalParameter(RunTime, "runTime");
66	>	DefineOptionalParameter(FinalConfig, "finalConfig");
67	>	DefineOptionalParameter(SampleTime, "sampleTime");
68	>	DefineOptionalParameter(ResetTime, "resetTime");
69	>	DefineOptionalParameter(StatusTime, "statusTime");
70	>	DefineOptionalParameter(CutoffRadius, "cutoffRadius");
71	>	DefineOptionalParameter(SwitchingRadius, "switchingRadius");
72	>	DefineOptionalParameter(TempSet, "tempSet");
73	>	DefineOptionalParameter(ThermalTime, "thermalTime");
74	>	DefineOptionalParameter(TargetPressure, "targetPressure");
75	>	DefineOptionalParameter(TauThermostat, "tauThermostat");
76	>	DefineOptionalParameter(TauBarostat, "tauBarostat");
77	>	DefineOptionalParameter(ZconsTime, "zconsTime");
78	>	DefineOptionalParameter(ZconsTol, "zconsTol");
79	>	DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
80	>	DefineOptionalParameter(Seed, "seed");
81	>	DefineOptionalParameter(ZconsGap, "zconsGap");
82	>	DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
83	>	DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
84	>	DefineOptionalParameter(ThermodynamicIntegrationLambda,
85	>	"thermodynamicIntegrationLambda");
86	>	DefineOptionalParameter(ThermodynamicIntegrationK,
87	>	"thermodynamicIntegrationK");
88	>	DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89	>	DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90	>	DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91	>	DefineOptionalParameter(SurfaceTension, "surfaceTension");
92	>	DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93	>	DefineOptionalParameter(ElectricField, "electricField");
94
95	<	Globals::~Globals() {
95	>	DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
96	>	DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
97	>	DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
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,
105	>	"useMultipleTemperatureMethod");
106	>	DefineOptionalParameter(ElectrostaticSummationMethod,
107	>	"electrostaticSummationMethod");
108	>	DefineOptionalParameter(MTM_Ce, "MTM_Ce");
109	>	DefineOptionalParameter(MTM_G, "MTM_G");
110	>	DefineOptionalParameter(MTM_Io, "MTM_Io");
111	>	DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
112	>	DefineOptionalParameter(MTM_R, "MTM_R");
113	>	DefineOptionalParameter(Alpha, "alpha");
114
115	<
116	<	}
117	<
118	<	void Globals::validate() {
119	<	DataHolder::validate();
120	<
121	<	CheckParameter(ForceField, isNotEmpty());
122	<	CheckParameter(TargetTemp, isPositive());
123	<	CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
124	<	CheckParameter(Dt, isPositive());
125	<	CheckParameter(RunTime, isPositive());
126	<	CheckParameter(InitialConfig, isNotEmpty());
127	<	CheckParameter(FinalConfig, isNotEmpty());
128	<	CheckParameter(SampleTime, isNonNegative());
129	<	CheckParameter(ResetTime, isNonNegative());
130	<	CheckParameter(StatusTime, isNonNegative());
131	<	CheckParameter(CutoffRadius, isPositive());
132	<	CheckParameter(SwitchingRadius, isNonNegative());
133	<	CheckParameter(Dielectric, isPositive());
134	<	CheckParameter(ThermalTime,  isNonNegative());
135	<	CheckParameter(TargetPressure,  isPositive());
136	<	CheckParameter(TauThermostat, isPositive());
137	<	CheckParameter(TauBarostat, isPositive());
138	<	CheckParameter(ZconsTime, isPositive());
139	<	CheckParameter(ZconsTol, isPositive());
140	<	CheckParameter(Seed, isPositive());
141	<	CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
142	<	CheckParameter(MinimizerMaxIter, isPositive());
143	<	CheckParameter(MinimizerWriteFrq, isPositive());
144	<	CheckParameter(MinimizerStepSize, isPositive());
145	<	CheckParameter(MinimizerFTol, isPositive());
146	<	CheckParameter(MinimizerGTol, isPositive());
147	<	CheckParameter(MinimizerLSTol, isPositive());
148	<	CheckParameter(MinimizerLSMaxIter, isPositive());
149	<	CheckParameter(ZconsGap, isPositive());
150	<	CheckParameter(ZconsFixtime, isPositive());
151	<	CheckParameter(ThermodynamicIntegrationLambda, isPositive());
152	<	CheckParameter(ThermodynamicIntegrationK, isPositive());
153	<	CheckParameter(ForceFieldVariant, isNotEmpty());
154	<	CheckParameter(ForceFieldFileName, isNotEmpty());
155	<	CheckParameter(ThermIntDistSpringConst, isPositive());
156	<	CheckParameter(ThermIntThetaSpringConst, isPositive());
157	<	CheckParameter(ThermIntOmegaSpringConst, isPositive());
158	<	CheckParameter(SurfaceTension, isPositive());
159	<	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
160	<	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
161	<	CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
162	<	CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
163	<	//CheckParameter(StatFileFormat,);
164	<	//CheckParameter(MixingRule,);
165	<	CheckParameter(OrthoBoxTolerance, isPositive());
176	<	CheckParameter(ThermIntDistSpringConst, isPositive());
177	<	CheckParameter(ThermIntThetaSpringConst, isPositive());
178	<	CheckParameter(ThermIntOmegaSpringConst, isPositive());
179	<	CheckParameter(DampingAlpha,isNonNegative());
180	<	CheckParameter(SkinThickness, isPositive());
115	>
116	>	DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions,
117	>	"usePeriodicBoundaryConditions",
118	>	true);
119	>	DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial",
120	>	true);
121	>	DefineOptionalParameterWithDefaultValue(UseLongRangeCorrections,
122	>	"useLongRangeCorrections", true);
123	>	DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime",
124	>	false);
125	>	DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState,
126	>	"useInitialExtendedSystemState",
127	>	false);
128	>	DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance,
129	>	"orthoBoxTolerance", 1E-6);
130	>	DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod",
131	>	"SHIFTED_FORCE");
132	>	DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod,
133	>	"electrostaticScreeningMethod",
134	>	"DAMPED");
135	>	DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
136	>	DefineOptionalParameterWithDefaultValue(CompressDumpFile,
137	>	"compressDumpFile", false);
138	>	DefineOptionalParameterWithDefaultValue(PrintHeatFlux, "printHeatFlux",
139	>	false);
140	>	DefineOptionalParameterWithDefaultValue(OutputForceVector,
141	>	"outputForceVector", false);
142	>	DefineOptionalParameterWithDefaultValue(OutputParticlePotential,
143	>	"outputParticlePotential", false);
144	>	DefineOptionalParameterWithDefaultValue(OutputElectricField,
145	>	"outputElectricField", false);
146	>	DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges,
147	>	"outputFluctuatingCharges", false);
148	>	DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness",
149	>	1.0);
150	>	DefineOptionalParameterWithDefaultValue(StatFileFormat,
151	>	"statFileFormat",
152	>	"TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");
153	>	DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions,
154	>	"useSphericalBoundaryConditions",
155	>	false);
156	>	DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole,
157	>	"accumulateBoxDipole", false);
158	>	DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints",
159	>	false);
160	>	DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file",
161	>	"idealCrystal.in");
162	>	DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration,
163	>	"useThermodynamicIntegration",
164	>	false);
165	>	DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
166
167	<	for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
168	<	if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
169	<	std::cout << "Globals Error: can not find molecule stamp for component" << std::endl;
167	>	deprecatedKeywords_.insert("nComponents");
168	>	deprecatedKeywords_.insert("nZconstraints");
169	>	deprecatedKeywords_.insert("initialConfig");
170	>	deprecatedKeywords_.insert("thermIntDistSpringConst");
171	>	deprecatedKeywords_.insert("thermIntThetaSpringConst");
172	>	deprecatedKeywords_.insert("thermIntOmegaSpringConst");
173	>	deprecatedKeywords_.insert("useSolidThermInt");
174	>	deprecatedKeywords_.insert("useLiquidThermInt");
175	>	deprecatedKeywords_.insert("minimizerMaxIter");
176	>	deprecatedKeywords_.insert("minimizerWriteFreq");
177	>	deprecatedKeywords_.insert("minimizerStepSize");
178	>	deprecatedKeywords_.insert("minimizerFTol");
179	>	deprecatedKeywords_.insert("minimizerGTol");
180	>	deprecatedKeywords_.insert("minimizerLSTol");
181	>	deprecatedKeywords_.insert("minimizerLSMaxIter");
182	>
183	>
184	>	}
185	>
186	>	Globals::~Globals() {
187	>	MemoryUtils::deletePointers(components_);
188	>	MemoryUtils::deletePointers(zconstraints_);
189	>	MemoryUtils::deletePointers(restraints_);
190	>	}
191	>
192	>	void Globals::validate() {
193	>	DataHolder::validate();
194	>
195	>	CheckParameter(ForceField, isNotEmpty());
196	>	CheckParameter(TargetTemp, isPositive());
197	>	CheckParameter(Ensemble, isEqualIgnoreCase("NVE") ||
198	>	isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") ||
199	>	isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") ||
200	>	isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT")  ||
201	>	isEqualIgnoreCase("LANGEVINDYNAMICS") ||
202	>	isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") ||
203	>	isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") ||
204	>	isEqualIgnoreCase("NGT") ||
205	>	isEqualIgnoreCase("LANGEVINHULL") ||
206	>	isEqualIgnoreCase("LHULL") || isEqualIgnoreCase("SMIPD"));
207	>	CheckParameter(Dt, isPositive());
208	>	CheckParameter(RunTime, isPositive());
209	>	CheckParameter(FinalConfig, isNotEmpty());
210	>	CheckParameter(SampleTime, isNonNegative());
211	>	CheckParameter(ResetTime, isNonNegative());
212	>	CheckParameter(StatusTime, isNonNegative());
213	>	CheckParameter(CutoffRadius, isPositive());
214	>	CheckParameter(SwitchingRadius, isNonNegative());
215	>	CheckParameter(Dielectric, isPositive());
216	>	CheckParameter(ThermalTime,  isNonNegative());
217	>	CheckParameter(TauThermostat, isPositive());
218	>	CheckParameter(TauBarostat, isPositive());
219	>	CheckParameter(ZconsTime, isPositive());
220	>	CheckParameter(ZconsTol, isPositive());
221	>	CheckParameter(Seed, isPositive());
222	>	CheckParameter(ZconsGap, isPositive());
223	>	CheckParameter(ZconsFixtime, isPositive());
224	>	CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
225	>	CheckParameter(ThermodynamicIntegrationK, isPositive());
226	>	CheckParameter(ForceFieldVariant, isNotEmpty());
227	>	CheckParameter(ForceFieldFileName, isNotEmpty());
228	>	CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") ||
229	>	isEqualIgnoreCase("SWITCHED") ||
230	>	isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
231	>	isEqualIgnoreCase("SHIFTED_FORCE") ||
232	>	isEqualIgnoreCase("TAYLOR_SHIFTED"));
233	>	CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") ||
234	>	isEqualIgnoreCase("MAX") ||
235	>	isEqualIgnoreCase("TRADITIONAL"));
236	>	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") ||
237	>	isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") ||
238	>	isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
239	>	isEqualIgnoreCase("SHIFTED_FORCE") ||
240	>	isEqualIgnoreCase("REACTION_FIELD") ||
241	>	isEqualIgnoreCase("TAYLOR_SHIFTED"));
242	>	CheckParameter(ElectrostaticScreeningMethod,
243	>	isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
244	>	CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") ||
245	>	isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
246	>	CheckParameter(OrthoBoxTolerance, isPositive());
247	>	CheckParameter(DampingAlpha,isNonNegative());
248	>	CheckParameter(SkinThickness, isPositive());
249	>	CheckParameter(Viscosity, isNonNegative());
250	>	CheckParameter(BeadSize, isPositive());
251	>	CheckParameter(FrozenBufferRadius, isPositive());
252	>	CheckParameter(LangevinBufferRadius, isPositive());
253	>	CheckParameter(NeighborListNeighbors, isPositive());
254	>	CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") ||
255	>	isEqualIgnoreCase("AlphaShape"));
256	>	CheckParameter(Alpha, isPositive());
257	>
258	>	for(std::vector<Component*>::iterator i = components_.begin();
259	>	i != components_.end(); ++i) {
260	>	if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
261	>	std::ostringstream oss;
262	>	oss << "Globals Error: can not find molecule stamp for component "
263	>	<< (*i)->getType() << std::endl;
264	>	throw OpenMDException(oss.str());
265	>	}
266		}
267		}
268	<	}
269	<
189	<	bool Globals::addComponent(Component* comp) {
268	>
269	>	bool Globals::addComponent(Component* comp) {
270		components_.push_back(comp);
271		return true;
272	<	}
272	>	}
273
274	<	bool Globals::addZConsStamp(ZConsStamp* zcons) {
274	>	bool Globals::addZConsStamp(ZConsStamp* zcons) {
275		zconstraints_.push_back(zcons);
276		return true;
277	<	}
277	>	}
278
279	<	bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
279	>	bool Globals::addRestraintStamp(RestraintStamp* rest) {
280	>	restraints_.push_back(rest);
281	>	return true;
282	>	}
283	>
284	>	bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
285	>	if (flucQpars_ != NULL)
286	>	delete flucQpars_;
287	>
288	>	flucQpars_ = fqp;
289	>	return true;
290	>	}
291	>
292	>	bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
293	>	if (rnemdPars_ != NULL)
294	>	delete rnemdPars_;
295	>
296	>	rnemdPars_ = rnemdPars;
297	>	return true;
298	>	}
299	>
300	>	bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
301	>	if (minimizerPars_ != NULL)
302	>	delete minimizerPars_;
303	>
304	>	minimizerPars_ = miniPars;
305	>	return true;
306	>	}
307	>
308	>	bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
309		std::string molStampName = molStamp->getName();
310		std::map<std::string, MoleculeStamp*>::iterator i;
311		bool ret = false;
312		i = moleculeStamps_.find(molStampName);
313		if (i == moleculeStamps_.end()) {
314	<	moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
315	<	ret = true;
314	>	moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
315	>	ret = true;
316		} else {
317	<
317	>	std::ostringstream oss;
318	>	oss << "Globals Error: Molecule Stamp " << molStamp->getName()
319	>	<< "appears multiple times\n";
320	>	throw OpenMDException(oss.str());
321		}
322		return ret;
323	+	}
324		}
212	–
213	–
214	–	}

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1877 by gezelter, Thu Jun 6 15:43:35 2013 UTC

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

Diff Legend

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