ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 710 by chrisfen, Wed Nov 2 20:36:25 2005 UTC vs.
Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include <stdlib.h>
# Line 45 | Line 45
45   #include <string>
46  
47   #include "io/Globals.hpp"
48 + #include "io/ParamConstraint.hpp"
49 + #include "utils/MemoryUtils.hpp"
50   #include "utils/simError.h"
49 #ifdef IS_MPI
50 #include "io/mpiBASS.h"
51 #endif // is_mpi
51  
52 < #include "io/ParamConstraint.hpp"
53 <
55 < #define DefineParameter(NAME,KEYWORD)                              \
56 <  NAME.setKeyword(KEYWORD);                  \
57 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
58 <
59 < #define DefineOptionalParameter(NAME,KEYWORD)                              \
60 <  NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
61 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
62 <
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())) { sprintf(painCave.errMsg,"Error in checking %s : should be %s\n",NAME.getKeyword().c_str(),(CONSTRAINT).getConstraintDescription().c_str()); painCave.isFatal = 1; painCave.severity = OOPSE_ERROR; simError();} }                
69 <
70 < Globals::Globals(){
71 <
52 > namespace OpenMD {
53 > Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
73  DefineParameter(NComponents, "nComponents")
55  
56    DefineOptionalParameter(TargetTemp, "targetTemp");
57    DefineOptionalParameter(Ensemble, "ensemble");
58    DefineOptionalParameter(Dt, "dt");
59    DefineOptionalParameter(RunTime, "runTime");
79  DefineOptionalParameter(InitialConfig, "initialConfig");
60    DefineOptionalParameter(FinalConfig, "finalConfig");
81  DefineOptionalParameter(NMol, "nMol");
82  DefineOptionalParameter(Density, "density");
83  DefineOptionalParameter(Box, "box");
84  DefineOptionalParameter(BoxX, "boxX");
85  DefineOptionalParameter(BoxY, "boxY");
86  DefineOptionalParameter(BoxZ, "boxZ");
61    DefineOptionalParameter(SampleTime, "sampleTime");
62    DefineOptionalParameter(ResetTime, "resetTime");
63    DefineOptionalParameter(StatusTime, "statusTime");
64    DefineOptionalParameter(CutoffRadius, "cutoffRadius");
65    DefineOptionalParameter(SwitchingRadius, "switchingRadius");
92  DefineOptionalParameter(Dielectric, "dielectric");
66    DefineOptionalParameter(TempSet, "tempSet");
67    DefineOptionalParameter(ThermalTime, "thermalTime");
68 <  DefineOptionalParameter(TargetPressure, "targetPressure");
68 >  DefineOptionalParameter(TargetPressure, "targetPressure");  
69    DefineOptionalParameter(TauThermostat, "tauThermostat");
70    DefineOptionalParameter(TauBarostat, "tauBarostat");
71    DefineOptionalParameter(ZconsTime, "zconsTime");
99  DefineOptionalParameter(NZconstraints, "nZconstraints");  
72    DefineOptionalParameter(ZconsTol, "zconsTol");
73    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
74    DefineOptionalParameter(Seed, "seed");
# Line 115 | Line 87 | Globals::Globals(){
87    DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
88    DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89    DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90 <  DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
119 <  DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
120 <  DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
90 >  DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91    DefineOptionalParameter(SurfaceTension, "surfaceTension");
92    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93 <  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
94 <  DefineOptionalParameter(ScreeningMethod, "screeningMethod");
93 >  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94 >  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
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(MTM_Ce, "MTM_Ce");
105 +  DefineOptionalParameter(MTM_G, "MTM_G");
106 +  DefineOptionalParameter(MTM_Io, "MTM_Io");
107 +  DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
108 +  DefineOptionalParameter(MTM_R, "MTM_R");
109 +  DefineOptionalParameter(Alpha, "alpha");
110 +
111    
127  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
112    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
113 +  DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
114    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
115    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
116    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
117 <  DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
118 <  DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
119 <  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
135 <  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
136 <  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
137 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
117 >  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
118 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
120    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
121 +  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
122    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
123    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
124 <
125 <  
143 < }
144 <
145 < int Globals::globalAssign( event* the_event ){
146 <  char errorMessage[65535];
147 <  int key;
148 <  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
149 <  char* lhs = the_event->evt.asmt.lhs;
150 <  std::string keyword(lhs);
151 <
152 <  bool result = false;
153 <
154 <  /**@todo fix memory leak */  
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(errorMessage, "Error in parsing %s: expect %s, but get a string \"%s\".\n", keyword.c_str(), i->second->getParamType().c_str(), the_event->evt.asmt.rhs.sval);
161 <            the_event->err_msg = strdup(errorMessage);
162 <       }
163 <    } else if( the_type == DOUBLE ){
164 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
165 <       if (!result )
166 <         sprintf(errorMessage, "Error in parsing %s: expect %s, but get a double %f.\n", keyword.c_str(), i->second->getParamType().c_str(), the_event->evt.asmt.rhs.dval );
167 <       the_event->err_msg = strdup(errorMessage);
168 <    }      
169 <    else if (the_type == INT ){
170 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
171 <       if (!result )
172 <         sprintf(errorMessage,  "Error in parsing %s: expect %s, but get an int %d.\n", keyword.c_str(), i->second->getParamType().c_str(), the_event->evt.asmt.rhs.ival );
173 <       the_event->err_msg = strdup(errorMessage);
174 <      
175 <    } else {
176 <        sprintf(errorMessage,  "Internal error of parser\n");
177 <        the_event->err_msg = strdup(errorMessage);
178 <    }
179 <  } else {
180 <    sprintf(errorMessage,  "%s is an unrecognized keyword\n", keyword.c_str() );
181 <    the_event->err_msg = strdup(errorMessage);
182 <  }
183 <
184 <  if (keyword == "nComponents" && getNComponents() > 0) {
185 <    components = new Component*[getNComponents()];
186 <  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
187 <    zConstraints = new ZconStamp*[getNZconstraints()];
188 <  }
189 <  
190 <  return result;
191 < }
192 <
193 < int Globals::newComponent( event* the_event ){
194 <  
195 <  current_component = new Component;
196 <  int index = the_event->evt.blk_index;
197 <  char err[200];
198 <  
199 <  if( haveNComponents() && index < getNComponents() )
200 <    components[index] = current_component;
201 <  else{
202 <    if( haveNComponents()  ){
203 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
204 <               index );
205 <      the_event->err_msg = strdup( err );
206 <      return 0;
207 <    }
208 <    else{
209 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
210 <                                  " first component declaration." );
211 <      return 0;
212 <    }
213 <  }  
214 <
215 <  return 1;
216 < }
217 <
218 <
219 <
220 < int Globals::componentAssign( event* the_event ){
221 <
222 <  switch( the_event->evt.asmt.asmt_type ){
223 <    
224 <  case STRING:
225 <    return current_component->assignString( the_event->evt.asmt.lhs,
226 <                                            the_event->evt.asmt.rhs.sval,
227 <                                            &(the_event->err_msg));
228 <    break;
229 <    
230 <  case DOUBLE:
231 <    return current_component->assignDouble( the_event->evt.asmt.lhs,
232 <                                            the_event->evt.asmt.rhs.dval,
233 <                                            &(the_event->err_msg));
234 <    break;
235 <    
236 <  case INT:
237 <    return current_component->assignInt( the_event->evt.asmt.lhs,
238 <                                         the_event->evt.asmt.rhs.ival,
239 <                                         &(the_event->err_msg));
240 <    break;
241 <    
242 <  default:
243 <    the_event->err_msg = strdup( "Globals error. Invalid component"
244 <                                 " assignment type" );
245 <    return 0;
246 <    break;
247 <  }
248 <  return 0;
249 < }
250 <
251 < int Globals::componentEnd( event* the_event ){
252 <
253 <  the_event->err_msg = current_component->checkMe();
254 <  if( the_event->err_msg != NULL ) return 0;
124 >  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
125 >  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
126  
127 <  return 1;
128 < }
127 >  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
128 >  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
129 >  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
130 >  DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16);
131 >  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
132 >  DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
133 >  DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
134 >  DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
135 >  DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
136 >  DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
137 >  DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
138  
259 int Globals::newZconstraint( event* the_event ){
260  
139  
140 <  int index = the_event->evt.blk_index;
141 <  char err[200];
142 <  current_zConstraint = new ZconStamp( index );
143 <  
144 <  if( haveNZconstraints() && index < getNZconstraints() )
145 <    zConstraints[index] = current_zConstraint;
146 <  else{
147 <    if( haveNZconstraints() ){
270 <      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
271 <               index );
272 <      the_event->err_msg = strdup( err );
273 <      return 0;
274 <    }
275 <    else{
276 <      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
277 <                                  " not given before"
278 <                                  " first zConstraint declaration." );
279 <      return 0;
280 <    }
281 <  }  
282 <
283 <  return 1;
284 < }
285 <
286 <
287 <
288 < int Globals::zConstraintAssign( event* the_event ){
289 <
290 <  switch( the_event->evt.asmt.asmt_type ){
140 >  deprecatedKeywords_.insert("nComponents");
141 >  deprecatedKeywords_.insert("nZconstraints");
142 >  deprecatedKeywords_.insert("initialConfig");
143 >  deprecatedKeywords_.insert("thermIntDistSpringConst");
144 >  deprecatedKeywords_.insert("thermIntThetaSpringConst");
145 >  deprecatedKeywords_.insert("thermIntOmegaSpringConst");
146 >  deprecatedKeywords_.insert("useSolidThermInt");  
147 >  deprecatedKeywords_.insert("useLiquidThermInt");
148      
292  case STRING:
293    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
294                                              the_event->evt.asmt.rhs.sval,
295                                              &(the_event->err_msg));
296    break;
297    
298  case DOUBLE:
299    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
300                                              the_event->evt.asmt.rhs.dval,
301                                              &(the_event->err_msg));
302    break;
303    
304  case INT:
305    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
306                                           the_event->evt.asmt.rhs.ival,
307                                           &(the_event->err_msg));
308    break;
309    
310  default:
311    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
312                                 " assignment type" );
313    return 0;
314    break;
315  }
316  return 0;
149   }
150  
151 < int Globals::zConstraintEnd( event* the_event ){
152 <
153 <  the_event->err_msg = current_zConstraint->checkMe();
154 <  if( the_event->err_msg != NULL ) return 0;
323 <
324 <  return 1;
151 > Globals::~Globals() {
152 >    MemoryUtils::deletePointers(components_);
153 >    MemoryUtils::deletePointers(zconstraints_);
154 >    MemoryUtils::deletePointers(restraints_);
155   }
156  
157 < char* Globals::checkMe( void ){
157 > void Globals::validate() {
158 >  DataHolder::validate();
159  
329
330  std::string err("The following required keywords are missing:\n");
331  short int have_err = 0;
332
333  ParamMap::iterator i;
334  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
335    if (!i->second->isOptional() && i->second->empty()) {
336        err +=  i->second->getKeyword() + "\n";
337    }
338  }
339
160    CheckParameter(ForceField, isNotEmpty());
341  CheckParameter(NComponents,isPositive());
161    CheckParameter(TargetTemp, isPositive());
162 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) ||
344 <                                          isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))||
345 <                                          isEqualIgnoreCase(std::string("NPTxyz")) );
162 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("SMIPD"));
163    CheckParameter(Dt, isPositive());
164    CheckParameter(RunTime, isPositive());
348  CheckParameter(InitialConfig, isNotEmpty());
165    CheckParameter(FinalConfig, isNotEmpty());
350  CheckParameter(NMol, isPositive());
351  CheckParameter(Density, isPositive());
352  CheckParameter(Box, isPositive());
353  CheckParameter(BoxX, isPositive());
354  CheckParameter(BoxY, isPositive());
355  CheckParameter(BoxZ, isPositive());
166    CheckParameter(SampleTime, isNonNegative());
167    CheckParameter(ResetTime, isNonNegative());
168    CheckParameter(StatusTime, isNonNegative());
# Line 360 | Line 170 | char* Globals::checkMe( void ){
170    CheckParameter(SwitchingRadius, isNonNegative());
171    CheckParameter(Dielectric, isPositive());
172    CheckParameter(ThermalTime,  isNonNegative());
363  CheckParameter(TargetPressure,  isPositive());
173    CheckParameter(TauThermostat, isPositive());
174    CheckParameter(TauBarostat, isPositive());
175    CheckParameter(ZconsTime, isPositive());
367  CheckParameter(NZconstraints, isPositive());  
176    CheckParameter(ZconsTol, isPositive());
369  //CheckParameter(ZconsForcePolicy,);
177    CheckParameter(Seed, isPositive());
178 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
178 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
179    CheckParameter(MinimizerMaxIter, isPositive());
180    CheckParameter(MinimizerWriteFrq, isPositive());
181    CheckParameter(MinimizerStepSize, isPositive());
# Line 378 | Line 185 | char* Globals::checkMe( void ){
185    CheckParameter(MinimizerLSMaxIter, isPositive());
186    CheckParameter(ZconsGap, isPositive());
187    CheckParameter(ZconsFixtime, isPositive());
188 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
188 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
189    CheckParameter(ThermodynamicIntegrationK, isPositive());
190    CheckParameter(ForceFieldVariant, isNotEmpty());
191    CheckParameter(ForceFieldFileName, isNotEmpty());
192 <  CheckParameter(ThermIntDistSpringConst, isPositive());
193 <  CheckParameter(ThermIntThetaSpringConst, isPositive());
194 <  CheckParameter(ThermIntOmegaSpringConst, isPositive());
195 <  CheckParameter(SurfaceTension, isPositive());
389 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE"))  || isEqualIgnoreCase(std::string("REACTION_FIELD")));
390 <  CheckParameter(ScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
391 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
192 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
193 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
194 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
195 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
196    //CheckParameter(StatFileFormat,);    
393  //CheckParameter(MixingRule,);
197    CheckParameter(OrthoBoxTolerance, isPositive());  
198 <  CheckParameter(ThermIntDistSpringConst, isPositive());
396 <  CheckParameter(ThermIntThetaSpringConst, isPositive());
397 <  CheckParameter(ThermIntOmegaSpringConst, isPositive());
398 <  CheckParameter(DampingAlpha,isPositive());
198 >  CheckParameter(DampingAlpha,isNonNegative());
199    CheckParameter(SkinThickness, isPositive());
200 +  CheckParameter(Viscosity, isNonNegative());
201 +  CheckParameter(BeadSize, isPositive());
202 +  CheckParameter(FrozenBufferRadius, isPositive());
203 +  CheckParameter(LangevinBufferRadius, isPositive());
204 +  CheckParameter(NeighborListNeighbors, isPositive());
205 +  CheckParameter(RNEMD_exchangeTime, isPositive());
206 +  CheckParameter(RNEMD_nBins, isPositive() && isEven());
207 +  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
208 +  CheckParameter(RNEMD_targetFlux, isNonNegative());
209 +  CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
210 +  CheckParameter(Alpha, isPositive());
211 +
212    
213 <  //@todo memory leak
214 <  if( have_err )
215 <    return strdup( err.c_str() );
213 >  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
214 >    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
215 >        std::ostringstream oss;
216 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
217 >        throw OpenMDException(oss.str());          
218 >    }
219 >  }
220 > }
221    
222 <  return NULL;
222 > bool Globals::addComponent(Component* comp) {
223 >    components_.push_back(comp);
224 >    return true;
225 > }
226  
227 + bool Globals::addZConsStamp(ZConsStamp* zcons) {
228 +    zconstraints_.push_back(zcons);
229 +    return true;
230 + }
231  
232 + bool Globals::addRestraintStamp(RestraintStamp* rest) {
233 +    restraints_.push_back(rest);
234 +    return true;
235   }
236  
237 < int Globals::globalEnd( event* the_event ){
238 <  
239 <  the_event->err_msg = checkMe();
240 <  if( the_event->err_msg != NULL ) return 0;
237 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
238 >    std::string molStampName = molStamp->getName();
239 >    std::map<std::string, MoleculeStamp*>::iterator i;
240 >    bool ret = false;
241 >    i = moleculeStamps_.find(molStampName);
242 >    if (i == moleculeStamps_.end()) {
243 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
244 >        ret = true;
245 >    } else {
246 >        std::ostringstream oss;
247 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
248 >        throw OpenMDException(oss.str());  
249 >    }
250 >    return ret;
251 > }
252 >
253  
415  return 1;
254   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines