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 765 by gezelter, Mon Nov 21 22:59:36 2005 UTC vs.
Revision 1354 by gezelter, Mon Jun 15 20:12:09 2009 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 < #include "io/ParamConstraint.hpp"
53 <
55 < using namespace oopse;
56 <
57 < Globals::Globals(){
58 <
52 > namespace oopse {
53 > Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
60 –  DefineParameter(NComponents, "nComponents")
55  
56    DefineOptionalParameter(TargetTemp, "targetTemp");
57    DefineOptionalParameter(Ensemble, "ensemble");
58    DefineOptionalParameter(Dt, "dt");
59    DefineOptionalParameter(RunTime, "runTime");
66 –  DefineOptionalParameter(InitialConfig, "initialConfig");
60    DefineOptionalParameter(FinalConfig, "finalConfig");
68 –  DefineOptionalParameter(NMol, "nMol");
69 –  DefineOptionalParameter(Density, "density");
70 –  DefineOptionalParameter(Box, "box");
71 –  DefineOptionalParameter(BoxX, "boxX");
72 –  DefineOptionalParameter(BoxY, "boxY");
73 –  DefineOptionalParameter(BoxZ, "boxZ");
61    DefineOptionalParameter(SampleTime, "sampleTime");
62    DefineOptionalParameter(ResetTime, "resetTime");
63    DefineOptionalParameter(StatusTime, "statusTime");
64    DefineOptionalParameter(CutoffRadius, "cutoffRadius");
65    DefineOptionalParameter(SwitchingRadius, "switchingRadius");
79 –  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");
86 –  DefineOptionalParameter(NZconstraints, "nZconstraints");  
72    DefineOptionalParameter(ZconsTol, "zconsTol");
73    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
74    DefineOptionalParameter(Seed, "seed");
# Line 102 | 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");
97 <  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
96 >  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
97 >  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
98    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
99    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
100 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
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 >
114 >  
115    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
116 +  DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
117    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
118    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
119    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
# Line 121 | Line 122 | Globals::Globals(){
122    DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
123    DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
124    DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
125 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
125 >  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
126 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
127 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
128    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
129    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
130    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
131    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
132 +  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
133 +  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
134  
135 <  
136 < }
137 <
138 < Globals::~Globals(){
139 <  int i;
140 <  if( components != NULL ){
141 <    for( i=0; i< getNComponents(); i++ ) delete components[i];
142 <    delete[] components;
143 <  }
144 <  
145 <  if( zConstraints != NULL ){
146 <    for( i=0; i< getNZconstraints(); i++ ) delete zConstraints[i];
147 <    delete[] zConstraints;
143 <  }
144 <  
145 < }
146 <
147 < int Globals::globalAssign( event* the_event ){
148 <  char errorMessage[65535];
149 <  int key;
150 <  interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
151 <  char* lhs = the_event->evt.asmt.lhs;
152 <  std::string keyword(lhs);
153 <
154 <  bool result = false;
155 <
156 <  /**@todo fix memory leak */  
157 <  ParamMap::iterator i =parameters_.find(keyword);
158 <  if (i != parameters_.end()) {
159 <    if( the_type == STRING ){
160 <       result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
161 <       if (!result ) {
162 <            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);
163 <            the_event->err_msg = strdup(errorMessage);
164 <       }
165 <    } else if( the_type == DOUBLE ){
166 <      result = i->second->setData(the_event->evt.asmt.rhs.dval);
167 <       if (!result )
168 <         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 );
169 <       the_event->err_msg = strdup(errorMessage);
170 <    }      
171 <    else if (the_type == INT ){
172 <      result = i->second->setData(the_event->evt.asmt.rhs.ival);
173 <       if (!result )
174 <         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 );
175 <       the_event->err_msg = strdup(errorMessage);
176 <      
177 <    } else {
178 <        sprintf(errorMessage,  "Internal error of parser\n");
179 <        the_event->err_msg = strdup(errorMessage);
180 <    }
181 <  } else {
182 <    sprintf(errorMessage,  "%s is an unrecognized keyword\n", keyword.c_str() );
183 <    the_event->err_msg = strdup(errorMessage);
184 <  }
185 <
186 <  if (keyword == "nComponents" && getNComponents() > 0) {
187 <    components = new Component*[getNComponents()];
188 <  }else if (keyword == "nZconstraints" && getNZconstraints() > 0) {
189 <    zConstraints = new ZconStamp*[getNZconstraints()];
190 <  }
191 <  
192 <  return result;
193 < }
194 <
195 < int Globals::newComponent( event* the_event ){
196 <  
197 <  current_component = new Component;
198 <  int index = the_event->evt.blk_index;
199 <  char err[200];
200 <  
201 <  if( haveNComponents() && index < getNComponents() )
202 <    components[index] = current_component;
203 <  else{
204 <    if( haveNComponents()  ){
205 <      sprintf( err, "meta-data parsing error: %d out of nComponents range",
206 <               index );
207 <      the_event->err_msg = strdup( err );
208 <      return 0;
209 <    }
210 <    else{
211 <      the_event->err_msg = strdup("meta-data parsing error: nComponents not given before"
212 <                                  " first component declaration." );
213 <      return 0;
214 <    }
215 <  }  
216 <
217 <  return 1;
218 < }
219 <
220 <
221 <
222 < int Globals::componentAssign( event* the_event ){
223 <
224 <  switch( the_event->evt.asmt.asmt_type ){
225 <    
226 <  case STRING:
227 <    return current_component->assignString( the_event->evt.asmt.lhs,
228 <                                            the_event->evt.asmt.rhs.sval,
229 <                                            &(the_event->err_msg));
230 <    break;
231 <    
232 <  case DOUBLE:
233 <    return current_component->assignDouble( the_event->evt.asmt.lhs,
234 <                                            the_event->evt.asmt.rhs.dval,
235 <                                            &(the_event->err_msg));
236 <    break;
237 <    
238 <  case INT:
239 <    return current_component->assignInt( the_event->evt.asmt.lhs,
240 <                                         the_event->evt.asmt.rhs.ival,
241 <                                         &(the_event->err_msg));
242 <    break;
243 <    
244 <  default:
245 <    the_event->err_msg = strdup( "Globals error. Invalid component"
246 <                                 " assignment type" );
247 <    return 0;
248 <    break;
249 <  }
250 <  return 0;
251 < }
252 <
253 < int Globals::componentEnd( event* the_event ){
254 <
255 <  the_event->err_msg = current_component->checkMe();
256 <  if( the_event->err_msg != NULL ) return 0;
257 <
258 <  return 1;
259 < }
260 <
261 < int Globals::newZconstraint( event* the_event ){
135 >  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
136 >  DefineOptionalParameterWithDefaultValue(RNEMD_swapTime, "RNEMD_swapTime", 100.0);
137 >  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
138 >  DefineOptionalParameterWithDefaultValue(RNEMD_swapType, "RNEMD_swapType", "Kinetic");
139 >  DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
140 >  DefineOptionalParameterWithDefaultValue(UseRestraints, "UseRestraints", false);
141 >  DefineOptionalParameterWithDefaultValue(Restraint_objectSelection, "Restraint_objectSelection", "select all");
142 >  DefineOptionalParameterWithDefaultValue(Restraint_type, "Restraint_type", "positional");
143 >  DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
144 >  DefineOptionalParameterWithDefaultValue(Restraint_DisplacementSpringConstant, "Restraint_DisplacementSpringConstant", 0.0);
145 >  DefineOptionalParameterWithDefaultValue(Restraint_RollSpringConstant, "Restraint_RollSpringConstant", 0.0);   // phi
146 >  DefineOptionalParameterWithDefaultValue(Restraint_PitchSpringConstant, "Restraint_PitchSpringConstant", 0.0); // theta
147 >  DefineOptionalParameterWithDefaultValue(Restraint_YawSpringConstant, "Restraint_YawSpringConstant", 0.0);     // psi
148    
149  
150 <  int index = the_event->evt.blk_index;
151 <  char err[200];
152 <  current_zConstraint = new ZconStamp( index );
267 <  
268 <  if( haveNZconstraints() && index < getNZconstraints() )
269 <    zConstraints[index] = current_zConstraint;
270 <  else{
271 <    if( haveNZconstraints() ){
272 <      sprintf( err, "meta-data parsing error: %d out of nZconstraints range",
273 <               index );
274 <      the_event->err_msg = strdup( err );
275 <      return 0;
276 <    }
277 <    else{
278 <      the_event->err_msg = strdup("meta-data parsing error: nZconstraints"
279 <                                  " not given before"
280 <                                  " first zConstraint declaration." );
281 <      return 0;
282 <    }
283 <  }  
284 <
285 <  return 1;
286 < }
287 <
288 <
289 <
290 < int Globals::zConstraintAssign( event* the_event ){
291 <
292 <  switch( the_event->evt.asmt.asmt_type ){
150 >  deprecatedKeywords_.insert("nComponents");
151 >  deprecatedKeywords_.insert("nZconstraints");
152 >  deprecatedKeywords_.insert("initialConfig");
153      
294 –  case STRING:
295 –    return current_zConstraint->assignString( the_event->evt.asmt.lhs,
296 –                                              the_event->evt.asmt.rhs.sval,
297 –                                              &(the_event->err_msg));
298 –    break;
299 –    
300 –  case DOUBLE:
301 –    return current_zConstraint->assignDouble( the_event->evt.asmt.lhs,
302 –                                              the_event->evt.asmt.rhs.dval,
303 –                                              &(the_event->err_msg));
304 –    break;
305 –    
306 –  case INT:
307 –    return current_zConstraint->assignInt( the_event->evt.asmt.lhs,
308 –                                           the_event->evt.asmt.rhs.ival,
309 –                                           &(the_event->err_msg));
310 –    break;
311 –    
312 –  default:
313 –    the_event->err_msg = strdup( "Globals error. Invalid zConstraint"
314 –                                 " assignment type" );
315 –    return 0;
316 –    break;
317 –  }
318 –  return 0;
154   }
155  
156 < int Globals::zConstraintEnd( event* the_event ){
157 <
158 <  the_event->err_msg = current_zConstraint->checkMe();
324 <  if( the_event->err_msg != NULL ) return 0;
325 <
326 <  return 1;
156 > Globals::~Globals() {
157 >    MemoryUtils::deletePointers(components_);
158 >    MemoryUtils::deletePointers(zconstraints_);
159   }
160  
161 < char* Globals::checkMe( void ){
161 > void Globals::validate() {
162 >  DataHolder::validate();
163  
331 –
332 –  std::string err("The following required keywords are missing:\n");
333 –  short int have_err = 0;
334 –
335 –  ParamMap::iterator i;
336 –  for (i = parameters_.begin(); i != parameters_.end(); ++i) {
337 –    if (!i->second->isOptional() && i->second->empty()) {
338 –        err +=  i->second->getKeyword() + "\n";
339 –    }
340 –  }
341 –
164    CheckParameter(ForceField, isNotEmpty());
343 –  CheckParameter(NComponents,isPositive());
165    CheckParameter(TargetTemp, isPositive());
166 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
166 >  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"));
167    CheckParameter(Dt, isPositive());
168    CheckParameter(RunTime, isPositive());
348 –  CheckParameter(InitialConfig, isNotEmpty());
169    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());
170    CheckParameter(SampleTime, isNonNegative());
171    CheckParameter(ResetTime, isNonNegative());
172    CheckParameter(StatusTime, isNonNegative());
# Line 360 | Line 174 | char* Globals::checkMe( void ){
174    CheckParameter(SwitchingRadius, isNonNegative());
175    CheckParameter(Dielectric, isPositive());
176    CheckParameter(ThermalTime,  isNonNegative());
363 –  CheckParameter(TargetPressure,  isPositive());
177    CheckParameter(TauThermostat, isPositive());
178    CheckParameter(TauBarostat, isPositive());
179    CheckParameter(ZconsTime, isPositive());
367 –  CheckParameter(NZconstraints, isPositive());  
180    CheckParameter(ZconsTol, isPositive());
369 –  //CheckParameter(ZconsForcePolicy,);
181    CheckParameter(Seed, isPositive());
182 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
182 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
183    CheckParameter(MinimizerMaxIter, isPositive());
184    CheckParameter(MinimizerWriteFrq, isPositive());
185    CheckParameter(MinimizerStepSize, isPositive());
# Line 378 | Line 189 | char* Globals::checkMe( void ){
189    CheckParameter(MinimizerLSMaxIter, isPositive());
190    CheckParameter(ZconsGap, isPositive());
191    CheckParameter(ZconsFixtime, isPositive());
192 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
192 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
193    CheckParameter(ThermodynamicIntegrationK, isPositive());
194    CheckParameter(ForceFieldVariant, isNotEmpty());
195    CheckParameter(ForceFieldFileName, isNotEmpty());
196    CheckParameter(ThermIntDistSpringConst, isPositive());
197    CheckParameter(ThermIntThetaSpringConst, isPositive());
198    CheckParameter(ThermIntOmegaSpringConst, isPositive());
199 <  CheckParameter(SurfaceTension, isPositive());
200 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
201 <  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
202 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
392 <  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
199 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
200 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
201 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
202 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
203    //CheckParameter(StatFileFormat,);    
394 –  //CheckParameter(MixingRule,);
204    CheckParameter(OrthoBoxTolerance, isPositive());  
205    CheckParameter(ThermIntDistSpringConst, isPositive());
206    CheckParameter(ThermIntThetaSpringConst, isPositive());
207    CheckParameter(ThermIntOmegaSpringConst, isPositive());
208    CheckParameter(DampingAlpha,isNonNegative());
209    CheckParameter(SkinThickness, isPositive());
210 <  
211 <  //@todo memory leak
212 <  if( have_err )
213 <    return strdup( err.c_str() );
214 <  
215 <  return NULL;
210 >  CheckParameter(Viscosity, isNonNegative());
211 >  CheckParameter(BeadSize, isPositive());
212 >  CheckParameter(FrozenBufferRadius, isPositive());
213 >  CheckParameter(LangevinBufferRadius, isPositive());
214 >  CheckParameter(NeighborListNeighbors, isPositive());
215 >  CheckParameter(RNEMD_swapTime, isPositive());
216 >  CheckParameter(RNEMD_nBins, isPositive() && isEven());
217 >  CheckParameter(RNEMD_swapType, isEqualIgnoreCase("Kinetic") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz"));
218 >  CheckParameter(Restraint_DisplacementSpringConstant, isNonNegative());
219 >  CheckParameter(Restraint_RollSpringConstant, isNonNegative());
220 >  CheckParameter(Restraint_PitchSpringConstant, isNonNegative());
221 >  CheckParameter(Restraint_YawSpringConstant, isNonNegative());
222 >  CheckParameter(Restraint_type, isEqualIgnoreCase("P") || isEqualIgnoreCase("O") || isEqualIgnoreCase("P+O") || isEqualIgnoreCase("RMSD_P") || isEqualIgnoreCase("RMSD_O") || isEqualIgnoreCase("RMSD_P+RMSD_O"));
223  
224 +  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
225 +    if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
226 +        std::ostringstream oss;
227 +        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
228 +        throw OOPSEException(oss.str());          
229 +    }
230 +  }
231 + }
232 +    
233 + bool Globals::addComponent(Component* comp) {
234 +    components_.push_back(comp);
235 +    return true;
236 + }
237  
238 + bool Globals::addZConsStamp(ZConsStamp* zcons) {
239 +    zconstraints_.push_back(zcons);
240 +    return true;
241   }
242  
243 < int Globals::globalEnd( event* the_event ){
244 <  
245 <  the_event->err_msg = checkMe();
246 <  if( the_event->err_msg != NULL ) return 0;
243 > bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
244 >    std::string molStampName = molStamp->getName();
245 >    std::map<std::string, MoleculeStamp*>::iterator i;
246 >    bool ret = false;
247 >    i = moleculeStamps_.find(molStampName);
248 >    if (i == moleculeStamps_.end()) {
249 >        moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
250 >        ret = true;
251 >    } else {
252 >        std::ostringstream oss;
253 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
254 >        throw OOPSEException(oss.str());  
255 >    }
256 >    return ret;
257 > }
258 >
259  
416 –  return 1;
260   }

Diff Legend

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