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 765 by gezelter, Mon Nov 21 22:59:36 2005 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1616 by gezelter, Tue Aug 30 15:45:35 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]  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 < using namespace oopse;
56 <
57 < Globals::Globals(){
58 <
52 > namespace OpenMD {
53 > Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
60  DefineParameter(NComponents, "nComponents")
55  
56    DefineOptionalParameter(TargetTemp, "targetTemp");
57    DefineOptionalParameter(Ensemble, "ensemble");
58    DefineOptionalParameter(Dt, "dt");
59    DefineOptionalParameter(RunTime, "runTime");
66  DefineOptionalParameter(InitialConfig, "initialConfig");
60    DefineOptionalParameter(FinalConfig, "finalConfig");
68  DefineOptionalParameter(NMol, "nMol");
69  DefineOptionalParameter(Density, "density");
70  DefineOptionalParameter(Box, "box");
71  DefineOptionalParameter(BoxX, "boxX");
72  DefineOptionalParameter(BoxY, "boxY");
73  DefineOptionalParameter(BoxZ, "boxZ");
61    DefineOptionalParameter(SampleTime, "sampleTime");
62    DefineOptionalParameter(ResetTime, "resetTime");
63    DefineOptionalParameter(StatusTime, "statusTime");
64    DefineOptionalParameter(CutoffRadius, "cutoffRadius");
65    DefineOptionalParameter(SwitchingRadius, "switchingRadius");
79  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");
86  DefineOptionalParameter(NZconstraints, "nZconstraints");  
72    DefineOptionalParameter(ZconsTol, "zconsTol");
73    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
74    DefineOptionalParameter(Seed, "seed");
75    DefineOptionalParameter(Minimizer, "minimizer");
76    DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
77 <  DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
77 >  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
78    DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
79    DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
80    DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
# Line 102 | Line 87 | Globals::Globals(){
87    DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
88    DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89    DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90 <  DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
106 <  DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
107 <  DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
90 >  DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91    DefineOptionalParameter(SurfaceTension, "surfaceTension");
92    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93 <  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
94 <  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
112 <  DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
93 >  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94 >  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
96 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
96 >  DefineOptionalParameter(HydroPropFile, "HydroPropFile");
97 >  DefineOptionalParameter(Viscosity, "viscosity");
98 >  DefineOptionalParameter(BeadSize, "beadSize");
99 >  DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
100 >  DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
101 >  DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
102 >  DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
103 >  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
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 >  
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);
122 <  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
123 <  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
124 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
117 >  DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
118 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
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 <  
131 < }
132 <
133 < Globals::~Globals(){
134 <  int i;
135 <  if( components != NULL ){
136 <    for( i=0; i< getNComponents(); i++ ) delete components[i];
137 <    delete[] components;
138 <  }
139 <  
140 <  if( zConstraints != NULL ){
141 <    for( i=0; i< getNZconstraints(); i++ ) delete zConstraints[i];
142 <    delete[] zConstraints;
143 <  }
144 <  
145 < }
146 <
147 < int Globals::globalAssign( event* the_event ){
148 <  char errorMessage[65535];
149 <  int key;
150 <  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
151 <  char* lhs = the_event->evt.asmt.lhs;
152 <  std::string keyword(lhs);
153 <
154 <  bool result = false;
155 <
156 <  /**@todo fix memory leak */  
157 <  ParamMap::iterator i =parameters_.find(keyword);
158 <  if (i != parameters_.end()) {
159 <    if( the_type == STRING ){
160 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
161 <       if (!result ) {
162 <            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);
163 <            the_event->err_msg = strdup(errorMessage);
164 <       }
165 <    } else if( the_type == DOUBLE ){
166 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
167 <       if (!result )
168 <         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 );
169 <       the_event->err_msg = strdup(errorMessage);
170 <    }      
171 <    else if (the_type == INT ){
172 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
173 <       if (!result )
174 <         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 );
175 <       the_event->err_msg = strdup(errorMessage);
176 <      
177 <    } else {
178 <        sprintf(errorMessage,  "Internal error of parser\n");
179 <        the_event->err_msg = strdup(errorMessage);
180 <    }
181 <  } else {
182 <    sprintf(errorMessage,  "%s is an unrecognized keyword\n", keyword.c_str() );
183 <    the_event->err_msg = strdup(errorMessage);
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()];
190 <  }
191 <  
192 <  return result;
193 < }
194 <
195 < int Globals::newComponent( event* the_event ){
196 <  
197 <  current_component = new Component;
198 <  int index = the_event->evt.blk_index;
199 <  char err[200];
200 <  
201 <  if( haveNComponents() && index < getNComponents() )
202 <    components[index] = current_component;
203 <  else{
204 <    if( haveNComponents()  ){
205 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
206 <               index );
207 <      the_event->err_msg = strdup( err );
208 <      return 0;
209 <    }
210 <    else{
211 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
212 <                                  " first component declaration." );
213 <      return 0;
214 <    }
215 <  }  
216 <
217 <  return 1;
218 < }
219 <
220 <
221 <
222 < int Globals::componentAssign( event* the_event ){
223 <
224 <  switch( the_event->evt.asmt.asmt_type ){
225 <    
226 <  case STRING:
227 <    return current_component->assignString( the_event->evt.asmt.lhs,
228 <                                            the_event->evt.asmt.rhs.sval,
229 <                                            &(the_event->err_msg));
230 <    break;
231 <    
232 <  case DOUBLE:
233 <    return current_component->assignDouble( the_event->evt.asmt.lhs,
234 <                                            the_event->evt.asmt.rhs.dval,
235 <                                            &(the_event->err_msg));
236 <    break;
237 <    
238 <  case INT:
239 <    return current_component->assignInt( the_event->evt.asmt.lhs,
240 <                                         the_event->evt.asmt.rhs.ival,
241 <                                         &(the_event->err_msg));
242 <    break;
243 <    
244 <  default:
245 <    the_event->err_msg = strdup( "Globals error. Invalid component"
246 <                                 " assignment type" );
247 <    return 0;
248 <    break;
249 <  }
250 <  return 0;
251 < }
252 <
253 < int Globals::componentEnd( event* the_event ){
124 >  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
125 >  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
126  
127 <  the_event->err_msg = current_component->checkMe();
128 <  if( the_event->err_msg != NULL ) return 0;
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  
258  return 1;
259 }
139  
261 int Globals::newZconstraint( event* the_event ){
262  
140  
141 <  int index = the_event->evt.blk_index;
142 <  char err[200];
143 <  current_zConstraint = new ZconStamp( index );
144 <  
145 <  if( haveNZconstraints() && index < getNZconstraints() )
146 <    zConstraints[index] = current_zConstraint;
147 <  else{
148 <    if( haveNZconstraints() ){
272 <      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
273 <               index );
274 <      the_event->err_msg = strdup( err );
275 <      return 0;
276 <    }
277 <    else{
278 <      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
279 <                                  " not given before"
280 <                                  " first zConstraint declaration." );
281 <      return 0;
282 <    }
283 <  }  
284 <
285 <  return 1;
286 < }
287 <
288 <
289 <
290 < int Globals::zConstraintAssign( event* the_event ){
291 <
292 <  switch( the_event->evt.asmt.asmt_type ){
141 >  deprecatedKeywords_.insert("nComponents");
142 >  deprecatedKeywords_.insert("nZconstraints");
143 >  deprecatedKeywords_.insert("initialConfig");
144 >  deprecatedKeywords_.insert("thermIntDistSpringConst");
145 >  deprecatedKeywords_.insert("thermIntThetaSpringConst");
146 >  deprecatedKeywords_.insert("thermIntOmegaSpringConst");
147 >  deprecatedKeywords_.insert("useSolidThermInt");  
148 >  deprecatedKeywords_.insert("useLiquidThermInt");
149      
294  case STRING:
295    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
296                                              the_event->evt.asmt.rhs.sval,
297                                              &(the_event->err_msg));
298    break;
299    
300  case DOUBLE:
301    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
302                                              the_event->evt.asmt.rhs.dval,
303                                              &(the_event->err_msg));
304    break;
305    
306  case INT:
307    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
308                                           the_event->evt.asmt.rhs.ival,
309                                           &(the_event->err_msg));
310    break;
311    
312  default:
313    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
314                                 " assignment type" );
315    return 0;
316    break;
317  }
318  return 0;
150   }
151  
152 < int Globals::zConstraintEnd( event* the_event ){
153 <
154 <  the_event->err_msg = current_zConstraint->checkMe();
155 <  if( the_event->err_msg != NULL ) return 0;
325 <
326 <  return 1;
152 > Globals::~Globals() {
153 >    MemoryUtils::deletePointers(components_);
154 >    MemoryUtils::deletePointers(zconstraints_);
155 >    MemoryUtils::deletePointers(restraints_);
156   }
157  
158 < char* Globals::checkMe( void ){
158 > void Globals::validate() {
159 >  DataHolder::validate();
160  
331
332  std::string err("The following required keywords are missing:\n");
333  short int have_err = 0;
334
335  ParamMap::iterator i;
336  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
337    if (!i->second->isOptional() && i->second->empty()) {
338        err +=  i->second->getKeyword() + "\n";
339    }
340  }
341
161    CheckParameter(ForceField, isNotEmpty());
343  CheckParameter(NComponents,isPositive());
162    CheckParameter(TargetTemp, isPositive());
163 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
163 >  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"));
164    CheckParameter(Dt, isPositive());
165    CheckParameter(RunTime, isPositive());
348  CheckParameter(InitialConfig, isNotEmpty());
166    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());
167    CheckParameter(SampleTime, isNonNegative());
168    CheckParameter(ResetTime, isNonNegative());
169    CheckParameter(StatusTime, isNonNegative());
# Line 360 | Line 171 | char* Globals::checkMe( void ){
171    CheckParameter(SwitchingRadius, isNonNegative());
172    CheckParameter(Dielectric, isPositive());
173    CheckParameter(ThermalTime,  isNonNegative());
363  CheckParameter(TargetPressure,  isPositive());
174    CheckParameter(TauThermostat, isPositive());
175    CheckParameter(TauBarostat, isPositive());
176    CheckParameter(ZconsTime, isPositive());
367  CheckParameter(NZconstraints, isPositive());  
177    CheckParameter(ZconsTol, isPositive());
369  //CheckParameter(ZconsForcePolicy,);
178    CheckParameter(Seed, isPositive());
179 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
179 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
180    CheckParameter(MinimizerMaxIter, isPositive());
181 <  CheckParameter(MinimizerWriteFrq, isPositive());
181 >  CheckParameter(MinimizerWriteFreq, isPositive());
182    CheckParameter(MinimizerStepSize, isPositive());
183    CheckParameter(MinimizerFTol, isPositive());
184    CheckParameter(MinimizerGTol, isPositive());
# Line 378 | Line 186 | char* Globals::checkMe( void ){
186    CheckParameter(MinimizerLSMaxIter, isPositive());
187    CheckParameter(ZconsGap, isPositive());
188    CheckParameter(ZconsFixtime, isPositive());
189 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
189 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
190    CheckParameter(ThermodynamicIntegrationK, isPositive());
191    CheckParameter(ForceFieldVariant, isNotEmpty());
192    CheckParameter(ForceFieldFileName, isNotEmpty());
193 <  CheckParameter(ThermIntDistSpringConst, isPositive());
194 <  CheckParameter(ThermIntThetaSpringConst, isPositive());
195 <  CheckParameter(ThermIntOmegaSpringConst, isPositive());
196 <  CheckParameter(SurfaceTension, isPositive());
197 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
390 <  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
391 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
392 <  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
393 <  //CheckParameter(StatFileFormat,);    
394 <  //CheckParameter(MixingRule,);
193 >  CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
194 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
195 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
196 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
197 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
198    CheckParameter(OrthoBoxTolerance, isPositive());  
396  CheckParameter(ThermIntDistSpringConst, isPositive());
397  CheckParameter(ThermIntThetaSpringConst, isPositive());
398  CheckParameter(ThermIntOmegaSpringConst, isPositive());
199    CheckParameter(DampingAlpha,isNonNegative());
200    CheckParameter(SkinThickness, isPositive());
201 +  CheckParameter(Viscosity, isNonNegative());
202 +  CheckParameter(BeadSize, isPositive());
203 +  CheckParameter(FrozenBufferRadius, isPositive());
204 +  CheckParameter(LangevinBufferRadius, isPositive());
205 +  CheckParameter(NeighborListNeighbors, isPositive());
206 +  CheckParameter(RNEMD_exchangeTime, isPositive());
207 +  CheckParameter(RNEMD_nBins, isPositive() && isEven());
208 +  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
209 +  CheckParameter(RNEMD_targetFlux, isNonNegative());
210 +  CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
211 +  CheckParameter(Alpha, isPositive());
212 +
213    
214 <  //@todo memory leak
215 <  if( have_err )
216 <    return strdup( err.c_str() );
217 <  
218 <  return NULL;
214 >  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
215 >    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
216 >        std::ostringstream oss;
217 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
218 >        throw OpenMDException(oss.str());          
219 >    }
220 >  }
221 > }
222  
223 + bool Globals::addComponent(Component* comp) {
224 +    components_.push_back(comp);
225 +    return true;
226 + }
227  
228 + bool Globals::addZConsStamp(ZConsStamp* zcons) {
229 +    zconstraints_.push_back(zcons);
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::addRestraintStamp(RestraintStamp* rest) {
234 >    restraints_.push_back(rest);
235 >    return true;
236 > }
237  
238 <  return 1;
238 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
239 >    std::string molStampName = molStamp->getName();
240 >    std::map<std::string, MoleculeStamp*>::iterator i;
241 >    bool ret = false;
242 >    i = moleculeStamps_.find(molStampName);
243 >    if (i == moleculeStamps_.end()) {
244 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
245 >        ret = true;
246 >    } else {
247 >        std::ostringstream oss;
248 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
249 >        throw OpenMDException(oss.str());  
250 >    }
251 >    return ret;
252   }
253 +
254 +
255 + }

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 765 by gezelter, Mon Nov 21 22:59:36 2005 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1616 by gezelter, Tue Aug 30 15:45:35 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines