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 665 by tim, Thu Oct 13 22:26:47 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 127 | Line 105 | Globals::Globals(){
105    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
106    DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
107    DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
108 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
108 >  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
109 >  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
110 >  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
111 >  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
112    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
113 +  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
114    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
115 <  
134 < }
115 >  DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
116  
136 – int Globals::globalAssign( event* the_event ){
137 –  
138 –  int key;
139 –  int token;
140 –  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
141 –  char* lhs = the_event->evt.asmt.lhs;
142 –  std::string keyword(lhs);
117  
118 <  bool result;
119 <
146 <
147 <  ParamMap::iterator i =parameters_.find(keyword);
148 <  if (i != parameters_.end()) {
149 <    if( the_type == STRING ){
150 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
151 <       if (!result ) {
152 <            sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
153 <       }
154 <    } else if( the_type == DOUBLE ){
155 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
156 <       if (!result )
157 <         sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
158 <    }      
159 <    else if (the_type == INT ){
160 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
161 <       if (!result )
162 <         sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
163 <      
164 <    } else {
118 >    deprecatedKeywords_.insert("nComponents");
119 >    deprecatedKeywords_.insert("nZconstraints");
120      
166 –    }
167 –  }
168 –
169 –  if (keyword == "nComponents" && getNComponents() > 0) {
170 –    components = new Component*[getNComponents()];
171 –  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
172 –    zConstraints = new ZconStamp*[getNZconstraints()];
173 –  }
174 –  
175 –  return result;
121   }
122  
123 < int Globals::newComponent( event* the_event ){
179 <  
180 <  current_component = new Component;
181 <  int index = the_event->evt.blk_index;
182 <  char err[200];
183 <  
184 <  if( haveNComponents() && index < getNComponents() )
185 <    components[index] = current_component;
186 <  else{
187 <    if( haveNComponents()  ){
188 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
189 <               index );
190 <      the_event->err_msg = strdup( err );
191 <      return 0;
192 <    }
193 <    else{
194 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
195 <                                  " first component declaration." );
196 <      return 0;
197 <    }
198 <  }  
199 <
200 <  return 1;
201 < }
123 > Globals::~Globals() {
124  
203 –
204 –
205 – int Globals::componentAssign( event* the_event ){
206 –
207 –  switch( the_event->evt.asmt.asmt_type ){
208 –    
209 –  case STRING:
210 –    return current_component->assignString( the_event->evt.asmt.lhs,
211 –                                            the_event->evt.asmt.rhs.sval,
212 –                                            &(the_event->err_msg));
213 –    break;
214 –    
215 –  case DOUBLE:
216 –    return current_component->assignDouble( the_event->evt.asmt.lhs,
217 –                                            the_event->evt.asmt.rhs.dval,
218 –                                            &(the_event->err_msg));
219 –    break;
220 –    
221 –  case INT:
222 –    return current_component->assignInt( the_event->evt.asmt.lhs,
223 –                                         the_event->evt.asmt.rhs.ival,
224 –                                         &(the_event->err_msg));
225 –    break;
226 –    
227 –  default:
228 –    the_event->err_msg = strdup( "Globals error. Invalid component"
229 –                                 " assignment type" );
230 –    return 0;
231 –    break;
232 –  }
233 –  return 0;
234 – }
235 –
236 – int Globals::componentEnd( event* the_event ){
237 –
238 –  the_event->err_msg = current_component->checkMe();
239 –  if( the_event->err_msg != NULL ) return 0;
240 –
241 –  return 1;
242 – }
243 –
244 – int Globals::newZconstraint( event* the_event ){
245 –  
246 –
247 –  int index = the_event->evt.blk_index;
248 –  char err[200];
249 –  current_zConstraint = new ZconStamp( index );
250 –  
251 –  if( haveNZconstraints() && index < getNZconstraints() )
252 –    zConstraints[index] = current_zConstraint;
253 –  else{
254 –    if( haveNZconstraints() ){
255 –      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
256 –               index );
257 –      the_event->err_msg = strdup( err );
258 –      return 0;
259 –    }
260 –    else{
261 –      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
262 –                                  " not given before"
263 –                                  " first zConstraint declaration." );
264 –      return 0;
265 –    }
266 –  }  
125  
268 –  return 1;
126   }
127  
128 + void Globals::validate() {
129 +  DataHolder::validate();
130  
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 < int Globals::zConstraintAssign( event* the_event ){
183 <
184 <  switch( the_event->evt.asmt.asmt_type ){
185 <    
277 <  case STRING:
278 <    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
279 <                                              the_event->evt.asmt.rhs.sval,
280 <                                              &(the_event->err_msg));
281 <    break;
282 <    
283 <  case DOUBLE:
284 <    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
285 <                                              the_event->evt.asmt.rhs.dval,
286 <                                              &(the_event->err_msg));
287 <    break;
288 <    
289 <  case INT:
290 <    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
291 <                                           the_event->evt.asmt.rhs.ival,
292 <                                           &(the_event->err_msg));
293 <    break;
294 <    
295 <  default:
296 <    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
297 <                                 " assignment type" );
298 <    return 0;
299 <    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    }
301 –  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();
307 <  if( the_event->err_msg != NULL ) return 0;
308 <
309 <  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  
314 –
315 –  std::string err("The following required keywords are missing:\n");
316 –  short int have_err = 0;
317 –
318 –  ParamMap::iterator i;
319 –  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
320 –    if (!i->second->isOptional() && i->second->empty()) {
321 –        err +=  i->second->getKeyword() + "\n";
209      }
210 <  }
324 <
325 <  //@todo memory leak
326 <  if( have_err )
327 <    return strdup( err.c_str() );
328 <  
329 <  return NULL;
330 <
331 <
210 >    return ret;
211   }
212 +
213  
334 – int Globals::globalEnd( event* the_event ){
335 –  
336 –  the_event->err_msg = checkMe();
337 –  if( the_event->err_msg != NULL ) return 0;
338 –
339 –  return 1;
214   }

Diff Legend

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