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

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
Revision 1398 by gezelter, Tue Dec 8 22:17:02 2009 UTC

# Line 6 | Line 6
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(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
93 >  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94 >  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
96    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
97 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
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 >  
110 >
111 >  
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", 0.2);
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 <  
144 < }
145 <
146 < int Globals::globalAssign( event* the_event ){
147 <  char errorMessage[65535];
148 <  int key;
149 <  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
150 <  char* lhs = the_event->evt.asmt.lhs;
151 <  std::string keyword(lhs);
152 <
153 <  bool result = false;
154 <
155 <  /**@todo fix memory leak */  
156 <  ParamMap::iterator i =parameters_.find(keyword);
157 <  if (i != parameters_.end()) {
158 <    if( the_type == STRING ){
159 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
160 <       if (!result ) {
161 <            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);
162 <            the_event->err_msg = strdup(errorMessage);
163 <       }
164 <    } else if( the_type == DOUBLE ){
165 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
166 <       if (!result )
167 <         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 );
168 <       the_event->err_msg = strdup(errorMessage);
169 <    }      
170 <    else if (the_type == INT ){
171 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
172 <       if (!result )
173 <         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 );
174 <       the_event->err_msg = strdup(errorMessage);
175 <      
176 <    } else {
177 <        sprintf(errorMessage,  "Internal error of parser\n");
178 <        the_event->err_msg = strdup(errorMessage);
179 <    }
180 <  } else {
181 <    sprintf(errorMessage,  "%s is an unrecognized keyword\n", keyword.c_str() );
182 <    the_event->err_msg = strdup(errorMessage);
183 <  }
184 <
185 <  if (keyword == "nComponents" && getNComponents() > 0) {
186 <    components = new Component*[getNComponents()];
187 <  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
188 <    zConstraints = new ZconStamp*[getNZconstraints()];
189 <  }
190 <  
191 <  return result;
192 < }
193 <
194 < int Globals::newComponent( event* the_event ){
195 <  
196 <  current_component = new Component;
197 <  int index = the_event->evt.blk_index;
198 <  char err[200];
199 <  
200 <  if( haveNComponents() && index < getNComponents() )
201 <    components[index] = current_component;
202 <  else{
203 <    if( haveNComponents()  ){
204 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
205 <               index );
206 <      the_event->err_msg = strdup( err );
207 <      return 0;
208 <    }
209 <    else{
210 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
211 <                                  " first component declaration." );
212 <      return 0;
213 <    }
214 <  }  
215 <
216 <  return 1;
217 < }
218 <
219 <
220 <
221 < int Globals::componentAssign( event* the_event ){
222 <
223 <  switch( the_event->evt.asmt.asmt_type ){
224 <    
225 <  case STRING:
226 <    return current_component->assignString( the_event->evt.asmt.lhs,
227 <                                            the_event->evt.asmt.rhs.sval,
228 <                                            &(the_event->err_msg));
229 <    break;
230 <    
231 <  case DOUBLE:
232 <    return current_component->assignDouble( the_event->evt.asmt.lhs,
233 <                                            the_event->evt.asmt.rhs.dval,
234 <                                            &(the_event->err_msg));
235 <    break;
236 <    
237 <  case INT:
238 <    return current_component->assignInt( the_event->evt.asmt.lhs,
239 <                                         the_event->evt.asmt.rhs.ival,
240 <                                         &(the_event->err_msg));
241 <    break;
242 <    
243 <  default:
244 <    the_event->err_msg = strdup( "Globals error. Invalid component"
245 <                                 " assignment type" );
246 <    return 0;
247 <    break;
248 <  }
249 <  return 0;
250 < }
251 <
252 < int Globals::componentEnd( event* the_event ){
253 <
254 <  the_event->err_msg = current_component->checkMe();
255 <  if( the_event->err_msg != NULL ) return 0;
256 <
257 <  return 1;
258 < }
124 >  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
125 >  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
126  
127 < int Globals::newZconstraint( event* the_event ){
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  
263 –  int index = the_event->evt.blk_index;
264 –  char err[200];
265 –  current_zConstraint = new ZconStamp( index );
266 –  
267 –  if( haveNZconstraints() && index < getNZconstraints() )
268 –    zConstraints[index] = current_zConstraint;
269 –  else{
270 –    if( haveNZconstraints() ){
271 –      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
272 –               index );
273 –      the_event->err_msg = strdup( err );
274 –      return 0;
275 –    }
276 –    else{
277 –      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
278 –                                  " not given before"
279 –                                  " first zConstraint declaration." );
280 –      return 0;
281 –    }
282 –  }  
138  
139 <  return 1;
140 < }
141 <
142 <
143 <
144 < int Globals::zConstraintAssign( event* the_event ){
145 <
146 <  switch( the_event->evt.asmt.asmt_type ){
139 >  deprecatedKeywords_.insert("nComponents");
140 >  deprecatedKeywords_.insert("nZconstraints");
141 >  deprecatedKeywords_.insert("initialConfig");
142 >  deprecatedKeywords_.insert("thermIntDistSpringConst");
143 >  deprecatedKeywords_.insert("thermIntThetaSpringConst");
144 >  deprecatedKeywords_.insert("thermIntOmegaSpringConst");
145 >  deprecatedKeywords_.insert("useSolidThermInt");  
146 >  deprecatedKeywords_.insert("useLiquidThermInt");
147      
293 –  case STRING:
294 –    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
295 –                                              the_event->evt.asmt.rhs.sval,
296 –                                              &(the_event->err_msg));
297 –    break;
298 –    
299 –  case DOUBLE:
300 –    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
301 –                                              the_event->evt.asmt.rhs.dval,
302 –                                              &(the_event->err_msg));
303 –    break;
304 –    
305 –  case INT:
306 –    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
307 –                                           the_event->evt.asmt.rhs.ival,
308 –                                           &(the_event->err_msg));
309 –    break;
310 –    
311 –  default:
312 –    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
313 –                                 " assignment type" );
314 –    return 0;
315 –    break;
316 –  }
317 –  return 0;
148   }
149  
150 < int Globals::zConstraintEnd( event* the_event ){
151 <
152 <  the_event->err_msg = current_zConstraint->checkMe();
153 <  if( the_event->err_msg != NULL ) return 0;
324 <
325 <  return 1;
150 > Globals::~Globals() {
151 >    MemoryUtils::deletePointers(components_);
152 >    MemoryUtils::deletePointers(zconstraints_);
153 >    MemoryUtils::deletePointers(restraints_);
154   }
155  
156 < char* Globals::checkMe( void ){
156 > void Globals::validate() {
157 >  DataHolder::validate();
158  
330 –
331 –  std::string err("The following required keywords are missing:\n");
332 –  short int have_err = 0;
333 –
334 –  ParamMap::iterator i;
335 –  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
336 –    if (!i->second->isOptional() && i->second->empty()) {
337 –        err +=  i->second->getKeyword() + "\n";
338 –    }
339 –  }
340 –
159    CheckParameter(ForceField, isNotEmpty());
342 –  CheckParameter(NComponents,isPositive());
160    CheckParameter(TargetTemp, isPositive());
161 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) ||
345 <                 isEqualIgnoreCase(std::string("NVT")) ||
346 <                 isEqualIgnoreCase(std::string("NPTi")) ||
347 <                 isEqualIgnoreCase(std::string("NPTf")) ||
348 <                 isEqualIgnoreCase(std::string("NPTxyz")) );
161 >  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"));
162    CheckParameter(Dt, isPositive());
163    CheckParameter(RunTime, isPositive());
351 –  CheckParameter(InitialConfig, isNotEmpty());
164    CheckParameter(FinalConfig, isNotEmpty());
353 –  CheckParameter(NMol, isPositive());
354 –  CheckParameter(Density, isPositive());
355 –  CheckParameter(Box, isPositive());
356 –  CheckParameter(BoxX, isPositive());
357 –  CheckParameter(BoxY, isPositive());
358 –  CheckParameter(BoxZ, isPositive());
165    CheckParameter(SampleTime, isNonNegative());
166    CheckParameter(ResetTime, isNonNegative());
167    CheckParameter(StatusTime, isNonNegative());
# Line 363 | Line 169 | char* Globals::checkMe( void ){
169    CheckParameter(SwitchingRadius, isNonNegative());
170    CheckParameter(Dielectric, isPositive());
171    CheckParameter(ThermalTime,  isNonNegative());
366 –  CheckParameter(TargetPressure,  isPositive());
172    CheckParameter(TauThermostat, isPositive());
173    CheckParameter(TauBarostat, isPositive());
174    CheckParameter(ZconsTime, isPositive());
370 –  CheckParameter(NZconstraints, isPositive());  
175    CheckParameter(ZconsTol, isPositive());
372 –  //CheckParameter(ZconsForcePolicy,);
176    CheckParameter(Seed, isPositive());
177 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) ||
375 <                 isEqualIgnoreCase(std::string("CG")));
177 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
178    CheckParameter(MinimizerMaxIter, isPositive());
179    CheckParameter(MinimizerWriteFrq, isPositive());
180    CheckParameter(MinimizerStepSize, isPositive());
# Line 382 | Line 184 | char* Globals::checkMe( void ){
184    CheckParameter(MinimizerLSMaxIter, isPositive());
185    CheckParameter(ZconsGap, isPositive());
186    CheckParameter(ZconsFixtime, isPositive());
187 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
187 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
188    CheckParameter(ThermodynamicIntegrationK, isPositive());
189    CheckParameter(ForceFieldVariant, isNotEmpty());
190    CheckParameter(ForceFieldFileName, isNotEmpty());
191 <  CheckParameter(ThermIntDistSpringConst, isPositive());
192 <  CheckParameter(ThermIntThetaSpringConst, isPositive());
193 <  CheckParameter(ThermIntOmegaSpringConst, isPositive());
194 <  CheckParameter(SurfaceTension, isPositive());
393 <  CheckParameter(ElectrostaticSummationMethod,
394 <                 isEqualIgnoreCase(std::string("NONE")) ||
395 <                 isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) ||
396 <                 isEqualIgnoreCase(std::string("SHIFTED_FORCE")) ||
397 <                 isEqualIgnoreCase(std::string("REACTION_FIELD")));
398 <  CheckParameter(ElectrostaticScreeningMethod,
399 <                 isEqualIgnoreCase(std::string("UNDAMPED")) ||
400 <                 isEqualIgnoreCase(std::string("DAMPED")));
401 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) ||
402 <                 isEqualIgnoreCase(std::string("MAX")) ||
403 <                 isEqualIgnoreCase(std::string("TRADITIONAL")));
404 <  CheckParameter(SwitchingFunctionType,
405 <                 isEqualIgnoreCase(std::string("CUBIC")) ||
406 <                 isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
191 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
192 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
193 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
194 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
195    //CheckParameter(StatFileFormat,);    
408 –  //CheckParameter(MixingRule,);
196    CheckParameter(OrthoBoxTolerance, isPositive());  
410 –  CheckParameter(ThermIntDistSpringConst, isPositive());
411 –  CheckParameter(ThermIntThetaSpringConst, isPositive());
412 –  CheckParameter(ThermIntOmegaSpringConst, isPositive());
197    CheckParameter(DampingAlpha,isNonNegative());
198    CheckParameter(SkinThickness, isPositive());
199 +  CheckParameter(Viscosity, isNonNegative());
200 +  CheckParameter(BeadSize, isPositive());
201 +  CheckParameter(FrozenBufferRadius, isPositive());
202 +  CheckParameter(LangevinBufferRadius, isPositive());
203 +  CheckParameter(NeighborListNeighbors, isPositive());
204 +  CheckParameter(RNEMD_exchangeTime, isPositive());
205 +  CheckParameter(RNEMD_nBins, isPositive() && isEven());
206 +  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
207 +  CheckParameter(RNEMD_targetFlux, isNonNegative());
208 +
209 +  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
210 +    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
211 +        std::ostringstream oss;
212 +        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
213 +        throw OpenMDException(oss.str());          
214 +    }
215 +  }
216 + }
217    
218 <  //@todo memory leak
219 <  if( have_err )
220 <    return strdup( err.c_str() );
221 <  
420 <  return NULL;
218 > bool Globals::addComponent(Component* comp) {
219 >    components_.push_back(comp);
220 >    return true;
221 > }
222  
223 + bool Globals::addZConsStamp(ZConsStamp* zcons) {
224 +    zconstraints_.push_back(zcons);
225 +    return true;
226 + }
227  
228 + bool Globals::addRestraintStamp(RestraintStamp* rest) {
229 +    restraints_.push_back(rest);
230 +    return true;
231   }
232  
233 < int Globals::globalEnd( event* the_event ){
234 <  
235 <  the_event->err_msg = checkMe();
236 <  if( the_event->err_msg != NULL ) return 0;
233 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
234 >    std::string molStampName = molStamp->getName();
235 >    std::map<std::string, MoleculeStamp*>::iterator i;
236 >    bool ret = false;
237 >    i = moleculeStamps_.find(molStampName);
238 >    if (i == moleculeStamps_.end()) {
239 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
240 >        ret = true;
241 >    } else {
242 >        std::ostringstream oss;
243 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
244 >        throw OpenMDException(oss.str());  
245 >    }
246 >    return ret;
247 > }
248 >
249  
430 –  return 1;
250   }

Diff Legend

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