| 1 | 
  | 
/* | 
| 2 | 
< | 
 * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | 
| 2 | 
> | 
 * Copyright (c) 2005, 2010 The University of Notre Dame. All Rights Reserved. | 
| 3 | 
  | 
 * | 
| 4 | 
  | 
 * The University of Notre Dame grants you ("Licensee") a | 
| 5 | 
  | 
 * non-exclusive, royalty free, license to use, modify and | 
| 6 | 
  | 
 * redistribute this software in source and binary code form, provided | 
| 7 | 
  | 
 * that the following conditions are met: | 
| 8 | 
  | 
 * | 
| 9 | 
< | 
 * 1. Acknowledgement of the program authors must be made in any | 
| 10 | 
< | 
 *    publication of scientific results based in part on use of the | 
| 11 | 
< | 
 *    program.  An acceptable form of acknowledgement is citation of | 
| 12 | 
< | 
 *    the article in which the program was described (Matthew | 
| 13 | 
< | 
 *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher | 
| 14 | 
< | 
 *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented | 
| 15 | 
< | 
 *    Parallel Simulation Engine for Molecular Dynamics," | 
| 16 | 
< | 
 *    J. Comput. Chem. 26, pp. 252-271 (2005)) | 
| 17 | 
< | 
 * | 
| 18 | 
< | 
 * 2. Redistributions of source code must retain the above copyright | 
| 9 | 
> | 
 * 1. Redistributions of source code must retain the above copyright | 
| 10 | 
  | 
 *    notice, this list of conditions and the following disclaimer. | 
| 11 | 
  | 
 * | 
| 12 | 
< | 
 * 3. Redistributions in binary form must reproduce the above copyright | 
| 12 | 
> | 
 * 2. Redistributions in binary form must reproduce the above copyright | 
| 13 | 
  | 
 *    notice, this list of conditions and the following disclaimer in the | 
| 14 | 
  | 
 *    documentation and/or other materials provided with the | 
| 15 | 
  | 
 *    distribution. | 
| 28 | 
  | 
 * arising out of the use of or inability to use software, even if the | 
| 29 | 
  | 
 * University of Notre Dame has been advised of the possibility of | 
| 30 | 
  | 
 * such damages. | 
| 31 | 
+ | 
 * | 
| 32 | 
+ | 
 * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your | 
| 33 | 
+ | 
 * research, please cite the appropriate papers when you publish your | 
| 34 | 
+ | 
 * work.  Good starting points are: | 
| 35 | 
+ | 
 *                                                                       | 
| 36 | 
+ | 
 * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).              | 
| 37 | 
+ | 
 * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).           | 
| 38 | 
+ | 
 * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).           | 
| 39 | 
+ | 
 * [4]  Vardeman & Gezelter, in progress (2009).                         | 
| 40 | 
  | 
 */ | 
| 41 | 
  | 
  | 
| 42 | 
  | 
#include <stdlib.h> | 
| 49 | 
  | 
#include "utils/MemoryUtils.hpp" | 
| 50 | 
  | 
#include "utils/simError.h" | 
| 51 | 
  | 
 | 
