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 665 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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 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	<
54	<	#define DefineParameter(NAME,KEYWORD)                              \
55	<	NAME.setKeyword(KEYWORD);                  \
56	<	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
57	<
58	<	#define DefineOptionalParameter(NAME,KEYWORD)                              \
59	<	NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
60	<	parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
61	<
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	<
53	>	namespace OpenMD {
54	>	Globals::Globals() {
55		DefineParameter(ForceField, "forceField")
69	–	DefineParameter(NComponents, "nComponents")
56
57		DefineOptionalParameter(TargetTemp, "targetTemp");
58		DefineOptionalParameter(Ensemble, "ensemble");
59		DefineOptionalParameter(Dt, "dt");
60		DefineOptionalParameter(RunTime, "runTime");
75	–	DefineOptionalParameter(InitialConfig, "initialConfig");
61		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");
62		DefineOptionalParameter(SampleTime, "sampleTime");
63		DefineOptionalParameter(ResetTime, "resetTime");
64		DefineOptionalParameter(StatusTime, "statusTime");
65		DefineOptionalParameter(CutoffRadius, "cutoffRadius");
66		DefineOptionalParameter(SwitchingRadius, "switchingRadius");
88	–	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");
95	–	DefineOptionalParameter(NZconstraints, "nZconstraints");
73		DefineOptionalParameter(ZconsTol, "zconsTol");
74		DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
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 111 | Line 88 | Globals::Globals(){
88		DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
89		DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
90		DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
91	<	DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
115	<	DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
116	<	DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
91	>	DefineOptionalParameter(DampingAlpha, "dampingAlpha");
92		DefineOptionalParameter(SurfaceTension, "surfaceTension");
93		DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
94	+	DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
95	+	DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
96	+	DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
97	+	DefineOptionalParameter(HydroPropFile, "HydroPropFile");
98	+	DefineOptionalParameter(Viscosity, "viscosity");
99	+	DefineOptionalParameter(BeadSize, "beadSize");
100	+	DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
101	+	DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
102	+	DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
103	+	DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
104		DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
105	<	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
106	<	DefineOptionalParameter(StatFileFormat, "statFileFormat");
105	>	DefineOptionalParameter(MTM_Ce, "MTM_Ce");
106	>	DefineOptionalParameter(MTM_G, "MTM_G");
107	>	DefineOptionalParameter(MTM_Io, "MTM_Io");
108	>	DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
109	>	DefineOptionalParameter(MTM_R, "MTM_R");
110	>	DefineOptionalParameter(Alpha, "alpha");
111	>
112
123	–	DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
113		DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
114	+	DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
115		DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
116		DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
117		DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);
118	<	DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
119	<	DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
120	<	DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
118	>	DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
119	>	DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
120	>	DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
121		DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
122	+	DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
123	+	DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", 0);
124		DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
125	<
126	<	}
125	>	DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");
126	>	DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
127	>	DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
128
129	<	int Globals::globalAssign( event* the_event ){
130	<
131	<	int key;
132	<	int token;
133	<	interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
134	<	char* lhs = the_event->evt.asmt.lhs;
135	<	std::string keyword(lhs);
129	>	DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
130	>	DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
131	>	DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
132	>	DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16);
133	>	DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
134	>	DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
135	>	DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
136	>	DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
137	>	DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
138	>	DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
139	>	DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
140	>	DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
141	>	DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
142
144	–	bool result;
143
144
145	<	ParamMap::iterator i =parameters_.find(keyword);
146	<	if (i != parameters_.end()) {
147	<	if( the_type == STRING ){
148	<	result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
149	<	if (!result ) {
150	<	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
151	<	}
152	<	} else if( the_type == DOUBLE ){
155	<	result = i->second->setData(the_event->evt.asmt.rhs.dval);
156	<	if (!result )
157	<	sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
158	<	}
159	<	else if (the_type == INT ){
160	<	result = i->second->setData(the_event->evt.asmt.rhs.ival);
161	<	if (!result )
162	<	sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
163	<
164	<	} else {
165	<
166	<	}
167	<	}
168	<
169	<	if (keyword == "nComponents" && getNComponents() > 0) {
170	<	components = new Component*[getNComponents()];
171	<	}else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
172	<	zConstraints = new ZconStamp*[getNZconstraints()];
173	<	}
174	<
175	<	return result;
176	<	}
177	<
178	<	int Globals::newComponent( event* the_event ){
179	<
180	<	current_component = new Component;
181	<	int index = the_event->evt.blk_index;
182	<	char err[200];
183	<
184	<	if( haveNComponents() && index < getNComponents() )
185	<	components[index] = current_component;
186	<	else{
187	<	if( haveNComponents()  ){
188	<	sprintf( err, "meta-data parsing error: %d out of nComponents range",
189	<	index );
190	<	the_event->err_msg = strdup( err );
191	<	return 0;
192	<	}
193	<	else{
194	<	the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
195	<	" first component declaration." );
196	<	return 0;
197	<	}
198	<	}
199	<
200	<	return 1;
201	<	}
202	<
203	<
204	<
205	<	int Globals::componentAssign( event* the_event ){
206	<
207	<	switch( the_event->evt.asmt.asmt_type ){
208	<
209	<	case STRING:
210	<	return current_component->assignString( the_event->evt.asmt.lhs,
211	<	the_event->evt.asmt.rhs.sval,
212	<	&(the_event->err_msg));
213	<	break;
214	<
215	<	case DOUBLE:
216	<	return current_component->assignDouble( the_event->evt.asmt.lhs,
217	<	the_event->evt.asmt.rhs.dval,
218	<	&(the_event->err_msg));
219	<	break;
220	<
221	<	case INT:
222	<	return current_component->assignInt( the_event->evt.asmt.lhs,
223	<	the_event->evt.asmt.rhs.ival,
224	<	&(the_event->err_msg));
225	<	break;
145	>	deprecatedKeywords_.insert("nComponents");
146	>	deprecatedKeywords_.insert("nZconstraints");
147	>	deprecatedKeywords_.insert("initialConfig");
148	>	deprecatedKeywords_.insert("thermIntDistSpringConst");
149	>	deprecatedKeywords_.insert("thermIntThetaSpringConst");
150	>	deprecatedKeywords_.insert("thermIntOmegaSpringConst");
151	>	deprecatedKeywords_.insert("useSolidThermInt");
152	>	deprecatedKeywords_.insert("useLiquidThermInt");
153
227	–	default:
228	–	the_event->err_msg = strdup( "Globals error. Invalid component"
229	–	" assignment type" );
230	–	return 0;
231	–	break;
232	–	}
233	–	return 0;
154		}
155
156	<	int Globals::componentEnd( event* the_event ){
156	>	Globals::~Globals() {
157	>	MemoryUtils::deletePointers(components_);
158	>	MemoryUtils::deletePointers(zconstraints_);
159	>	MemoryUtils::deletePointers(restraints_);
160	>	}
161
162	<	the_event->err_msg = current_component->checkMe();
163	<	if( the_event->err_msg != NULL ) return 0;
162	>	void Globals::validate() {
163	>	DataHolder::validate();
164
165	<	return 1;
166	<	}
165	>	CheckParameter(ForceField, isNotEmpty());
166	>	CheckParameter(TargetTemp, isPositive());
167	>	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"));
168	>	CheckParameter(Dt, isPositive());
169	>	CheckParameter(RunTime, isPositive());
170	>	CheckParameter(FinalConfig, isNotEmpty());
171	>	CheckParameter(SampleTime, isNonNegative());
172	>	CheckParameter(ResetTime, isNonNegative());
173	>	CheckParameter(StatusTime, isNonNegative());
174	>	CheckParameter(CutoffRadius, isPositive());
175	>	CheckParameter(SwitchingRadius, isNonNegative());
176	>	CheckParameter(Dielectric, isPositive());
177	>	CheckParameter(ThermalTime,  isNonNegative());
178	>	CheckParameter(TauThermostat, isPositive());
179	>	CheckParameter(TauBarostat, isPositive());
180	>	CheckParameter(ZconsTime, isPositive());
181	>	CheckParameter(ZconsTol, isPositive());
182	>	CheckParameter(Seed, isPositive());
183	>	CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
184	>	CheckParameter(MinimizerMaxIter, isPositive());
185	>	CheckParameter(MinimizerWriteFreq, isPositive());
186	>	CheckParameter(MinimizerStepSize, isPositive());
187	>	CheckParameter(MinimizerFTol, isPositive());
188	>	CheckParameter(MinimizerGTol, isPositive());
189	>	CheckParameter(MinimizerLSTol, isPositive());
190	>	CheckParameter(MinimizerLSMaxIter, isPositive());
191	>	CheckParameter(ZconsGap, isPositive());
192	>	CheckParameter(ZconsFixtime, isPositive());
193	>	CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
194	>	CheckParameter(ThermodynamicIntegrationK, isPositive());
195	>	CheckParameter(ForceFieldVariant, isNotEmpty());
196	>	CheckParameter(ForceFieldFileName, isNotEmpty());
197	>	CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
198	>	CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
199	>	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
200	>	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
201	>	CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
202	>	CheckParameter(OrthoBoxTolerance, isPositive());
203	>	CheckParameter(DampingAlpha,isNonNegative());
204	>	CheckParameter(SkinThickness, isPositive());
205	>	CheckParameter(Viscosity, isNonNegative());
206	>	CheckParameter(BeadSize, isPositive());
207	>	CheckParameter(FrozenBufferRadius, isPositive());
208	>	CheckParameter(LangevinBufferRadius, isPositive());
209	>	CheckParameter(NeighborListNeighbors, isPositive());
210	>	CheckParameter(RNEMD_exchangeTime, isPositive());
211	>	CheckParameter(RNEMD_nBins, isPositive() && isEven());
212	>	CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
213	>	CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
214	>	CheckParameter(Alpha, isPositive());
215
244	–	int Globals::newZconstraint( event* the_event ){
216
217	<
218	<	int index = the_event->evt.blk_index;
219	<	char err[200];
220	<	current_zConstraint = new ZconStamp( index );
221	<
251	<	if( haveNZconstraints() && index < getNZconstraints() )
252	<	zConstraints[index] = current_zConstraint;
253	<	else{
254	<	if( haveNZconstraints() ){
255	<	sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
256	<	index );
257	<	the_event->err_msg = strdup( err );
258	<	return 0;
217	>	for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
218	>	if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
219	>	std::ostringstream oss;
220	>	oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
221	>	throw OpenMDException(oss.str());
222		}
223	<	else{
224	<	the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
262	<	" not given before"
263	<	" first zConstraint declaration." );
264	<	return 0;
265	<	}
266	<	}
223	>	}
224	>	}
225
226	<	return 1;
226	>	bool Globals::addComponent(Component* comp) {
227	>	components_.push_back(comp);
228	>	return true;
229		}
230
231	<
232	<
233	<	int Globals::zConstraintAssign( event* the_event ){
274	<
275	<	switch( the_event->evt.asmt.asmt_type ){
276	<
277	<	case STRING:
278	<	return current_zConstraint->assignString( the_event->evt.asmt.lhs,
279	<	the_event->evt.asmt.rhs.sval,
280	<	&(the_event->err_msg));
281	<	break;
282	<
283	<	case DOUBLE:
284	<	return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
285	<	the_event->evt.asmt.rhs.dval,
286	<	&(the_event->err_msg));
287	<	break;
288	<
289	<	case INT:
290	<	return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
291	<	the_event->evt.asmt.rhs.ival,
292	<	&(the_event->err_msg));
293	<	break;
294	<
295	<	default:
296	<	the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
297	<	" assignment type" );
298	<	return 0;
299	<	break;
300	<	}
301	<	return 0;
231	>	bool Globals::addZConsStamp(ZConsStamp* zcons) {
232	>	zconstraints_.push_back(zcons);
233	>	return true;
234		}
235
236	<	int Globals::zConstraintEnd( event* the_event ){
237	<
238	<	the_event->err_msg = current_zConstraint->checkMe();
307	<	if( the_event->err_msg != NULL ) return 0;
308	<
309	<	return 1;
236	>	bool Globals::addRestraintStamp(RestraintStamp* rest) {
237	>	restraints_.push_back(rest);
238	>	return true;
239		}
240
241	<	char* Globals::checkMe( void ){
242	<
243	<
244	<	std::string err("The following required keywords are missing:\n");
245	<	short int have_err = 0;
246	<
247	<	ParamMap::iterator i;
248	<	for (i = parameters_.begin(); i != parameters_.end(); ++i) {
249	<	if (!i->second->isOptional() && i->second->empty()) {
250	<	err +=  i->second->getKeyword() + "\n";
241	>	bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
242	>	std::string molStampName = molStamp->getName();
243	>	std::map<std::string, MoleculeStamp*>::iterator i;
244	>	bool ret = false;
245	>	i = moleculeStamps_.find(molStampName);
246	>	if (i == moleculeStamps_.end()) {
247	>	moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
248	>	ret = true;
249	>	} else {
250	>	std::ostringstream oss;
251	>	oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
252	>	throw OpenMDException(oss.str());
253		}
254	<	}
324	<
325	<	//@todo memory leak
326	<	if( have_err )
327	<	return strdup( err.c_str() );
328	<
329	<	return NULL;
330	<
331	<
254	>	return ret;
255		}
256	+
257
334	–	int Globals::globalEnd( event* the_event ){
335	–
336	–	the_event->err_msg = checkMe();
337	–	if( the_event->err_msg != NULL ) return 0;
338	–
339	–	return 1;
258		}

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

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