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

Comparing trunk/OOPSE-4/src/io/Globals.cpp (file contents):
Revision 2364 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
Revision 3463 by chuckv, Thu Oct 16 18:25:36 2008 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");
58    DefineOptionalParameter(Dt, "dt");
59    DefineOptionalParameter(RunTime, "runTime");
75 –  DefineOptionalParameter(InitialConfig, "initialConfig");
60    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");
61    DefineOptionalParameter(SampleTime, "sampleTime");
62    DefineOptionalParameter(ResetTime, "resetTime");
63    DefineOptionalParameter(StatusTime, "statusTime");
64    DefineOptionalParameter(CutoffRadius, "cutoffRadius");
65    DefineOptionalParameter(SwitchingRadius, "switchingRadius");
88 –  DefineOptionalParameter(Dielectric, "dielectric");
66    DefineOptionalParameter(TempSet, "tempSet");
67    DefineOptionalParameter(ThermalTime, "thermalTime");
68 <  DefineOptionalParameter(TargetPressure, "targetPressure");
68 >  DefineOptionalParameter(TargetPressure, "targetPressure");  
69    DefineOptionalParameter(TauThermostat, "tauThermostat");
70    DefineOptionalParameter(TauBarostat, "tauBarostat");
71    DefineOptionalParameter(ZconsTime, "zconsTime");
95 –  DefineOptionalParameter(NZconstraints, "nZconstraints");  
72    DefineOptionalParameter(ZconsTol, "zconsTol");
73    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
74    DefineOptionalParameter(Seed, "seed");
# Line 111 | Line 87 | Globals::Globals(){
87    DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
88    DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89    DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90 +  DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91    DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
92    DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
93    DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
94    DefineOptionalParameter(SurfaceTension, "surfaceTension");
95    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
96 <  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
96 >  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
97 >  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
98    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
99 <  DefineOptionalParameter(StatFileFormat, "statFileFormat");    
99 >  DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
100 >  DefineOptionalParameter(HydroPropFile, "HydroPropFile");
101 >  DefineOptionalParameter(Viscosity, "viscosity");
102 >  DefineOptionalParameter(BeadSize, "beadSize");
103 >  DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
104 >  DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
105 >  DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
106 >  DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
107 >  DefineOptionalParameter(MTM_Ce, "MTM_Ce");
108 >  DefineOptionalParameter(MTM_G, "MTM_G");
109 >  DefineOptionalParameter(MTM_Io, "MTM_Io");
110 >  DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
111 >  DefineOptionalParameter(MTM_R, "MTM_R");
112    
113 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
113 >  
114    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
115 +  DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
116    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
117    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
118    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
119    DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
120    DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
121 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
121 >  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
122 >  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
123 >  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
124 >  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
125 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
126 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
127    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
128 +  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
129    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
130 <  
131 < }
130 >  DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
131 >  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
132 >  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
133  
134 < int Globals::globalAssign( event* the_event ){
135 <  
136 <  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);
143 <
144 <  bool result;
145 <
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 {
134 >  deprecatedKeywords_.insert("nComponents");
135 >  deprecatedKeywords_.insert("nZconstraints");
136 >  deprecatedKeywords_.insert("initialConfig");
137      
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;
176 – }
177 –
178 – 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 – }
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;
138   }
139  
140 < int Globals::newZconstraint( event* the_event ){
141 <  
142 <
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;
140 > Globals::~Globals() {
141 >    MemoryUtils::deletePointers(components_);
142 >    MemoryUtils::deletePointers(zconstraints_);
143   }
144  
145 + void Globals::validate() {
146 +  DataHolder::validate();
147  
148 +  CheckParameter(ForceField, isNotEmpty());
149 +  CheckParameter(TargetTemp, isPositive());
150 +  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("SMIPD"));
151 +  CheckParameter(Dt, isPositive());
152 +  CheckParameter(RunTime, isPositive());
153 +  CheckParameter(FinalConfig, isNotEmpty());
154 +  CheckParameter(SampleTime, isNonNegative());
155 +  CheckParameter(ResetTime, isNonNegative());
156 +  CheckParameter(StatusTime, isNonNegative());
157 +  CheckParameter(CutoffRadius, isPositive());
158 +  CheckParameter(SwitchingRadius, isNonNegative());
159 +  CheckParameter(Dielectric, isPositive());
160 +  CheckParameter(ThermalTime,  isNonNegative());
161 +  CheckParameter(TauThermostat, isPositive());
162 +  CheckParameter(TauBarostat, isPositive());
163 +  CheckParameter(ZconsTime, isPositive());
164 +  CheckParameter(ZconsTol, isPositive());
165 +  CheckParameter(Seed, isPositive());
166 +  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
167 +  CheckParameter(MinimizerMaxIter, isPositive());
168 +  CheckParameter(MinimizerWriteFrq, isPositive());
169 +  CheckParameter(MinimizerStepSize, isPositive());
170 +  CheckParameter(MinimizerFTol, isPositive());
171 +  CheckParameter(MinimizerGTol, isPositive());
172 +  CheckParameter(MinimizerLSTol, isPositive());
173 +  CheckParameter(MinimizerLSMaxIter, isPositive());
174 +  CheckParameter(ZconsGap, isPositive());
175 +  CheckParameter(ZconsFixtime, isPositive());
176 +  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
177 +  CheckParameter(ThermodynamicIntegrationK, isPositive());
178 +  CheckParameter(ForceFieldVariant, isNotEmpty());
179 +  CheckParameter(ForceFieldFileName, isNotEmpty());
180 +  CheckParameter(ThermIntDistSpringConst, isPositive());
181 +  CheckParameter(ThermIntThetaSpringConst, isPositive());
182 +  CheckParameter(ThermIntOmegaSpringConst, isPositive());
183 +  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
184 +  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
185 +  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
186 +  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
187 +  //CheckParameter(StatFileFormat,);    
188 +  CheckParameter(OrthoBoxTolerance, isPositive());  
189 +  CheckParameter(ThermIntDistSpringConst, isPositive());
190 +  CheckParameter(ThermIntThetaSpringConst, isPositive());
191 +  CheckParameter(ThermIntOmegaSpringConst, isPositive());
192 +  CheckParameter(DampingAlpha,isNonNegative());
193 +  CheckParameter(SkinThickness, isPositive());
194 +  CheckParameter(Viscosity, isNonNegative());
195 +  CheckParameter(BeadSize, isPositive());
196 +  CheckParameter(FrozenBufferRadius, isPositive());
197 +  CheckParameter(LangevinBufferRadius, isPositive());
198 +  CheckParameter(NeighborListNeighbors, isPositive());
199  
200 < int Globals::zConstraintAssign( event* the_event ){
201 <
202 <  switch( the_event->evt.asmt.asmt_type ){
203 <    
204 <  case STRING:
205 <    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;
200 >  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
201 >    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
202 >        std::ostringstream oss;
203 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
204 >        throw OOPSEException(oss.str());          
205 >    }
206    }
301 –  return 0;
207   }
208 +    
209 + bool Globals::addComponent(Component* comp) {
210 +    components_.push_back(comp);
211 +    return true;
212 + }
213  
214 < int Globals::zConstraintEnd( event* the_event ){
215 <
216 <  the_event->err_msg = current_zConstraint->checkMe();
307 <  if( the_event->err_msg != NULL ) return 0;
308 <
309 <  return 1;
214 > bool Globals::addZConsStamp(ZConsStamp* zcons) {
215 >    zconstraints_.push_back(zcons);
216 >    return true;
217   }
218  
219 < char* Globals::checkMe( void ){
220 <
221 <
222 <  std::string err("The following required keywords are missing:\n");
223 <  short int have_err = 0;
224 <
225 <  ParamMap::iterator i;
226 <  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
227 <    if (!i->second->isOptional() && i->second->empty()) {
228 <        err +=  i->second->getKeyword() + "\n";
219 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
220 >    std::string molStampName = molStamp->getName();
221 >    std::map<std::string, MoleculeStamp*>::iterator i;
222 >    bool ret = false;
223 >    i = moleculeStamps_.find(molStampName);
224 >    if (i == moleculeStamps_.end()) {
225 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
226 >        ret = true;
227 >    } else {
228 >        std::ostringstream oss;
229 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
230 >        throw OOPSEException(oss.str());  
231      }
232 <  }
324 <
325 <  //@todo memory leak
326 <  if( have_err )
327 <    return strdup( err.c_str() );
328 <  
329 <  return NULL;
330 <
331 <
232 >    return ret;
233   }
234 +
235  
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;
236   }

Diff Legend

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