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 666 by chrisfen, Fri Oct 14 14:18:02 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);                  \
56 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
57 <
58 < #define DefineOptionalParameter(NAME,KEYWORD)                              \
59 <  NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
60 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
61 <
62 < #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
63 <  NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
64 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
65 <
66 < Globals::Globals(){
67 <
52 > namespace oopse {
53 > Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
69 –  DefineParameter(NComponents, "nComponents")
55  
56    DefineOptionalParameter(TargetTemp, "targetTemp");
57    DefineOptionalParameter(Ensemble, "ensemble");
# Line 74 | Line 59 | Globals::Globals(){
59    DefineOptionalParameter(RunTime, "runTime");
60    DefineOptionalParameter(InitialConfig, "initialConfig");
61    DefineOptionalParameter(FinalConfig, "finalConfig");
77 –  DefineOptionalParameter(NMol, "nMol");
78 –  DefineOptionalParameter(Density, "density");
79 –  DefineOptionalParameter(Box, "box");
80 –  DefineOptionalParameter(BoxX, "boxX");
81 –  DefineOptionalParameter(BoxY, "boxY");
82 –  DefineOptionalParameter(BoxZ, "boxZ");
62    DefineOptionalParameter(SampleTime, "sampleTime");
63    DefineOptionalParameter(ResetTime, "resetTime");
64    DefineOptionalParameter(StatusTime, "statusTime");
# Line 92 | Line 71 | Globals::Globals(){
71    DefineOptionalParameter(TauThermostat, "tauThermostat");
72    DefineOptionalParameter(TauBarostat, "tauBarostat");
73    DefineOptionalParameter(ZconsTime, "zconsTime");
95 –  DefineOptionalParameter(NZconstraints, "nZconstraints");  
74    DefineOptionalParameter(ZconsTol, "zconsTol");
75    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
76    DefineOptionalParameter(Seed, "seed");
# Line 117 | 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 <  DefineOptionalParameter(StatFileFormat, "statFileFormat");    
122 <  
100 >  DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101    DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
102    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
103    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
# Line 130 | 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 <  
137 < }
115 >  DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
116  
139 – int Globals::globalAssign( event* the_event ){
140 –  
141 –  int key;
142 –  int token;
143 –  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
144 –  char* lhs = the_event->evt.asmt.lhs;
145 –  std::string keyword(lhs);
117  
118 <  bool result;
119 <
149 <
150 <  ParamMap::iterator i =parameters_.find(keyword);
151 <  if (i != parameters_.end()) {
152 <    if( the_type == STRING ){
153 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
154 <       if (!result ) {
155 <            sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
156 <       }
157 <    } else if( the_type == DOUBLE ){
158 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
159 <       if (!result )
160 <         sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
161 <    }      
162 <    else if (the_type == INT ){
163 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
164 <       if (!result )
165 <         sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
166 <      
167 <    } else {
118 >    deprecatedKeywords_.insert("nComponents");
119 >    deprecatedKeywords_.insert("nZconstraints");
120      
169 –    }
170 –  }
171 –
172 –  if (keyword == "nComponents" && getNComponents() > 0) {
173 –    components = new Component*[getNComponents()];
174 –  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
175 –    zConstraints = new ZconStamp*[getNZconstraints()];
176 –  }
177 –  
178 –  return result;
121   }
122  
123 < int Globals::newComponent( event* the_event ){
182 <  
183 <  current_component = new Component;
184 <  int index = the_event->evt.blk_index;
185 <  char err[200];
186 <  
187 <  if( haveNComponents() && index < getNComponents() )
188 <    components[index] = current_component;
189 <  else{
190 <    if( haveNComponents()  ){
191 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
192 <               index );
193 <      the_event->err_msg = strdup( err );
194 <      return 0;
195 <    }
196 <    else{
197 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
198 <                                  " first component declaration." );
199 <      return 0;
200 <    }
201 <  }  
202 <
203 <  return 1;
204 < }
123 > Globals::~Globals() {
124  
125  
207 –
208 – int Globals::componentAssign( event* the_event ){
209 –
210 –  switch( the_event->evt.asmt.asmt_type ){
211 –    
212 –  case STRING:
213 –    return current_component->assignString( the_event->evt.asmt.lhs,
214 –                                            the_event->evt.asmt.rhs.sval,
215 –                                            &(the_event->err_msg));
216 –    break;
217 –    
218 –  case DOUBLE:
219 –    return current_component->assignDouble( the_event->evt.asmt.lhs,
220 –                                            the_event->evt.asmt.rhs.dval,
221 –                                            &(the_event->err_msg));
222 –    break;
223 –    
224 –  case INT:
225 –    return current_component->assignInt( the_event->evt.asmt.lhs,
226 –                                         the_event->evt.asmt.rhs.ival,
227 –                                         &(the_event->err_msg));
228 –    break;
229 –    
230 –  default:
231 –    the_event->err_msg = strdup( "Globals error. Invalid component"
232 –                                 " assignment type" );
233 –    return 0;
234 –    break;
235 –  }
236 –  return 0;
126   }
127  
128 < int Globals::componentEnd( event* the_event ){
129 <
241 <  the_event->err_msg = current_component->checkMe();
242 <  if( the_event->err_msg != NULL ) return 0;
243 <
244 <  return 1;
245 < }
246 <
247 < int Globals::newZconstraint( event* the_event ){
248 <  
249 <
250 <  int index = the_event->evt.blk_index;
251 <  char err[200];
252 <  current_zConstraint = new ZconStamp( index );
253 <  
254 <  if( haveNZconstraints() && index < getNZconstraints() )
255 <    zConstraints[index] = current_zConstraint;
256 <  else{
257 <    if( haveNZconstraints() ){
258 <      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
259 <               index );
260 <      the_event->err_msg = strdup( err );
261 <      return 0;
262 <    }
263 <    else{
264 <      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
265 <                                  " not given before"
266 <                                  " first zConstraint declaration." );
267 <      return 0;
268 <    }
269 <  }  
128 > void Globals::validate() {
129 >  DataHolder::validate();
130  
131 <  return 1;
132 < }
131 >  CheckParameter(ForceField, isNotEmpty());
132 >  CheckParameter(TargetTemp, isPositive());
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());
138 >  CheckParameter(SampleTime, isNonNegative());
139 >  CheckParameter(ResetTime, isNonNegative());
140 >  CheckParameter(StatusTime, isNonNegative());
141 >  CheckParameter(CutoffRadius, isPositive());
142 >  CheckParameter(SwitchingRadius, isNonNegative());
143 >  CheckParameter(Dielectric, isPositive());
144 >  CheckParameter(ThermalTime,  isNonNegative());
145 >  CheckParameter(TargetPressure,  isPositive());
146 >  CheckParameter(TauThermostat, isPositive());
147 >  CheckParameter(TauBarostat, isPositive());
148 >  CheckParameter(ZconsTime, isPositive());
149 >  CheckParameter(ZconsTol, isPositive());
150 >  CheckParameter(Seed, isPositive());
151 >  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
152 >  CheckParameter(MinimizerMaxIter, isPositive());
153 >  CheckParameter(MinimizerWriteFrq, isPositive());
154 >  CheckParameter(MinimizerStepSize, isPositive());
155 >  CheckParameter(MinimizerFTol, isPositive());
156 >  CheckParameter(MinimizerGTol, isPositive());
157 >  CheckParameter(MinimizerLSTol, isPositive());
158 >  CheckParameter(MinimizerLSMaxIter, isPositive());
159 >  CheckParameter(ZconsGap, isPositive());
160 >  CheckParameter(ZconsFixtime, isPositive());
161 >  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
162 >  CheckParameter(ThermodynamicIntegrationK, isPositive());
163 >  CheckParameter(ForceFieldVariant, isNotEmpty());
164 >  CheckParameter(ForceFieldFileName, isNotEmpty());
165 >  CheckParameter(ThermIntDistSpringConst, isPositive());
166 >  CheckParameter(ThermIntThetaSpringConst, isPositive());
167 >  CheckParameter(ThermIntOmegaSpringConst, isPositive());
168 >  CheckParameter(SurfaceTension, isPositive());
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,isNonNegative());
180 >  CheckParameter(SkinThickness, isPositive());
181  
182 <
183 <
184 < int Globals::zConstraintAssign( event* the_event ){
185 <
278 <  switch( the_event->evt.asmt.asmt_type ){
279 <    
280 <  case STRING:
281 <    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
282 <                                              the_event->evt.asmt.rhs.sval,
283 <                                              &(the_event->err_msg));
284 <    break;
285 <    
286 <  case DOUBLE:
287 <    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
288 <                                              the_event->evt.asmt.rhs.dval,
289 <                                              &(the_event->err_msg));
290 <    break;
291 <    
292 <  case INT:
293 <    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
294 <                                           the_event->evt.asmt.rhs.ival,
295 <                                           &(the_event->err_msg));
296 <    break;
297 <    
298 <  default:
299 <    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
300 <                                 " assignment type" );
301 <    return 0;
302 <    break;
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    }
304 –  return 0;
187   }
188 +    
189 + bool Globals::addComponent(Component* comp) {
190 +    components_.push_back(comp);
191 +    return true;
192 + }
193  
194 < int Globals::zConstraintEnd( event* the_event ){
195 <
196 <  the_event->err_msg = current_zConstraint->checkMe();
310 <  if( the_event->err_msg != NULL ) return 0;
311 <
312 <  return 1;
194 > bool Globals::addZConsStamp(ZConsStamp* zcons) {
195 >    zconstraints_.push_back(zcons);
196 >    return true;
197   }
198  
199 < char* Globals::checkMe( void ){
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  
317 –
318 –  std::string err("The following required keywords are missing:\n");
319 –  short int have_err = 0;
320 –
321 –  ParamMap::iterator i;
322 –  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
323 –    if (!i->second->isOptional() && i->second->empty()) {
324 –        err +=  i->second->getKeyword() + "\n";
209      }
210 <  }
327 <
328 <  //@todo memory leak
329 <  if( have_err )
330 <    return strdup( err.c_str() );
331 <  
332 <  return NULL;
333 <
334 <
210 >    return ret;
211   }
212 +
213  
337 – int Globals::globalEnd( event* the_event ){
338 –  
339 –  the_event->err_msg = checkMe();
340 –  if( the_event->err_msg != NULL ) return 0;
341 –
342 –  return 1;
214   }

Diff Legend

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