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 672 by tim, Fri Oct 14 21:43:13 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"
49	–	#ifdef IS_MPI
50	–	#include "io/mpiBASS.h"
51	–	#endif // is_mpi
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	<	#define DefineParameter(NAME,KEYWORD)                              \
61	<	NAME.setKeyword(KEYWORD);                  \
62	<	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
60	>	DefineParameter(ForceField, "forceField");
61	>
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	<	#define DefineOptionalParameter(NAME,KEYWORD)                              \
96	<	NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
97	<	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
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
63	–	#define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
64	–	NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
65	–	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
66	–
67	–	#define CheckParameter(NAME, CONSTRAINT)                              \
68	–	if (!NAME.empty()) { if (!(CONSTRAINT)(NAME.getData())) std::cout <<"Error in parsing " << NAME.getKeyword() << " : "<< (CONSTRAINT).getConstraintDescription() << std::endl; }
69	–
70	–
71	–	Globals::Globals(){
72	–
73	–	DefineParameter(ForceField, "forceField")
74	–	DefineParameter(NComponents, "nComponents")
75	–
76	–	DefineOptionalParameter(TargetTemp, "targetTemp");
77	–	DefineOptionalParameter(Ensemble, "ensemble");
78	–	DefineOptionalParameter(Dt, "dt");
79	–	DefineOptionalParameter(RunTime, "runTime");
80	–	DefineOptionalParameter(InitialConfig, "initialConfig");
81	–	DefineOptionalParameter(FinalConfig, "finalConfig");
82	–	DefineOptionalParameter(NMol, "nMol");
83	–	DefineOptionalParameter(Density, "density");
84	–	DefineOptionalParameter(Box, "box");
85	–	DefineOptionalParameter(BoxX, "boxX");
86	–	DefineOptionalParameter(BoxY, "boxY");
87	–	DefineOptionalParameter(BoxZ, "boxZ");
88	–	DefineOptionalParameter(SampleTime, "sampleTime");
89	–	DefineOptionalParameter(ResetTime, "resetTime");
90	–	DefineOptionalParameter(StatusTime, "statusTime");
91	–	DefineOptionalParameter(CutoffRadius, "cutoffRadius");
92	–	DefineOptionalParameter(SwitchingRadius, "switchingRadius");
93	–	DefineOptionalParameter(Dielectric, "dielectric");
94	–	DefineOptionalParameter(TempSet, "tempSet");
95	–	DefineOptionalParameter(ThermalTime, "thermalTime");
96	–	DefineOptionalParameter(TargetPressure, "targetPressure");
97	–	DefineOptionalParameter(TauThermostat, "tauThermostat");
98	–	DefineOptionalParameter(TauBarostat, "tauBarostat");
99	–	DefineOptionalParameter(ZconsTime, "zconsTime");
100	–	DefineOptionalParameter(NZconstraints, "nZconstraints");
101	–	DefineOptionalParameter(ZconsTol, "zconsTol");
102	–	DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
103	–	DefineOptionalParameter(Seed, "seed");
104	–	DefineOptionalParameter(Minimizer, "minimizer");
105	–	DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
106	–	DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
107	–	DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
108	–	DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
109	–	DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
110	–	DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
111	–	DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
112	–	DefineOptionalParameter(ZconsGap, "zconsGap");
113	–	DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
114	–	DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
115	–	DefineOptionalParameter(ThermodynamicIntegrationLambda, "thermodynamicIntegrationLambda");
116	–	DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
117	–	DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
118	–	DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
119	–	DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
120	–	DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
121	–	DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
122	–	DefineOptionalParameter(SurfaceTension, "surfaceTension");
123	–	DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
124	–	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
125	–	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
126	–	DefineOptionalParameter(StatFileFormat, "statFileFormat");
115
116	<	DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
117	<	DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
118	<	DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
119	<	DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
120	<	DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);
121	<	DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
122	<	DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
123	<	DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
124	<	DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
125	<	DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
126	<	DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
127	<	DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
128	<	DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
129	<
130	<	}
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	<	int Globals::globalAssign( event* the_event ){
168	<
169	<	int key;
170	<	int token;
171	<	interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
172	<	char* lhs = the_event->evt.asmt.lhs;
173	<	std::string keyword(lhs);
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
152	–	bool result;
153	–
154	–
155	–	ParamMap::iterator i =parameters_.find(keyword);
156	–	if (i != parameters_.end()) {
157	–	if( the_type == STRING ){
158	–	result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
159	–	if (!result ) {
160	–	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
161	–	}
162	–	} else if( the_type == DOUBLE ){
163	–	result = i->second->setData(the_event->evt.asmt.rhs.dval);
164	–	if (!result )
165	–	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
166	–	}
167	–	else if (the_type == INT ){
168	–	result = i->second->setData(the_event->evt.asmt.rhs.ival);
169	–	if (!result )
170	–	sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
171	–
172	–	} else {
183
174	–	}
184		}
185
186	<	if (keyword == "nComponents" && getNComponents() > 0) {
187	<	components = new Component*[getNComponents()];
188	<	}else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
189	<	zConstraints = new ZconStamp*[getNZconstraints()];
186	>	Globals::~Globals() {
187	>	MemoryUtils::deletePointers(components_);
188	>	MemoryUtils::deletePointers(zconstraints_);
189	>	MemoryUtils::deletePointers(restraints_);
190		}
182	–
183	–	return result;
184	–	}
191
192	<	int Globals::newComponent( event* the_event ){
193	<
188	<	current_component = new Component;
189	<	int index = the_event->evt.blk_index;
190	<	char err[200];
191	<
192	<	if( haveNComponents() && index < getNComponents() )
193	<	components[index] = current_component;
194	<	else{
195	<	if( haveNComponents()  ){
196	<	sprintf( err, "meta-data parsing error: %d out of nComponents range",
197	<	index );
198	<	the_event->err_msg = strdup( err );
199	<	return 0;
200	<	}
201	<	else{
202	<	the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
203	<	" first component declaration." );
204	<	return 0;
205	<	}
206	<	}
207	<
208	<	return 1;
209	<	}
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	+	bool Globals::addComponent(Component* comp) {
270	+	components_.push_back(comp);
271	+	return true;
272	+	}
273
274	+	bool Globals::addZConsStamp(ZConsStamp* zcons) {
275	+	zconstraints_.push_back(zcons);
276	+	return true;
277	+	}
278
279	<	int Globals::componentAssign( event* the_event ){
279	>	bool Globals::addRestraintStamp(RestraintStamp* rest) {
280	>	restraints_.push_back(rest);
281	>	return true;
282	>	}
283
284	<	switch( the_event->evt.asmt.asmt_type ){
284	>	bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
285	>	if (flucQpars_ != NULL)
286	>	delete flucQpars_;
287
288	<	case STRING:
289	<	return current_component->assignString( the_event->evt.asmt.lhs,
290	<	the_event->evt.asmt.rhs.sval,
291	<	&(the_event->err_msg));
292	<	break;
288	>	flucQpars_ = fqp;
289	>	return true;
290	>	}
291	>
292	>	bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
293	>	if (rnemdPars_ != NULL)
294	>	delete rnemdPars_;
295
296	<	case DOUBLE:
297	<	return current_component->assignDouble( the_event->evt.asmt.lhs,
225	<	the_event->evt.asmt.rhs.dval,
226	<	&(the_event->err_msg));
227	<	break;
228	<
229	<	case INT:
230	<	return current_component->assignInt( the_event->evt.asmt.lhs,
231	<	the_event->evt.asmt.rhs.ival,
232	<	&(the_event->err_msg));
233	<	break;
234	<
235	<	default:
236	<	the_event->err_msg = strdup( "Globals error. Invalid component"
237	<	" assignment type" );
238	<	return 0;
239	<	break;
296	>	rnemdPars_ = rnemdPars;
297	>	return true;
298		}
241	–	return 0;
242	–	}
299
300	<	int Globals::componentEnd( event* the_event ){
301	<
302	<	the_event->err_msg = current_component->checkMe();
247	<	if( the_event->err_msg != NULL ) return 0;
248	<
249	<	return 1;
250	<	}
251	<
252	<	int Globals::newZconstraint( event* the_event ){
253	<
254	<
255	<	int index = the_event->evt.blk_index;
256	<	char err[200];
257	<	current_zConstraint = new ZconStamp( index );
258	<
259	<	if( haveNZconstraints() && index < getNZconstraints() )
260	<	zConstraints[index] = current_zConstraint;
261	<	else{
262	<	if( haveNZconstraints() ){
263	<	sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
264	<	index );
265	<	the_event->err_msg = strdup( err );
266	<	return 0;
267	<	}
268	<	else{
269	<	the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
270	<	" not given before"
271	<	" first zConstraint declaration." );
272	<	return 0;
273	<	}
274	<	}
275	<
276	<	return 1;
277	<	}
278	<
279	<
280	<
281	<	int Globals::zConstraintAssign( event* the_event ){
282	<
283	<	switch( the_event->evt.asmt.asmt_type ){
300	>	bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
301	>	if (minimizerPars_ != NULL)
302	>	delete minimizerPars_;
303
304	<	case STRING:
305	<	return current_zConstraint->assignString( the_event->evt.asmt.lhs,
287	<	the_event->evt.asmt.rhs.sval,
288	<	&(the_event->err_msg));
289	<	break;
290	<
291	<	case DOUBLE:
292	<	return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
293	<	the_event->evt.asmt.rhs.dval,
294	<	&(the_event->err_msg));
295	<	break;
296	<
297	<	case INT:
298	<	return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
299	<	the_event->evt.asmt.rhs.ival,
300	<	&(the_event->err_msg));
301	<	break;
302	<
303	<	default:
304	<	the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
305	<	" assignment type" );
306	<	return 0;
307	<	break;
304	>	minimizerPars_ = miniPars;
305	>	return true;
306		}
309	–	return 0;
310	–	}
307
308	<	int Globals::zConstraintEnd( event* the_event ){
309	<
310	<	the_event->err_msg = current_zConstraint->checkMe();
311	<	if( the_event->err_msg != NULL ) return 0;
312	<
313	<	return 1;
314	<	}
315	<
316	<	char* Globals::checkMe( void ){
317	<
318	<
319	<	std::string err("The following required keywords are missing:\n");
320	<	short int have_err = 0;
325	<
326	<	ParamMap::iterator i;
327	<	for (i = parameters_.begin(); i != parameters_.end(); ++i) {
328	<	if (!i->second->isOptional() && i->second->empty()) {
329	<	err +=  i->second->getKeyword() + "\n";
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;
316	>	} else {
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		}
332	–
333	–	CheckParameter(ForceField, isNotEmpty());
334	–	CheckParameter(NComponents,isPositive());
335	–	CheckParameter(TargetTemp, isPositive());
336	–	CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) ||
337	–	isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))||
338	–	isEqualIgnoreCase(std::string("NPTxyz")) );
339	–
340	–	CheckParameter(Dt, isPositive());
341	–	CheckParameter(RunTime, isPositive());
342	–	CheckParameter(InitialConfig, isNotEmpty());
343	–	CheckParameter(FinalConfig, isNotEmpty());
344	–	CheckParameter(NMol, isPositive());
345	–	CheckParameter(Density, isPositive());
346	–	CheckParameter(Box, isPositive());
347	–	CheckParameter(BoxX, isPositive());
348	–	CheckParameter(BoxY, isPositive());
349	–	CheckParameter(BoxZ, isPositive());
350	–	CheckParameter(SampleTime, isNonNegative());
351	–	CheckParameter(ResetTime, isNonNegative());
352	–	CheckParameter(StatusTime, isNonNegative());
353	–	CheckParameter(CutoffRadius, isPositive());
354	–	CheckParameter(SwitchingRadius, isNonNegative());
355	–	CheckParameter(Dielectric, isPositive());
356	–	CheckParameter(ThermalTime,  isNonNegative());
357	–	CheckParameter(TargetPressure,  isPositive());
358	–	CheckParameter(TauThermostat, isPositive());
359	–	CheckParameter(TauBarostat, isPositive());
360	–	CheckParameter(ZconsTime, isPositive());
361	–	CheckParameter(NZconstraints, isPositive());
362	–	CheckParameter(ZconsTol, isPositive());
363	–	//CheckParameter(ZconsForcePolicy,);
364	–	CheckParameter(Seed, isPositive());
365	–	CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
366	–	CheckParameter(MinimizerMaxIter, isPositive());
367	–	CheckParameter(MinimizerWriteFrq, isPositive());
368	–	CheckParameter(MinimizerStepSize, isPositive());
369	–	CheckParameter(MinimizerFTol, isPositive());
370	–	CheckParameter(MinimizerGTol, isPositive());
371	–	CheckParameter(MinimizerLSTol, isPositive());
372	–	CheckParameter(MinimizerLSMaxIter, isPositive());
373	–	CheckParameter(ZconsGap, isPositive());
374	–	CheckParameter(ZconsFixtime, isPositive());
375	–	CheckParameter(ThermodynamicIntegrationLambda, isPositive());
376	–	CheckParameter(ThermodynamicIntegrationK, isPositive());
377	–	CheckParameter(ForceFieldVariant, isNotEmpty());
378	–	CheckParameter(ForceFieldFileName, isNotEmpty());
379	–	CheckParameter(ThermIntDistSpringConst, isPositive());
380	–	CheckParameter(ThermIntThetaSpringConst, isPositive());
381	–	CheckParameter(ThermIntOmegaSpringConst, isPositive());
382	–	CheckParameter(SurfaceTension, isPositive());
383	–	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("UNDAMPED_WOLF")) || isEqualIgnoreCase(std::string("DAMPED_WOLF")) || isEqualIgnoreCase(std::string("REACTION_FIELD")) );
384	–	CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
385	–	//CheckParameter(StatFileFormat,);
386	–	//CheckParameter(MixingRule,);
387	–	CheckParameter(OrthoBoxTolerance, isPositive());
388	–	CheckParameter(ThermIntDistSpringConst, isPositive());
389	–	CheckParameter(ThermIntThetaSpringConst, isPositive());
390	–	CheckParameter(ThermIntOmegaSpringConst, isPositive());
391	–	CheckParameter(DampingAlpha,isPositive());
392	–	CheckParameter(SkinThickness, isPositive());
393	–
394	–	//@todo memory leak
395	–	if( have_err )
396	–	return strdup( err.c_str() );
397	–
398	–	return NULL;
399	–
400	–
324		}
402	–
403	–	int Globals::globalEnd( event* the_event ){
404	–
405	–	the_event->err_msg = checkMe();
406	–	if( the_event->err_msg != NULL ) return 0;
407	–
408	–	return 1;
409	–	}

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 672 by tim, Fri Oct 14 21:43:13 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