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 666 by chrisfen, Fri Oct 14 14:18:02 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	+	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
62	–	#define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
63	–	NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
64	–	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
65	–
66	–	Globals::Globals(){
67	–
68	–	DefineParameter(ForceField, "forceField")
69	–	DefineParameter(NComponents, "nComponents")
70	–
71	–	DefineOptionalParameter(TargetTemp, "targetTemp");
72	–	DefineOptionalParameter(Ensemble, "ensemble");
73	–	DefineOptionalParameter(Dt, "dt");
74	–	DefineOptionalParameter(RunTime, "runTime");
75	–	DefineOptionalParameter(InitialConfig, "initialConfig");
76	–	DefineOptionalParameter(FinalConfig, "finalConfig");
77	–	DefineOptionalParameter(NMol, "nMol");
78	–	DefineOptionalParameter(Density, "density");
79	–	DefineOptionalParameter(Box, "box");
80	–	DefineOptionalParameter(BoxX, "boxX");
81	–	DefineOptionalParameter(BoxY, "boxY");
82	–	DefineOptionalParameter(BoxZ, "boxZ");
83	–	DefineOptionalParameter(SampleTime, "sampleTime");
84	–	DefineOptionalParameter(ResetTime, "resetTime");
85	–	DefineOptionalParameter(StatusTime, "statusTime");
86	–	DefineOptionalParameter(CutoffRadius, "cutoffRadius");
87	–	DefineOptionalParameter(SwitchingRadius, "switchingRadius");
88	–	DefineOptionalParameter(Dielectric, "dielectric");
89	–	DefineOptionalParameter(TempSet, "tempSet");
90	–	DefineOptionalParameter(ThermalTime, "thermalTime");
91	–	DefineOptionalParameter(TargetPressure, "targetPressure");
92	–	DefineOptionalParameter(TauThermostat, "tauThermostat");
93	–	DefineOptionalParameter(TauBarostat, "tauBarostat");
94	–	DefineOptionalParameter(ZconsTime, "zconsTime");
95	–	DefineOptionalParameter(NZconstraints, "nZconstraints");
96	–	DefineOptionalParameter(ZconsTol, "zconsTol");
97	–	DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
98	–	DefineOptionalParameter(Seed, "seed");
99	–	DefineOptionalParameter(Minimizer, "minimizer");
100	–	DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
101	–	DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
102	–	DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
103	–	DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
104	–	DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
105	–	DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
106	–	DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
107	–	DefineOptionalParameter(ZconsGap, "zconsGap");
108	–	DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
109	–	DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
110	–	DefineOptionalParameter(ThermodynamicIntegrationLambda, "thermodynamicIntegrationLambda");
111	–	DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
112	–	DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
113	–	DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
114	–	DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
115	–	DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
116	–	DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
117	–	DefineOptionalParameter(SurfaceTension, "surfaceTension");
118	–	DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
119	–	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
120	–	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
121	–	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
147	–	bool result;
148	–
149	–
150	–	ParamMap::iterator i =parameters_.find(keyword);
151	–	if (i != parameters_.end()) {
152	–	if( the_type == STRING ){
153	–	result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
154	–	if (!result ) {
155	–	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
156	–	}
157	–	} else if( the_type == DOUBLE ){
158	–	result = i->second->setData(the_event->evt.asmt.rhs.dval);
159	–	if (!result )
160	–	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
161	–	}
162	–	else if (the_type == INT ){
163	–	result = i->second->setData(the_event->evt.asmt.rhs.ival);
164	–	if (!result )
165	–	sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
166	–
167	–	} else {
183
169	–	}
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		}
177	–
178	–	return result;
179	–	}
191
192	<	int Globals::newComponent( event* the_event ){
193	<
194	<	current_component = new Component;
195	<	int index = the_event->evt.blk_index;
196	<	char err[200];
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	<	if( haveNComponents() && index < getNComponents() )
259	<	components[index] = current_component;
260	<	else{
261	<	if( haveNComponents()  ){
262	<	sprintf( err, "meta-data parsing error: %d out of nComponents range",
263	<	index );
264	<	the_event->err_msg = strdup( err );
265	<	return 0;
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	<	else{
268	<	the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
269	<	" first component declaration." );
270	<	return 0;
271	<	}
272	<	}
202	<
203	<	return 1;
204	<	}
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	+	bool Globals::addRestraintStamp(RestraintStamp* rest) {
280	+	restraints_.push_back(rest);
281	+	return true;
282	+	}
283
284	<	int Globals::componentAssign( event* the_event ){
284	>	bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
285	>	if (flucQpars_ != NULL)
286	>	delete flucQpars_;
287	>
288	>	flucQpars_ = fqp;
289	>	return true;
290	>	}
291
292	<	switch( the_event->evt.asmt.asmt_type ){
292	>	bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
293	>	if (rnemdPars_ != NULL)
294	>	delete rnemdPars_;
295
296	<	case STRING:
297	<	return current_component->assignString( the_event->evt.asmt.lhs,
214	<	the_event->evt.asmt.rhs.sval,
215	<	&(the_event->err_msg));
216	<	break;
217	<
218	<	case DOUBLE:
219	<	return current_component->assignDouble( the_event->evt.asmt.lhs,
220	<	the_event->evt.asmt.rhs.dval,
221	<	&(the_event->err_msg));
222	<	break;
223	<
224	<	case INT:
225	<	return current_component->assignInt( the_event->evt.asmt.lhs,
226	<	the_event->evt.asmt.rhs.ival,
227	<	&(the_event->err_msg));
228	<	break;
229	<
230	<	default:
231	<	the_event->err_msg = strdup( "Globals error. Invalid component"
232	<	" assignment type" );
233	<	return 0;
234	<	break;
296	>	rnemdPars_ = rnemdPars;
297	>	return true;
298		}
236	–	return 0;
237	–	}
299
300	<	int Globals::componentEnd( event* the_event ){
301	<
302	<	the_event->err_msg = current_component->checkMe();
242	<	if( the_event->err_msg != NULL ) return 0;
243	<
244	<	return 1;
245	<	}
246	<
247	<	int Globals::newZconstraint( event* the_event ){
248	<
249	<
250	<	int index = the_event->evt.blk_index;
251	<	char err[200];
252	<	current_zConstraint = new ZconStamp( index );
253	<
254	<	if( haveNZconstraints() && index < getNZconstraints() )
255	<	zConstraints[index] = current_zConstraint;
256	<	else{
257	<	if( haveNZconstraints() ){
258	<	sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
259	<	index );
260	<	the_event->err_msg = strdup( err );
261	<	return 0;
262	<	}
263	<	else{
264	<	the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
265	<	" not given before"
266	<	" first zConstraint declaration." );
267	<	return 0;
268	<	}
269	<	}
270	<
271	<	return 1;
272	<	}
273	<
274	<
275	<
276	<	int Globals::zConstraintAssign( event* the_event ){
277	<
278	<	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,
282	<	the_event->evt.asmt.rhs.sval,
283	<	&(the_event->err_msg));
284	<	break;
285	<
286	<	case DOUBLE:
287	<	return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
288	<	the_event->evt.asmt.rhs.dval,
289	<	&(the_event->err_msg));
290	<	break;
291	<
292	<	case INT:
293	<	return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
294	<	the_event->evt.asmt.rhs.ival,
295	<	&(the_event->err_msg));
296	<	break;
297	<
298	<	default:
299	<	the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
300	<	" assignment type" );
301	<	return 0;
302	<	break;
304	>	minimizerPars_ = miniPars;
305	>	return true;
306		}
304	–	return 0;
305	–	}
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;
320	<
321	<	ParamMap::iterator i;
322	<	for (i = parameters_.begin(); i != parameters_.end(); ++i) {
323	<	if (!i->second->isOptional() && i->second->empty()) {
324	<	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		}
327	–
328	–	//@todo memory leak
329	–	if( have_err )
330	–	return strdup( err.c_str() );
331	–
332	–	return NULL;
333	–
334	–
324		}
336	–
337	–	int Globals::globalEnd( event* the_event ){
338	–
339	–	the_event->err_msg = checkMe();
340	–	if( the_event->err_msg != NULL ) return 0;
341	–
342	–	return 1;
343	–	}

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 666 by chrisfen, Fri Oct 14 14:18:02 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