| 52 | 
< | 
namespace oopse { | 
| 52 | 
> | 
namespace OpenMD { | 
| 53 | 
  | 
Globals::Globals() { | 
| 54 | 
  | 
  DefineParameter(ForceField, "forceField") | 
| 55 | 
  | 
  | 
| 57 | 
  | 
  DefineOptionalParameter(Ensemble, "ensemble"); | 
| 58 | 
  | 
  DefineOptionalParameter(Dt, "dt"); | 
| 59 | 
  | 
  DefineOptionalParameter(RunTime, "runTime"); | 
| 60 | 
– | 
  DefineOptionalParameter(InitialConfig, "initialConfig"); | 
| 60 | 
  | 
  DefineOptionalParameter(FinalConfig, "finalConfig"); | 
| 61 | 
  | 
  DefineOptionalParameter(SampleTime, "sampleTime"); | 
| 62 | 
  | 
  DefineOptionalParameter(ResetTime, "resetTime"); | 
| 63 | 
  | 
  DefineOptionalParameter(StatusTime, "statusTime"); | 
| 64 | 
  | 
  DefineOptionalParameter(CutoffRadius, "cutoffRadius"); | 
| 65 | 
  | 
  DefineOptionalParameter(SwitchingRadius, "switchingRadius"); | 
| 67 | 
– | 
  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"); | 
| 74 | 
  | 
  DefineOptionalParameter(Seed, "seed"); | 
| 75 | 
  | 
  DefineOptionalParameter(Minimizer, "minimizer"); | 
| 76 | 
  | 
  DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter"); | 
| 77 | 
< | 
  DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq"); | 
| 77 | 
> | 
  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq"); | 
| 78 | 
  | 
  DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize"); | 
| 79 | 
  | 
  DefineOptionalParameter(MinimizerFTol, "minimizerFTol"); | 
| 80 | 
  | 
  DefineOptionalParameter(MinimizerGTol, "minimizerGTol"); | 
| 87 | 
  | 
  DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK"); | 
| 88 | 
  | 
  DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant"); | 
| 89 | 
  | 
  DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName"); | 
| 90 | 
< | 
  DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst"); | 
| 93 | 
< | 
  DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst"); | 
| 94 | 
< | 
  DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst"); | 
| 90 | 
> | 
  DefineOptionalParameter(DampingAlpha, "dampingAlpha"); | 
| 91 | 
  | 
  DefineOptionalParameter(SurfaceTension, "surfaceTension"); | 
| 92 | 
  | 
  DefineOptionalParameter(PrintPressureTensor, "printPressureTensor"); | 
| 93 | 
< | 
  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod"); | 
| 94 | 
< | 
  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod"); | 
| 99 | 
< | 
  DefineOptionalParameter(CutoffPolicy, "cutoffPolicy"); | 
| 93 | 
> | 
  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair"); | 
| 94 | 
> | 
  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance"); | 
| 95 | 
  | 
  DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType"); | 
| 96 | 
< | 
  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard"); | 
| 96 | 
> | 
  DefineOptionalParameter(HydroPropFile, "HydroPropFile"); | 
| 97 | 
> | 
  DefineOptionalParameter(Viscosity, "viscosity"); | 
| 98 | 
> | 
  DefineOptionalParameter(BeadSize, "beadSize"); | 
| 99 | 
> | 
  DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius"); | 
| 100 | 
> | 
  DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius"); | 
| 101 | 
> | 
  DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors"); | 
| 102 | 
> | 
  DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod"); | 
| 103 | 
> | 
  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod"); | 
| 104 | 
> | 
  DefineOptionalParameter(MTM_Ce, "MTM_Ce"); | 
| 105 | 
> | 
  DefineOptionalParameter(MTM_G, "MTM_G"); | 
| 106 | 
> | 
  DefineOptionalParameter(MTM_Io, "MTM_Io"); | 
| 107 | 
> | 
  DefineOptionalParameter(MTM_Sigma, "MTM_Sigma"); | 
| 108 | 
> | 
  DefineOptionalParameter(MTM_R, "MTM_R"); | 
| 109 | 
> | 
  DefineOptionalParameter(Alpha, "alpha"); | 
| 110 | 
> | 
 | 
| 111 | 
> | 
   | 
| 112 | 
  | 
  DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true); | 
| 113 | 
+ | 
  DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true); | 
| 114 | 
  | 
  DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false); | 
| 115 | 
  | 
  DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false); | 
| 116 | 
  | 
  DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);   | 
| 117 | 
< | 
  DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false); | 
| 118 | 
< | 
  DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false); | 
| 119 | 
< | 
  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0); | 
| 109 | 
< | 
  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5); | 
| 110 | 
< | 
  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5); | 
| 111 | 
< | 
  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2); | 
| 117 | 
> | 
  DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE"); | 
| 118 | 
> | 
  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED"); | 
| 119 | 
> | 
  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0); | 
| 120 | 
  | 
  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0); | 
| 121 | 
  | 
  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0); | 
| 122 | 
  | 
  DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0); | 
| 123 | 
  | 
  DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");     | 
| 124 | 
+ | 
  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false); | 
| 125 | 
+ | 
  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false); | 
| 126 | 
  | 
 | 
| 127 | 
+ | 
  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false); | 
| 128 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0); | 
| 129 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16); | 
| 130 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16); | 
| 131 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale"); | 
| 132 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0); | 
| 133 | 
+ | 
  DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all"); | 
| 134 | 
+ | 
  DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false); | 
| 135 | 
+ | 
  DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in"); | 
| 136 | 
+ | 
  DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false); | 
| 137 | 
+ | 
  DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex"); | 
| 138 | 
  | 
 | 
| 139 | 
< | 
    deprecatedKeywords_.insert("nComponents"); | 
