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 681 by tim, Mon Oct 17 23:13:44 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 46 | Line 46
46  
47   #include "io/Globals.hpp"
48   #include "utils/simError.h"
49 – #ifdef IS_MPI
50 – #include "io/mpiBASS.h"
51 – #endif // is_mpi
49  
50   #include "io/ParamConstraint.hpp"
51  
52 < #define DefineParameter(NAME,KEYWORD)                              \
53 <  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 oopse {
53 > Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
73 –  DefineParameter(NComponents, "nComponents")
55  
56    DefineOptionalParameter(TargetTemp, "targetTemp");
57    DefineOptionalParameter(Ensemble, "ensemble");
# Line 78 | Line 59 | Globals::Globals(){
59    DefineOptionalParameter(RunTime, "runTime");
60    DefineOptionalParameter(InitialConfig, "initialConfig");
61    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");
62    DefineOptionalParameter(SampleTime, "sampleTime");
63    DefineOptionalParameter(ResetTime, "resetTime");
64    DefineOptionalParameter(StatusTime, "statusTime");
# Line 96 | Line 71 | Globals::Globals(){
71    DefineOptionalParameter(TauThermostat, "tauThermostat");
72    DefineOptionalParameter(TauBarostat, "tauBarostat");
73    DefineOptionalParameter(ZconsTime, "zconsTime");
99 –  DefineOptionalParameter(NZconstraints, "nZconstraints");  
74    DefineOptionalParameter(ZconsTol, "zconsTol");
75    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
76    DefineOptionalParameter(Seed, "seed");
# Line 121 | Line 95 | Globals::Globals(){
95    DefineOptionalParameter(SurfaceTension, "surfaceTension");
96    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
97    DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
98 +  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
99    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
100 <  
100 >  DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101    DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
102    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
103    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
# Line 133 | Line 108 | Globals::Globals(){
108    DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
109    DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
110    DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
111 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
111 >  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
112    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
113 +  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
114    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
115    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
116  
141 –  
142 – }
117  
118 < int Globals::globalAssign( event* the_event ){
119 <  char errorMessage[65535];
146 <  int key;
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 = false;
152 <
153 <  /**@todo fix memory leak */  
154 <  ParamMap::iterator i =parameters_.find(keyword);
155 <  if (i != parameters_.end()) {
156 <    if( the_type == STRING ){
157 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
158 <       if (!result ) {
159 <            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);
160 <            the_event->err_msg = strdup(errorMessage);
161 <       }
162 <    } else if( the_type == DOUBLE ){
163 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
164 <       if (!result )
165 <         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 );
166 <       the_event->err_msg = strdup(errorMessage);
167 <    }      
168 <    else if (the_type == INT ){
169 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
170 <       if (!result )
171 <         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 );
172 <       the_event->err_msg = strdup(errorMessage);
173 <      
174 <    } else {
175 <        sprintf(errorMessage,  "Internal error of parser\n");
176 <        the_event->err_msg = strdup(errorMessage);
177 <    }
178 <  } else {
179 <    sprintf(errorMessage,  "%s is an unrecognized keyword\n", keyword.c_str() );
180 <    the_event->err_msg = strdup(errorMessage);
181 <  }
182 <
183 <  if (keyword == "nComponents" && getNComponents() > 0) {
184 <    components = new Component*[getNComponents()];
185 <  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
186 <    zConstraints = new ZconStamp*[getNZconstraints()];
187 <  }
188 <  
189 <  return result;
190 < }
191 <
192 < int Globals::newComponent( event* the_event ){
193 <  
194 <  current_component = new Component;
195 <  int index = the_event->evt.blk_index;
196 <  char err[200];
197 <  
198 <  if( haveNComponents() && index < getNComponents() )
199 <    components[index] = current_component;
200 <  else{
201 <    if( haveNComponents()  ){
202 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
203 <               index );
204 <      the_event->err_msg = strdup( err );
205 <      return 0;
206 <    }
207 <    else{
208 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
209 <                                  " first component declaration." );
210 <      return 0;
211 <    }
212 <  }  
213 <
214 <  return 1;
215 < }
216 <
217 <
218 <
219 < int Globals::componentAssign( event* the_event ){
220 <
221 <  switch( the_event->evt.asmt.asmt_type ){
222 <    
223 <  case STRING:
224 <    return current_component->assignString( the_event->evt.asmt.lhs,
225 <                                            the_event->evt.asmt.rhs.sval,
226 <                                            &(the_event->err_msg));
227 <    break;
228 <    
229 <  case DOUBLE:
230 <    return current_component->assignDouble( the_event->evt.asmt.lhs,
231 <                                            the_event->evt.asmt.rhs.dval,
232 <                                            &(the_event->err_msg));
233 <    break;
234 <    
235 <  case INT:
236 <    return current_component->assignInt( the_event->evt.asmt.lhs,
237 <                                         the_event->evt.asmt.rhs.ival,
238 <                                         &(the_event->err_msg));
239 <    break;
240 <    
241 <  default:
242 <    the_event->err_msg = strdup( "Globals error. Invalid component"
243 <                                 " assignment type" );
244 <    return 0;
245 <    break;
246 <  }
247 <  return 0;
248 < }
249 <
250 < int Globals::componentEnd( event* the_event ){
251 <
252 <  the_event->err_msg = current_component->checkMe();
253 <  if( the_event->err_msg != NULL ) return 0;
254 <
255 <  return 1;
256 < }
257 <
258 < int Globals::newZconstraint( event* the_event ){
259 <  
260 <
261 <  int index = the_event->evt.blk_index;
262 <  char err[200];
263 <  current_zConstraint = new ZconStamp( index );
264 <  
265 <  if( haveNZconstraints() && index < getNZconstraints() )
266 <    zConstraints[index] = current_zConstraint;
267 <  else{
268 <    if( haveNZconstraints() ){
269 <      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
270 <               index );
271 <      the_event->err_msg = strdup( err );
272 <      return 0;
273 <    }
274 <    else{
275 <      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
276 <                                  " not given before"
277 <                                  " first zConstraint declaration." );
278 <      return 0;
279 <    }
280 <  }  
281 <
282 <  return 1;
283 < }
284 <
285 <
286 <
287 < int Globals::zConstraintAssign( event* the_event ){
288 <
289 <  switch( the_event->evt.asmt.asmt_type ){
118 >    deprecatedKeywords_.insert("nComponents");
119 >    deprecatedKeywords_.insert("nZconstraints");
120      
291 –  case STRING:
292 –    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
293 –                                              the_event->evt.asmt.rhs.sval,
294 –                                              &(the_event->err_msg));
295 –    break;
296 –    
297 –  case DOUBLE:
298 –    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
299 –                                              the_event->evt.asmt.rhs.dval,
300 –                                              &(the_event->err_msg));
301 –    break;
302 –    
303 –  case INT:
304 –    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
305 –                                           the_event->evt.asmt.rhs.ival,
306 –                                           &(the_event->err_msg));
307 –    break;
308 –    
309 –  default:
310 –    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
311 –                                 " assignment type" );
312 –    return 0;
313 –    break;
314 –  }
315 –  return 0;
121   }
122  
123 < int Globals::zConstraintEnd( event* the_event ){
123 > Globals::~Globals() {
124  
320 –  the_event->err_msg = current_zConstraint->checkMe();
321 –  if( the_event->err_msg != NULL ) return 0;
125  
323 –  return 1;
126   }
127  
128 < char* Globals::checkMe( void ){
128 > void Globals::validate() {
129 >  DataHolder::validate();
130  
328 –
329 –  std::string err("The following required keywords are missing:\n");
330 –  short int have_err = 0;
331 –
332 –  ParamMap::iterator i;
333 –  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
334 –    if (!i->second->isOptional() && i->second->empty()) {
335 –        err +=  i->second->getKeyword() + "\n";
336 –    }
337 –  }
338 –
131    CheckParameter(ForceField, isNotEmpty());
340 –  CheckParameter(NComponents,isPositive());
132    CheckParameter(TargetTemp, isPositive());
133 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) ||
343 <                                          isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))||
344 <                                          isEqualIgnoreCase(std::string("NPTxyz")) );
345 <
133 >  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
134    CheckParameter(Dt, isPositive());
135    CheckParameter(RunTime, isPositive());
136    CheckParameter(InitialConfig, isNotEmpty());
137    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());
138    CheckParameter(SampleTime, isNonNegative());
139    CheckParameter(ResetTime, isNonNegative());
140    CheckParameter(StatusTime, isNonNegative());
# Line 364 | Line 146 | char* Globals::checkMe( void ){
146    CheckParameter(TauThermostat, isPositive());
147    CheckParameter(TauBarostat, isPositive());
148    CheckParameter(ZconsTime, isPositive());
367 –  CheckParameter(NZconstraints, isPositive());  
149    CheckParameter(ZconsTol, isPositive());
369 –  //CheckParameter(ZconsForcePolicy,);
150    CheckParameter(Seed, isPositive());
151    CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
152    CheckParameter(MinimizerMaxIter, isPositive());
# Line 386 | Line 166 | char* Globals::checkMe( void ){
166    CheckParameter(ThermIntThetaSpringConst, isPositive());
167    CheckParameter(ThermIntOmegaSpringConst, isPositive());
168    CheckParameter(SurfaceTension, isPositive());
169 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("UNDAMPED_WOLF")) || isEqualIgnoreCase(std::string("DAMPED_WOLF")) || isEqualIgnoreCase(std::string("REACTION_FIELD")) );
169 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
170 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
171    CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
172 +  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
173    //CheckParameter(StatFileFormat,);    
174    //CheckParameter(MixingRule,);
175    CheckParameter(OrthoBoxTolerance, isPositive());  
176    CheckParameter(ThermIntDistSpringConst, isPositive());
177    CheckParameter(ThermIntThetaSpringConst, isPositive());
178    CheckParameter(ThermIntOmegaSpringConst, isPositive());
179 <  CheckParameter(DampingAlpha,isPositive());
179 >  CheckParameter(DampingAlpha,isNonNegative());
180    CheckParameter(SkinThickness, isPositive());
399 –  
400 –  //@todo memory leak
401 –  if( have_err )
402 –    return strdup( err.c_str() );
403 –  
404 –  return NULL;
181  
182 +  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
183 +    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
184 +        std::cout << "Globals Error: can not find molecule stamp for component" << std::endl;
185 +    }
186 +  }
187 + }
188 +    
189 + bool Globals::addComponent(Component* comp) {
190 +    components_.push_back(comp);
191 +    return true;
192 + }
193  
194 + bool Globals::addZConsStamp(ZConsStamp* zcons) {
195 +    zconstraints_.push_back(zcons);
196 +    return true;
197   }
198  
199 < int Globals::globalEnd( event* the_event ){
200 <  
201 <  the_event->err_msg = checkMe();
202 <  if( the_event->err_msg != NULL ) return 0;
199 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
200 >    std::string molStampName = molStamp->getName();
201 >    std::map<std::string, MoleculeStamp*>::iterator i;
202 >    bool ret = false;
203 >    i = moleculeStamps_.find(molStampName);
204 >    if (i == moleculeStamps_.end()) {
205 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
206 >        ret = true;
207 >    } else {
208  
209 <  return 1;
209 >    }
210 >    return ret;
211   }
212 +
213 +
214 + }

Diff Legend

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