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 906 by tim, Fri Mar 17 23:20:35 2006 UTC

# 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 <
53 < #define DefineParameter(NAME,KEYWORD)                              \
55 <  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");    
100 >  DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101 >  DefineOptionalParameter(HydroPropFile, "HydroPropFile");
102 >  DefineOptionalParameter(Viscosity, "viscosity");
103 >  DefineOptionalParameter(BeadSize, "beadSize");
104    
123 –  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
105    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
106    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
107    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
108    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
109    DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
110    DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
111 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
111 >  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
112 >  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
113 >  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
114 >  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
115    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
116 +  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
117    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
118 <  
134 < }
118 >  DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
119  
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);
120  
121 <  bool result;
122 <
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 {
121 >    deprecatedKeywords_.insert("nComponents");
122 >    deprecatedKeywords_.insert("nZconstraints");
123      
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;
124   }
125  
126 < int Globals::newComponent( event* the_event ){
127 <  
128 <  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 < }
202 <
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 <  }  
267 <
268 <  return 1;
126 > Globals::~Globals() {
127 >    MemoryUtils::deletePointers(components_);
128 >    MemoryUtils::deletePointers(zconstraints_);
129   }
130  
131 + void Globals::validate() {
132 +  DataHolder::validate();
133  
134 <
135 < int Globals::zConstraintAssign( event* the_event ){
136 <
137 <  switch( the_event->evt.asmt.asmt_type ){
138 <    
139 <  case STRING:
140 <    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
141 <                                              the_event->evt.asmt.rhs.sval,
142 <                                              &(the_event->err_msg));
143 <    break;
144 <    
145 <  case DOUBLE:
146 <    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
147 <                                              the_event->evt.asmt.rhs.dval,
148 <                                              &(the_event->err_msg));
149 <    break;
150 <    
151 <  case INT:
152 <    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
153 <                                           the_event->evt.asmt.rhs.ival,
154 <                                           &(the_event->err_msg));
155 <    break;
156 <    
157 <  default:
158 <    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
159 <                                 " assignment type" );
160 <    return 0;
161 <    break;
134 >  CheckParameter(ForceField, isNotEmpty());
135 >  CheckParameter(TargetTemp, isPositive());
136 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") );
137 >  CheckParameter(Dt, isPositive());
138 >  CheckParameter(RunTime, isPositive());
139 >  CheckParameter(InitialConfig, isNotEmpty());
140 >  CheckParameter(FinalConfig, isNotEmpty());
141 >  CheckParameter(SampleTime, isNonNegative());
142 >  CheckParameter(ResetTime, isNonNegative());
143 >  CheckParameter(StatusTime, isNonNegative());
144 >  CheckParameter(CutoffRadius, isPositive());
145 >  CheckParameter(SwitchingRadius, isNonNegative());
146 >  CheckParameter(Dielectric, isPositive());
147 >  CheckParameter(ThermalTime,  isNonNegative());
148 >  CheckParameter(TargetPressure,  isPositive());
149 >  CheckParameter(TauThermostat, isPositive());
150 >  CheckParameter(TauBarostat, isPositive());
151 >  CheckParameter(ZconsTime, isPositive());
152 >  CheckParameter(ZconsTol, isPositive());
153 >  CheckParameter(Seed, isPositive());
154 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
155 >  CheckParameter(MinimizerMaxIter, isPositive());
156 >  CheckParameter(MinimizerWriteFrq, isPositive());
157 >  CheckParameter(MinimizerStepSize, isPositive());
158 >  CheckParameter(MinimizerFTol, isPositive());
159 >  CheckParameter(MinimizerGTol, isPositive());
160 >  CheckParameter(MinimizerLSTol, isPositive());
161 >  CheckParameter(MinimizerLSMaxIter, isPositive());
162 >  CheckParameter(ZconsGap, isPositive());
163 >  CheckParameter(ZconsFixtime, isPositive());
164 >  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
165 >  CheckParameter(ThermodynamicIntegrationK, isPositive());
166 >  CheckParameter(ForceFieldVariant, isNotEmpty());
167 >  CheckParameter(ForceFieldFileName, isNotEmpty());
168 >  CheckParameter(ThermIntDistSpringConst, isPositive());
169 >  CheckParameter(ThermIntThetaSpringConst, isPositive());
170 >  CheckParameter(ThermIntOmegaSpringConst, isPositive());
171 >  CheckParameter(SurfaceTension, isPositive());
172 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
173 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
174 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
175 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
176 >  //CheckParameter(StatFileFormat,);    
177 >  CheckParameter(OrthoBoxTolerance, isPositive());  
178 >  CheckParameter(ThermIntDistSpringConst, isPositive());
179 >  CheckParameter(ThermIntThetaSpringConst, isPositive());
180 >  CheckParameter(ThermIntOmegaSpringConst, isPositive());
181 >  CheckParameter(DampingAlpha,isNonNegative());
182 >  CheckParameter(SkinThickness, isPositive());
183 >  CheckParameter(Viscosity,isNonNegative());
184 >  CheckParameter(BeadSize,isPositive());
185 >  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
186 >    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
187 >        std::ostringstream oss;
188 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
189 >        throw OOPSEException(oss.str());          
190 >    }
191    }
301 –  return 0;
192   }
193 +    
194 + bool Globals::addComponent(Component* comp) {
195 +    components_.push_back(comp);
196 +    return true;
197 + }
198  
199 < int Globals::zConstraintEnd( event* the_event ){
200 <
201 <  the_event->err_msg = current_zConstraint->checkMe();
307 <  if( the_event->err_msg != NULL ) return 0;
308 <
309 <  return 1;
199 > bool Globals::addZConsStamp(ZConsStamp* zcons) {
200 >    zconstraints_.push_back(zcons);
201 >    return true;
202   }
203  
204 < char* Globals::checkMe( void ){
205 <
206 <
207 <  std::string err("The following required keywords are missing:\n");
208 <  short int have_err = 0;
209 <
210 <  ParamMap::iterator i;
211 <  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
212 <    if (!i->second->isOptional() && i->second->empty()) {
213 <        err +=  i->second->getKeyword() + "\n";
204 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
205 >    std::string molStampName = molStamp->getName();
206 >    std::map<std::string, MoleculeStamp*>::iterator i;
207 >    bool ret = false;
208 >    i = moleculeStamps_.find(molStampName);
209 >    if (i == moleculeStamps_.end()) {
210 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
211 >        ret = true;
212 >    } else {
213 >        std::ostringstream oss;
214 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
215 >        throw OOPSEException(oss.str());  
216      }
217 <  }
324 <
325 <  //@todo memory leak
326 <  if( have_err )
327 <    return strdup( err.c_str() );
328 <  
329 <  return NULL;
330 <
331 <
217 >    return ret;
218   }
219 +
220  
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;
221   }

Diff Legend

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