| 140 | 
< | 
    deprecatedKeywords_.insert("nZconstraints"); | 
| 139 | 
> | 
 | 
| 140 | 
> | 
 | 
| 141 | 
> | 
  deprecatedKeywords_.insert("nComponents"); | 
| 142 | 
> | 
  deprecatedKeywords_.insert("nZconstraints"); | 
| 143 | 
> | 
  deprecatedKeywords_.insert("initialConfig"); | 
| 144 | 
> | 
  deprecatedKeywords_.insert("thermIntDistSpringConst"); | 
| 145 | 
> | 
  deprecatedKeywords_.insert("thermIntThetaSpringConst"); | 
| 146 | 
> | 
  deprecatedKeywords_.insert("thermIntOmegaSpringConst"); | 
| 147 | 
> | 
  deprecatedKeywords_.insert("useSolidThermInt");   | 
| 148 | 
> | 
  deprecatedKeywords_.insert("useLiquidThermInt"); | 
| 149 | 
  | 
     | 
| 150 | 
  | 
} | 
| 151 | 
  | 
 | 
| 152 | 
  | 
Globals::~Globals() { | 
| 153 | 
  | 
    MemoryUtils::deletePointers(components_); | 
| 154 | 
  | 
    MemoryUtils::deletePointers(zconstraints_); | 
| 155 | 
+ | 
    MemoryUtils::deletePointers(restraints_); | 
| 156 | 
  | 
} | 
| 157 | 
  | 
 | 
| 158 | 
  | 
void Globals::validate() { | 
| 160 | 
  | 
 | 
| 161 | 
  | 
  CheckParameter(ForceField, isNotEmpty()); | 
| 162 | 
  | 
  CheckParameter(TargetTemp, isPositive()); | 
| 163 | 
< | 
  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  ); | 
| 163 | 
> | 
  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")); | 
| 164 | 
  | 
  CheckParameter(Dt, isPositive()); | 
| 165 | 
  | 
  CheckParameter(RunTime, isPositive()); | 
| 136 | 
– | 
  CheckParameter(InitialConfig, isNotEmpty()); | 
| 166 | 
  | 
  CheckParameter(FinalConfig, isNotEmpty()); | 
| 167 | 
  | 
  CheckParameter(SampleTime, isNonNegative()); | 
| 168 | 
  | 
  CheckParameter(ResetTime, isNonNegative()); | 
| 171 | 
  | 
  CheckParameter(SwitchingRadius, isNonNegative()); | 
| 172 | 
  | 
  CheckParameter(Dielectric, isPositive()); | 
| 173 | 
  | 
  CheckParameter(ThermalTime,  isNonNegative()); | 
| 145 | 
– | 
  CheckParameter(TargetPressure,  isPositive()); | 
| 174 | 
  | 
  CheckParameter(TauThermostat, isPositive()); | 
| 175 | 
  | 
  CheckParameter(TauBarostat, isPositive()); | 
| 176 | 
  | 
  CheckParameter(ZconsTime, isPositive()); | 
| 178 | 
  | 
  CheckParameter(Seed, isPositive()); | 
| 179 | 
  | 
  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG")); | 
| 180 | 
  | 
  CheckParameter(MinimizerMaxIter, isPositive()); | 
| 181 | 
< | 
  CheckParameter(MinimizerWriteFrq, isPositive()); | 
| 181 | 
> | 
  CheckParameter(MinimizerWriteFreq, isPositive()); | 
| 182 | 
  | 
  CheckParameter(MinimizerStepSize, isPositive()); | 
| 183 | 
  | 
  CheckParameter(MinimizerFTol, isPositive()); | 
| 184 | 
  | 
  CheckParameter(MinimizerGTol, isPositive()); | 
| 186 | 
  | 
  CheckParameter(MinimizerLSMaxIter, isPositive()); | 
| 187 | 
  | 
  CheckParameter(ZconsGap, isPositive()); | 
| 188 | 
  | 
  CheckParameter(ZconsFixtime, isPositive()); | 
| 189 | 
< | 
  CheckParameter(ThermodynamicIntegrationLambda, isPositive()); | 
| 189 | 
> | 
  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative()); | 
| 190 | 
  | 
  CheckParameter(ThermodynamicIntegrationK, isPositive()); | 
| 191 | 
  | 
  CheckParameter(ForceFieldVariant, isNotEmpty()); | 
| 192 | 
  | 
  CheckParameter(ForceFieldFileName, isNotEmpty()); | 
