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

Comparing trunk/OOPSE-2.0/src/io/Globals.cpp (file contents):
Revision 2364 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
Revision 2372 by tim, Mon Oct 17 00:51:16 2005 UTC

# Line 50 | Line 50
50   #include "io/mpiBASS.h"
51   #endif // is_mpi
52  
53 + #include "io/ParamConstraint.hpp"
54  
55   #define DefineParameter(NAME,KEYWORD)                              \
56    NAME.setKeyword(KEYWORD);                  \
# Line 63 | Line 64 | Globals::Globals(){
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())) std::cout <<"Error in parsing " << NAME.getKeyword() << " : "<< (CONSTRAINT).getConstraintDescription() << std::endl; }                
69 +
70 +
71   Globals::Globals(){
72  
73    DefineParameter(ForceField, "forceField")
# Line 127 | Line 132 | Globals::Globals(){
132    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
133    DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
134    DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
135 +  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
136 +  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
137 +  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
138    DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
139    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
140    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
# Line 136 | Line 144 | int Globals::globalAssign( event* the_event ){
144   int Globals::globalAssign( event* the_event ){
145    
146    int key;
139 –  int token;
147    interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
148    char* lhs = the_event->evt.asmt.lhs;
149    std::string keyword(lhs);
150  
151 <  bool result;
151 >  bool result = false;
152  
146 –
153    ParamMap::iterator i =parameters_.find(keyword);
154    if (i != parameters_.end()) {
155      if( the_type == STRING ){
156         result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
157         if (!result ) {
158 <            sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
158 >            sprintf(the_event->err_msg, "Error in parsing %s: expect %s, but get %s.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.sval);
159         }
160      } else if( the_type == DOUBLE ){
161        result = i->second->setData(the_event->evt.asmt.rhs.dval);
162         if (!result )
163 <         sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
163 >         sprintf(the_event->err_msg, "Error in parsing %s: expect %s, but get %f.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.dval );
164      }      
165      else if (the_type == INT ){
166        result = i->second->setData(the_event->evt.asmt.rhs.ival);
167         if (!result )
168 <         sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
168 >         sprintf(the_event->err_msg,  "Error in parsing %s: expect %s, but get %d.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.ival );
169        
170      } else {
171 <    
171 >        sprintf(the_event->err_msg,  "%s is an unrecognized keyword\n", keyword.c_str() );
172      }
173    }
174  
# Line 322 | Line 328 | char* Globals::checkMe( void ){
328      }
329    }
330  
331 +  CheckParameter(ForceField, isNotEmpty());
332 +  CheckParameter(NComponents,isPositive());
333 +  CheckParameter(TargetTemp, isPositive());
334 +  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) ||
335 +                                          isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))||
336 +                                          isEqualIgnoreCase(std::string("NPTxyz")) );
337 +
338 +  CheckParameter(Dt, isPositive());
339 +  CheckParameter(RunTime, isPositive());
340 +  CheckParameter(InitialConfig, isNotEmpty());
341 +  CheckParameter(FinalConfig, isNotEmpty());
342 +  CheckParameter(NMol, isPositive());
343 +  CheckParameter(Density, isPositive());
344 +  CheckParameter(Box, isPositive());
345 +  CheckParameter(BoxX, isPositive());
346 +  CheckParameter(BoxY, isPositive());
347 +  CheckParameter(BoxZ, isPositive());
348 +  CheckParameter(SampleTime, isNonNegative());
349 +  CheckParameter(ResetTime, isNonNegative());
350 +  CheckParameter(StatusTime, isNonNegative());
351 +  CheckParameter(CutoffRadius, isPositive());
352 +  CheckParameter(SwitchingRadius, isNonNegative());
353 +  CheckParameter(Dielectric, isPositive());
354 +  CheckParameter(ThermalTime,  isNonNegative());
355 +  CheckParameter(TargetPressure,  isPositive());
356 +  CheckParameter(TauThermostat, isPositive());
357 +  CheckParameter(TauBarostat, isPositive());
358 +  CheckParameter(ZconsTime, isPositive());
359 +  CheckParameter(NZconstraints, isPositive());  
360 +  CheckParameter(ZconsTol, isPositive());
361 +  //CheckParameter(ZconsForcePolicy,);
362 +  CheckParameter(Seed, isPositive());
363 +  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
364 +  CheckParameter(MinimizerMaxIter, isPositive());
365 +  CheckParameter(MinimizerWriteFrq, isPositive());
366 +  CheckParameter(MinimizerStepSize, isPositive());
367 +  CheckParameter(MinimizerFTol, isPositive());
368 +  CheckParameter(MinimizerGTol, isPositive());
369 +  CheckParameter(MinimizerLSTol, isPositive());
370 +  CheckParameter(MinimizerLSMaxIter, isPositive());
371 +  CheckParameter(ZconsGap, isPositive());
372 +  CheckParameter(ZconsFixtime, isPositive());
373 +  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
374 +  CheckParameter(ThermodynamicIntegrationK, isPositive());
375 +  CheckParameter(ForceFieldVariant, isNotEmpty());
376 +  CheckParameter(ForceFieldFileName, isNotEmpty());
377 +  CheckParameter(ThermIntDistSpringConst, isPositive());
378 +  CheckParameter(ThermIntThetaSpringConst, isPositive());
379 +  CheckParameter(ThermIntOmegaSpringConst, isPositive());
380 +  CheckParameter(SurfaceTension, isPositive());
381 +  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("UNDAMPED_WOLF")) || isEqualIgnoreCase(std::string("DAMPED_WOLF")) || isEqualIgnoreCase(std::string("REACTION_FIELD")) );
382 +  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
383 +  //CheckParameter(StatFileFormat,);    
384 +  //CheckParameter(MixingRule,);
385 +  CheckParameter(OrthoBoxTolerance, isPositive());  
386 +  CheckParameter(ThermIntDistSpringConst, isPositive());
387 +  CheckParameter(ThermIntThetaSpringConst, isPositive());
388 +  CheckParameter(ThermIntOmegaSpringConst, isPositive());
389 +  CheckParameter(DampingAlpha,isPositive());
390 +  CheckParameter(SkinThickness, isPositive());
391 +  
392    //@todo memory leak
393    if( have_err )
394      return strdup( err.c_str() );

Diff Legend

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