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] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
40 |
+ |
* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
41 |
|
*/ |
42 |
|
|
43 |
|
#include <stdlib.h> |
50 |
|
#include "utils/MemoryUtils.hpp" |
51 |
|
#include "utils/simError.h" |
52 |
|
|
53 |
< |
namespace oopse { |
53 |
> |
namespace OpenMD { |
54 |
|
Globals::Globals() { |
55 |
|
DefineParameter(ForceField, "forceField") |
56 |
|
|
58 |
|
DefineOptionalParameter(Ensemble, "ensemble"); |
59 |
|
DefineOptionalParameter(Dt, "dt"); |
60 |
|
DefineOptionalParameter(RunTime, "runTime"); |
60 |
– |
DefineOptionalParameter(InitialConfig, "initialConfig"); |
61 |
|
DefineOptionalParameter(FinalConfig, "finalConfig"); |
62 |
|
DefineOptionalParameter(SampleTime, "sampleTime"); |
63 |
|
DefineOptionalParameter(ResetTime, "resetTime"); |
64 |
|
DefineOptionalParameter(StatusTime, "statusTime"); |
65 |
|
DefineOptionalParameter(CutoffRadius, "cutoffRadius"); |
66 |
|
DefineOptionalParameter(SwitchingRadius, "switchingRadius"); |
67 |
– |
DefineOptionalParameter(Dielectric, "dielectric"); |
67 |
|
DefineOptionalParameter(TempSet, "tempSet"); |
68 |
|
DefineOptionalParameter(ThermalTime, "thermalTime"); |
69 |
< |
DefineOptionalParameter(TargetPressure, "targetPressure"); |
69 |
> |
DefineOptionalParameter(TargetPressure, "targetPressure"); |
70 |
|
DefineOptionalParameter(TauThermostat, "tauThermostat"); |
71 |
|
DefineOptionalParameter(TauBarostat, "tauBarostat"); |
72 |
|
DefineOptionalParameter(ZconsTime, "zconsTime"); |
75 |
|
DefineOptionalParameter(Seed, "seed"); |
76 |
|
DefineOptionalParameter(Minimizer, "minimizer"); |
77 |
|
DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter"); |
78 |
< |
DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq"); |
78 |
> |
DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq"); |
79 |
|
DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize"); |
80 |
|
DefineOptionalParameter(MinimizerFTol, "minimizerFTol"); |
81 |
|
DefineOptionalParameter(MinimizerGTol, "minimizerGTol"); |
88 |
|
DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK"); |
89 |
|
DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant"); |
90 |
|
DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName"); |
91 |
< |
DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst"); |
93 |
< |
DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst"); |
94 |
< |
DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst"); |
91 |
> |
DefineOptionalParameter(DampingAlpha, "dampingAlpha"); |
92 |
|
DefineOptionalParameter(SurfaceTension, "surfaceTension"); |
93 |
|
DefineOptionalParameter(PrintPressureTensor, "printPressureTensor"); |
94 |
< |
DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod"); |
95 |
< |
DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod"); |
96 |
< |
DefineOptionalParameter(CutoffPolicy, "cutoffPolicy"); |
94 |
> |
DefineOptionalParameter(PrintHeatFlux, "printHeatFlux"); |
95 |
> |
DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair"); |
96 |
> |
DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance"); |
97 |
|
DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType"); |
98 |
< |
DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard"); |
98 |
> |
DefineOptionalParameter(HydroPropFile, "HydroPropFile"); |
99 |
> |
DefineOptionalParameter(Viscosity, "viscosity"); |
100 |
> |
DefineOptionalParameter(BeadSize, "beadSize"); |
101 |
> |
DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius"); |
102 |
> |
DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius"); |
103 |
> |
DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors"); |
104 |
> |
DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod"); |
105 |
> |
DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod"); |
106 |
> |
DefineOptionalParameter(MTM_Ce, "MTM_Ce"); |
107 |
> |
DefineOptionalParameter(MTM_G, "MTM_G"); |
108 |
> |
DefineOptionalParameter(MTM_Io, "MTM_Io"); |
109 |
> |
DefineOptionalParameter(MTM_Sigma, "MTM_Sigma"); |
110 |
> |
DefineOptionalParameter(MTM_R, "MTM_R"); |
111 |
> |
DefineOptionalParameter(Alpha, "alpha"); |
112 |
> |
|
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(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0); |
122 |
< |
DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5); |
123 |
< |
DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5); |
124 |
< |
DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2); |
125 |
< |
DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0); |
126 |
< |
DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0); |
119 |
> |
DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE"); |
120 |
> |
DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED"); |
121 |
> |
DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0); |
122 |
> |
DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false); |
123 |
> |
DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false); |
124 |
> |
DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false); |
125 |
> |
DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false); |
126 |
> |
DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false); |
127 |
|
DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0); |
128 |
|
DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY"); |
129 |
+ |
DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false); |
130 |
+ |
DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false); |
131 |
|
|
132 |
+ |
DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false); |
133 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0); |
134 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16); |
135 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16); |
136 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale"); |
137 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0); |
138 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_targetJzKE, "RNEMD_targetJzKE", 0.0); |
139 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpx, "RNEMD_targetJzpx", 0.0); |
140 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpy, "RNEMD_targetJzpy", 0.0); |
141 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpz, "RNEMD_targetJzpz", 0.0); |
142 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all"); |
143 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false); |
144 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputTemperature, "RNEMD_outputTemperature", false); |
145 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputVx, "RNEMD_outputVx", false); |
146 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputVy, "RNEMD_outputVy", false); |
147 |
+ |
// James put this in. |
148 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputDen, "RNEMD_outputDen", false); |
149 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputAh, "RNEMD_outputAh", false); |
150 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputVz, "RNEMD_outputVz", false); |
151 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputXyzTemperature, "RNEMD_outputXyzTemperature", false); |
152 |
+ |
DefineOptionalParameterWithDefaultValue(RNEMD_outputRotTemperature, "RNEMD_outputRotTemperature", false); |
153 |
|
|
154 |
< |
deprecatedKeywords_.insert("nComponents"); |
155 |
< |
deprecatedKeywords_.insert("nZconstraints"); |
154 |
> |
DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false); |
155 |
> |
DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in"); |
156 |
> |
DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false); |
157 |
> |
DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex"); |
158 |
> |
DefineOptionalParameterWithDefaultValue(FlucQPropagator, "flucQ.propagator", "NVT"); |
159 |
> |
DefineOptionalParameterWithDefaultValue(FlucQFriction, "flucQ.friction", 1600.0); |
160 |
> |
DefineOptionalParameterWithDefaultValue(FlucQTolerance, "flucQ.tolerance", 1.0e-6); |
161 |
> |
DefineOptionalParameterWithDefaultValue(FlucQMaxIterations, "flucQ.maxIterations", 100); |
162 |
> |
DefineOptionalParameterWithDefaultValue(FlucQTargetTemp, "flucQ.targetTemp", 1.0e-6); |
163 |
> |
DefineOptionalParameterWithDefaultValue(FlucQtauThermostat, "flucQ.tauThermostat", 10.0); |
164 |
> |
|
165 |
> |
deprecatedKeywords_.insert("nComponents"); |
166 |
> |
deprecatedKeywords_.insert("nZconstraints"); |
167 |
> |
deprecatedKeywords_.insert("initialConfig"); |
168 |
> |
deprecatedKeywords_.insert("thermIntDistSpringConst"); |
169 |
> |
deprecatedKeywords_.insert("thermIntThetaSpringConst"); |
170 |
> |
deprecatedKeywords_.insert("thermIntOmegaSpringConst"); |
171 |
> |
deprecatedKeywords_.insert("useSolidThermInt"); |
172 |
> |
deprecatedKeywords_.insert("useLiquidThermInt"); |
173 |
|
|
174 |
|
} |
175 |
|
|
176 |
|
Globals::~Globals() { |
177 |
|
MemoryUtils::deletePointers(components_); |
178 |
|
MemoryUtils::deletePointers(zconstraints_); |
179 |
+ |
MemoryUtils::deletePointers(restraints_); |
180 |
|
} |
181 |
|
|
182 |
|
void Globals::validate() { |
184 |
|
|
185 |
|
CheckParameter(ForceField, isNotEmpty()); |
186 |
|
CheckParameter(TargetTemp, isPositive()); |
187 |
< |
CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) ); |
187 |
> |
CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT") || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("LANGEVINHULL") || isEqualIgnoreCase("LHULL") || isEqualIgnoreCase("SMIPD")); |
188 |
|
CheckParameter(Dt, isPositive()); |
189 |
|
CheckParameter(RunTime, isPositive()); |
136 |
– |
CheckParameter(InitialConfig, isNotEmpty()); |
190 |
|
CheckParameter(FinalConfig, isNotEmpty()); |
191 |
|
CheckParameter(SampleTime, isNonNegative()); |
192 |
|
CheckParameter(ResetTime, isNonNegative()); |
195 |
|
CheckParameter(SwitchingRadius, isNonNegative()); |
196 |
|
CheckParameter(Dielectric, isPositive()); |
197 |
|
CheckParameter(ThermalTime, isNonNegative()); |
145 |
– |
CheckParameter(TargetPressure, isPositive()); |
198 |
|
CheckParameter(TauThermostat, isPositive()); |
199 |
|
CheckParameter(TauBarostat, isPositive()); |
200 |
|
CheckParameter(ZconsTime, isPositive()); |
201 |
|
CheckParameter(ZconsTol, isPositive()); |
202 |
|
CheckParameter(Seed, isPositive()); |
203 |
< |
CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG"))); |
203 |
> |
CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG")); |
204 |
|
CheckParameter(MinimizerMaxIter, isPositive()); |
205 |
< |
CheckParameter(MinimizerWriteFrq, isPositive()); |
205 |
> |
CheckParameter(MinimizerWriteFreq, isPositive()); |
206 |
|
CheckParameter(MinimizerStepSize, isPositive()); |
207 |
|
CheckParameter(MinimizerFTol, isPositive()); |
208 |
|
CheckParameter(MinimizerGTol, isPositive()); |
210 |
|
CheckParameter(MinimizerLSMaxIter, isPositive()); |
211 |
|
CheckParameter(ZconsGap, isPositive()); |
212 |
|
CheckParameter(ZconsFixtime, isPositive()); |
213 |
< |
CheckParameter(ThermodynamicIntegrationLambda, isPositive()); |
213 |
> |
CheckParameter(ThermodynamicIntegrationLambda, isNonNegative()); |
214 |
|
CheckParameter(ThermodynamicIntegrationK, isPositive()); |
215 |
|
CheckParameter(ForceFieldVariant, isNotEmpty()); |
216 |
|
CheckParameter(ForceFieldFileName, isNotEmpty()); |
217 |
< |
CheckParameter(ThermIntDistSpringConst, isPositive()); |
218 |
< |
CheckParameter(ThermIntThetaSpringConst, isPositive()); |
219 |
< |
CheckParameter(ThermIntOmegaSpringConst, isPositive()); |
220 |
< |
CheckParameter(SurfaceTension, isPositive()); |
221 |
< |
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,); |
217 |
> |
CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE")); |
218 |
> |
CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL")); |
219 |
> |
CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD")); |
220 |
> |
CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED")); |
221 |
> |
CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL")); |
222 |
|
CheckParameter(OrthoBoxTolerance, isPositive()); |
176 |
– |
CheckParameter(ThermIntDistSpringConst, isPositive()); |
177 |
– |
CheckParameter(ThermIntThetaSpringConst, isPositive()); |
178 |
– |
CheckParameter(ThermIntOmegaSpringConst, isPositive()); |
223 |
|
CheckParameter(DampingAlpha,isNonNegative()); |
224 |
|
CheckParameter(SkinThickness, isPositive()); |
225 |
< |
|
225 |
> |
CheckParameter(Viscosity, isNonNegative()); |
226 |
> |
CheckParameter(BeadSize, isPositive()); |
227 |
> |
CheckParameter(FrozenBufferRadius, isPositive()); |
228 |
> |
CheckParameter(LangevinBufferRadius, isPositive()); |
229 |
> |
CheckParameter(NeighborListNeighbors, isPositive()); |
230 |
> |
CheckParameter(RNEMD_exchangeTime, isPositive()); |
231 |
> |
CheckParameter(RNEMD_nBins, isPositive() && isEven()); |
232 |
> |
CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("KineticScaleVAM") || isEqualIgnoreCase("KineticScaleAM") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale") || isEqualIgnoreCase("ShiftScaleV") || isEqualIgnoreCase("ShiftScaleVAM")); |
233 |
> |
CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape")); |
234 |
> |
CheckParameter(Alpha, isPositive()); |
235 |
> |
CheckParameter(FlucQPropagator, isEqualIgnoreCase("NVT") || isEqualIgnoreCase("Langevin") || isEqualIgnoreCase("Minimizer") || isEqualIgnoreCase("Exact") ); |
236 |
> |
CheckParameter(FlucQFriction, isNonNegative()); |
237 |
> |
CheckParameter(FlucQTolerance, isPositive()); |
238 |
> |
CheckParameter(FlucQMaxIterations, isPositive()); |
239 |
> |
CheckParameter(FlucQTargetTemp, isNonNegative()); |
240 |
> |
CheckParameter(FlucQtauThermostat, isPositive()); |
241 |
> |
|
242 |
|
for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) { |
243 |
|
if (!(*i)->findMoleculeStamp(moleculeStamps_)) { |
244 |
< |
std::cout << "Globals Error: can not find molecule stamp for component" << std::endl; |
244 |
> |
std::ostringstream oss; |
245 |
> |
oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl; |
246 |
> |
throw OpenMDException(oss.str()); |
247 |
|
} |
248 |
|
} |
249 |
|
} |
250 |
< |
|
250 |
> |
|
251 |
|
bool Globals::addComponent(Component* comp) { |
252 |
|
components_.push_back(comp); |
253 |
|
return true; |
258 |
|
return true; |
259 |
|
} |
260 |
|
|
261 |
+ |
bool Globals::addRestraintStamp(RestraintStamp* rest) { |
262 |
+ |
restraints_.push_back(rest); |
263 |
+ |
return true; |
264 |
+ |
} |
265 |
+ |
|
266 |
|
bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) { |
267 |
|
std::string molStampName = molStamp->getName(); |
268 |
|
std::map<std::string, MoleculeStamp*>::iterator i; |
272 |
|
moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp)); |
273 |
|
ret = true; |
274 |
|
} else { |
275 |
< |
std::cout << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n"; |
275 |
> |
std::ostringstream oss; |
276 |
> |
oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n"; |
277 |
> |
throw OpenMDException(oss.str()); |
278 |
|
} |
279 |
|
return ret; |
280 |
|
} |