| 193 | 
< | 
  CheckParameter(ThermIntDistSpringConst, isPositive()); | 
| 166 | 
< | 
  CheckParameter(ThermIntThetaSpringConst, isPositive()); | 
| 167 | 
< | 
  CheckParameter(ThermIntOmegaSpringConst, isPositive()); | 
| 168 | 
< | 
  CheckParameter(SurfaceTension, isPositive()); | 
| 169 | 
< | 
  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD")); | 
| 170 | 
< | 
  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));  | 
| 193 | 
> | 
  CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE")); | 
| 194 | 
  | 
  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL")); | 
| 195 | 
+ | 
  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD")); | 
| 196 | 
+ | 
  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));  | 
| 197 | 
  | 
  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL")); | 
| 173 | 
– | 
  //CheckParameter(StatFileFormat,);      | 
| 174 | 
– | 
  //CheckParameter(MixingRule,); | 
| 198 | 
  | 
  CheckParameter(OrthoBoxTolerance, isPositive());   | 
| 176 | 
– | 
  CheckParameter(ThermIntDistSpringConst, isPositive()); | 
| 177 | 
– | 
  CheckParameter(ThermIntThetaSpringConst, isPositive()); | 
| 178 | 
– | 
  CheckParameter(ThermIntOmegaSpringConst, isPositive()); | 
| 199 | 
  | 
  CheckParameter(DampingAlpha,isNonNegative()); | 
| 200 | 
  | 
  CheckParameter(SkinThickness, isPositive()); | 
| 201 | 
+ | 
  CheckParameter(Viscosity, isNonNegative()); | 
| 202 | 
+ | 
  CheckParameter(BeadSize, isPositive()); | 
| 203 | 
+ | 
  CheckParameter(FrozenBufferRadius, isPositive()); | 
| 204 | 
+ | 
  CheckParameter(LangevinBufferRadius, isPositive()); | 
| 205 | 
+ | 
  CheckParameter(NeighborListNeighbors, isPositive()); | 
| 206 | 
+ | 
  CheckParameter(RNEMD_exchangeTime, isPositive()); | 
| 207 | 
+ | 
  CheckParameter(RNEMD_nBins, isPositive() && isEven()); | 
| 208 | 
+ | 
  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale")); | 
| 209 | 
+ | 
  CheckParameter(RNEMD_targetFlux, isNonNegative()); | 
| 210 | 
+ | 
  CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));  | 
| 211 | 
+ | 
  CheckParameter(Alpha, isPositive());  | 
| 212 | 
  | 
 | 
| 213 | 
+ | 
   | 
| 214 | 
  | 
  for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) { | 
| 215 | 
  | 
    if (!(*i)->findMoleculeStamp(moleculeStamps_)) { | 
| 216 | 
  | 
        std::ostringstream oss; | 
| 217 | 
  | 
        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl; | 
| 218 | 
< | 
        throw OOPSEException(oss.str());            | 
| 218 | 
> | 
        throw OpenMDException(oss.str());            | 
| 219 | 
  | 
    } | 
| 220 | 
  | 
  } | 
| 221 | 
  | 
} | 
| 222 | 
< | 
     | 
| 222 | 
> | 
   | 
| 223 | 
  | 
bool Globals::addComponent(Component* comp) { | 
| 224 | 
  | 
    components_.push_back(comp); | 
| 225 | 
  | 
    return true; | 
| 230 | 
  | 
    return true; | 
| 231 | 
  | 
} | 
| 232 | 
  | 
 | 
| 233 | 
+ | 
bool Globals::addRestraintStamp(RestraintStamp* rest) { | 
| 234 | 
+ | 
    restraints_.push_back(rest); | 
| 235 | 
+ | 
    return true; | 
| 236 | 
+ | 
} | 
| 237 | 
+ | 
 | 
| 238 | 
  | 
bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) { | 
| 239 | 
  | 
    std::string molStampName = molStamp->getName(); | 
| 240 | 
  | 
    std::map<std::string, MoleculeStamp*>::iterator i; | 
| 246 | 
  | 
    } else { | 
| 247 | 
  | 
        std::ostringstream oss; | 
| 248 | 
  | 
        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n"; | 
| 249 | 
< | 
        throw OOPSEException(oss.str());   | 
| 249 | 
> | 
        throw OpenMDException(oss.str());   | 
| 250 | 
  | 
    } | 
| 251 | 
  | 
    return ret; | 
| 252 | 
  | 
} |