| 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> | 
| 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 | < | #define DefineParameter(NAME,KEYWORD)                              \ | 
| 56 | < | NAME.setKeyword(KEYWORD);                  \ | 
| 57 | < | parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME)); | 
| 58 | < |  | 
| 59 | < | #define DefineOptionalParameter(NAME,KEYWORD)                              \ | 
| 60 | < | NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \ | 
| 61 | < | parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME)); | 
| 62 | < |  | 
| 63 | < | #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \ | 
| 64 | < | NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \ | 
| 65 | < | parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME)); | 
| 66 | < |  | 
| 67 | < | #define CheckParameter(NAME, CONSTRAINT)                              \ | 
| 68 | < | if (!NAME.empty()) { if (!(CONSTRAINT)(NAME.getData())) std::cout <<"Error in parsing " << NAME.getKeyword() << " : "<< (CONSTRAINT).getConstraintDescription() << std::endl; } | 
| 69 | < |  | 
| 70 | < |  | 
| 71 | < | Globals::Globals(){ | 
| 72 | < |  | 
| 52 | > | namespace OpenMD { | 
| 53 | > | Globals::Globals() { | 
| 54 |  | DefineParameter(ForceField, "forceField") | 
| 74 | – | DefineParameter(NComponents, "nComponents") | 
| 55 |  |  | 
| 56 |  | DefineOptionalParameter(TargetTemp, "targetTemp"); | 
| 57 |  | DefineOptionalParameter(Ensemble, "ensemble"); | 
| 58 |  | DefineOptionalParameter(Dt, "dt"); | 
| 59 |  | DefineOptionalParameter(RunTime, "runTime"); | 
| 80 | – | DefineOptionalParameter(InitialConfig, "initialConfig"); | 
| 60 |  | DefineOptionalParameter(FinalConfig, "finalConfig"); | 
| 82 | – | DefineOptionalParameter(NMol, "nMol"); | 
| 83 | – | DefineOptionalParameter(Density, "density"); | 
| 84 | – | DefineOptionalParameter(Box, "box"); | 
| 85 | – | DefineOptionalParameter(BoxX, "boxX"); | 
| 86 | – | DefineOptionalParameter(BoxY, "boxY"); | 
| 87 | – | DefineOptionalParameter(BoxZ, "boxZ"); | 
| 61 |  | DefineOptionalParameter(SampleTime, "sampleTime"); | 
| 62 |  | DefineOptionalParameter(ResetTime, "resetTime"); | 
| 63 |  | DefineOptionalParameter(StatusTime, "statusTime"); | 
| 64 |  | DefineOptionalParameter(CutoffRadius, "cutoffRadius"); | 
| 65 |  | DefineOptionalParameter(SwitchingRadius, "switchingRadius"); | 
| 93 | – | 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"); | 
| 100 | – | DefineOptionalParameter(NZconstraints, "nZconstraints"); | 
| 72 |  | DefineOptionalParameter(ZconsTol, "zconsTol"); | 
| 73 |  | DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy"); | 
| 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"); | 
| 120 | < | DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst"); | 
| 121 | < | DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst"); | 
| 90 | > | DefineOptionalParameter(DampingAlpha, "dampingAlpha"); | 
| 91 |  | DefineOptionalParameter(SurfaceTension, "surfaceTension"); | 
| 92 |  | DefineOptionalParameter(PrintPressureTensor, "printPressureTensor"); | 
| 93 | < | DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod"); | 
| 93 | > | DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair"); | 
| 94 | > | DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance"); | 
| 95 |  | DefineOptionalParameter(CutoffPolicy, "cutoffPolicy"); | 
| 96 | < | DefineOptionalParameter(StatFileFormat, "statFileFormat"); | 
| 96 | > | DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType"); | 
| 97 | > | DefineOptionalParameter(HydroPropFile, "HydroPropFile"); | 
| 98 | > | DefineOptionalParameter(Viscosity, "viscosity"); | 
| 99 | > | DefineOptionalParameter(BeadSize, "beadSize"); | 
| 100 | > | DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius"); | 
| 101 | > | DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius"); | 
| 102 | > | DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors"); | 
| 103 | > | DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod"); | 
| 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 |  |  | 
| 128 | – | DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard"); | 
| 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); | 
| 136 | < | DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5); | 
| 137 | < | DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5); | 
| 138 | < | DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5); | 
| 117 | > | DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE"); | 
| 118 | > | DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED"); | 
| 119 | > | DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5); | 
| 120 |  | DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0); | 
| 121 | + | DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0); | 
| 122 |  | DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0); | 
| 123 | < |  | 
| 124 | < | } | 
| 125 | < |  | 
| 144 | < | int Globals::globalAssign( event* the_event ){ | 
| 145 | < |  | 
| 146 | < | int key; | 
| 147 | < | int token; | 
| 148 | < | interface_assign_type the_type =  the_event->evt.asmt.asmt_type; | 
| 149 | < | char* lhs = the_event->evt.asmt.lhs; | 
| 150 | < | std::string keyword(lhs); | 
| 151 | < |  | 
| 152 | < | bool result; | 
| 153 | < |  | 
| 154 | < |  | 
| 155 | < | ParamMap::iterator i =parameters_.find(keyword); | 
| 156 | < | if (i != parameters_.end()) { | 
| 157 | < | if( the_type == STRING ){ | 
| 158 | < | result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval)); | 
| 159 | < | if (!result ) { | 
| 160 | < | sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() ); | 
| 161 | < | } | 
| 162 | < | } else if( the_type == DOUBLE ){ | 
| 163 | < | result = i->second->setData(the_event->evt.asmt.rhs.dval); | 
| 164 | < | if (!result ) | 
| 165 | < | sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() ); | 
| 166 | < | } | 
| 167 | < | else if (the_type == INT ){ | 
| 168 | < | result = i->second->setData(the_event->evt.asmt.rhs.ival); | 
| 169 | < | if (!result ) | 
| 170 | < | sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() ); | 
| 171 | < |  | 
| 172 | < | } else { | 
| 173 | < |  | 
| 174 | < | } | 
| 175 | < | } | 
| 176 | < |  | 
| 177 | < | if (keyword == "nComponents" && getNComponents() > 0) { | 
| 178 | < | components = new Component*[getNComponents()]; | 
| 179 | < | }else if (keyword == "nZconstraints" && getNZconstraints() > 0) { | 
| 180 | < | zConstraints = new ZconStamp*[getNZconstraints()]; | 
| 181 | < | } | 
| 182 | < |  | 
| 183 | < | return result; | 
| 184 | < | } | 
| 185 | < |  | 
| 186 | < | int Globals::newComponent( event* the_event ){ | 
| 187 | < |  | 
| 188 | < | current_component = new Component; | 
| 189 | < | int index = the_event->evt.blk_index; | 
| 190 | < | char err[200]; | 
| 191 | < |  | 
| 192 | < | if( haveNComponents() && index < getNComponents() ) | 
| 193 | < | components[index] = current_component; | 
| 194 | < | else{ | 
| 195 | < | if( haveNComponents()  ){ | 
| 196 | < | sprintf( err, "meta-data parsing error: %d out of nComponents range", | 
| 197 | < | index ); | 
| 198 | < | the_event->err_msg = strdup( err ); | 
| 199 | < | return 0; | 
| 200 | < | } | 
| 201 | < | else{ | 
| 202 | < | the_event->err_msg = strdup("meta-data parsing error: nComponents not given before" | 
| 203 | < | " first component declaration." ); | 
| 204 | < | return 0; | 
| 205 | < | } | 
| 206 | < | } | 
| 207 | < |  | 
| 208 | < | return 1; | 
| 209 | < | } | 
| 210 | < |  | 
| 211 | < |  | 
| 212 | < |  | 
| 213 | < | int Globals::componentAssign( event* the_event ){ | 
| 214 | < |  | 
| 215 | < | switch( the_event->evt.asmt.asmt_type ){ | 
| 216 | < |  | 
| 217 | < | case STRING: | 
| 218 | < | return current_component->assignString( the_event->evt.asmt.lhs, | 
| 219 | < | the_event->evt.asmt.rhs.sval, | 
| 220 | < | &(the_event->err_msg)); | 
| 221 | < | break; | 
| 222 | < |  | 
| 223 | < | case DOUBLE: | 
| 224 | < | return current_component->assignDouble( the_event->evt.asmt.lhs, | 
| 225 | < | the_event->evt.asmt.rhs.dval, | 
| 226 | < | &(the_event->err_msg)); | 
| 227 | < | break; | 
| 228 | < |  | 
| 229 | < | case INT: | 
| 230 | < | return current_component->assignInt( the_event->evt.asmt.lhs, | 
| 231 | < | the_event->evt.asmt.rhs.ival, | 
| 232 | < | &(the_event->err_msg)); | 
| 233 | < | break; | 
| 234 | < |  | 
| 235 | < | default: | 
| 236 | < | the_event->err_msg = strdup( "Globals error. Invalid component" | 
| 237 | < | " assignment type" ); | 
| 238 | < | return 0; | 
| 239 | < | break; | 
| 240 | < | } | 
| 241 | < | return 0; | 
| 242 | < | } | 
| 243 | < |  | 
| 244 | < | int Globals::componentEnd( event* the_event ){ | 
| 245 | < |  | 
| 246 | < | the_event->err_msg = current_component->checkMe(); | 
| 247 | < | if( the_event->err_msg != NULL ) return 0; | 
| 248 | < |  | 
| 249 | < | return 1; | 
| 250 | < | } | 
| 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 | < | int Globals::newZconstraint( event* the_event ){ | 
| 128 | < |  | 
| 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 |  |  | 
| 255 | – | int index = the_event->evt.blk_index; | 
| 256 | – | char err[200]; | 
| 257 | – | current_zConstraint = new ZconStamp( index ); | 
| 258 | – |  | 
| 259 | – | if( haveNZconstraints() && index < getNZconstraints() ) | 
| 260 | – | zConstraints[index] = current_zConstraint; | 
| 261 | – | else{ | 
| 262 | – | if( haveNZconstraints() ){ | 
| 263 | – | sprintf( err, "meta-data parsing error: %d out of nZconstraints range", | 
| 264 | – | index ); | 
| 265 | – | the_event->err_msg = strdup( err ); | 
| 266 | – | return 0; | 
| 267 | – | } | 
| 268 | – | else{ | 
| 269 | – | the_event->err_msg = strdup("meta-data parsing error: nZconstraints" | 
| 270 | – | " not given before" | 
| 271 | – | " first zConstraint declaration." ); | 
| 272 | – | return 0; | 
| 273 | – | } | 
| 274 | – | } | 
| 139 |  |  | 
| 140 | < | return 1; | 
| 141 | < | } | 
| 142 | < |  | 
| 143 | < |  | 
| 144 | < |  | 
| 145 | < | int Globals::zConstraintAssign( event* the_event ){ | 
| 146 | < |  | 
| 147 | < | switch( the_event->evt.asmt.asmt_type ){ | 
| 140 | > | deprecatedKeywords_.insert("nComponents"); | 
| 141 | > | deprecatedKeywords_.insert("nZconstraints"); | 
| 142 | > | deprecatedKeywords_.insert("initialConfig"); | 
| 143 | > | deprecatedKeywords_.insert("thermIntDistSpringConst"); | 
| 144 | > | deprecatedKeywords_.insert("thermIntThetaSpringConst"); | 
| 145 | > | deprecatedKeywords_.insert("thermIntOmegaSpringConst"); | 
| 146 | > | deprecatedKeywords_.insert("useSolidThermInt"); | 
| 147 | > | deprecatedKeywords_.insert("useLiquidThermInt"); | 
| 148 |  |  | 
| 285 | – | case STRING: | 
| 286 | – | return current_zConstraint->assignString( the_event->evt.asmt.lhs, | 
| 287 | – | the_event->evt.asmt.rhs.sval, | 
| 288 | – | &(the_event->err_msg)); | 
| 289 | – | break; | 
| 290 | – |  | 
| 291 | – | case DOUBLE: | 
| 292 | – | return current_zConstraint->assignDouble( the_event->evt.asmt.lhs, | 
| 293 | – | the_event->evt.asmt.rhs.dval, | 
| 294 | – | &(the_event->err_msg)); | 
| 295 | – | break; | 
| 296 | – |  | 
| 297 | – | case INT: | 
| 298 | – | return current_zConstraint->assignInt( the_event->evt.asmt.lhs, | 
| 299 | – | the_event->evt.asmt.rhs.ival, | 
| 300 | – | &(the_event->err_msg)); | 
| 301 | – | break; | 
| 302 | – |  | 
| 303 | – | default: | 
| 304 | – | the_event->err_msg = strdup( "Globals error. Invalid zConstraint" | 
| 305 | – | " assignment type" ); | 
| 306 | – | return 0; | 
| 307 | – | break; | 
| 308 | – | } | 
| 309 | – | return 0; | 
| 149 |  | } | 
| 150 |  |  | 
| 151 | < | int Globals::zConstraintEnd( event* the_event ){ | 
| 152 | < |  | 
| 153 | < | the_event->err_msg = current_zConstraint->checkMe(); | 
| 154 | < | if( the_event->err_msg != NULL ) return 0; | 
| 316 | < |  | 
| 317 | < | return 1; | 
| 151 | > | Globals::~Globals() { | 
| 152 | > | MemoryUtils::deletePointers(components_); | 
| 153 | > | MemoryUtils::deletePointers(zconstraints_); | 
| 154 | > | MemoryUtils::deletePointers(restraints_); | 
| 155 |  | } | 
| 156 |  |  | 
| 157 | < | char* Globals::checkMe( void ){ | 
| 157 | > | void Globals::validate() { | 
| 158 | > | DataHolder::validate(); | 
| 159 |  |  | 
| 322 | – |  | 
| 323 | – | std::string err("The following required keywords are missing:\n"); | 
| 324 | – | short int have_err = 0; | 
| 325 | – |  | 
| 326 | – | ParamMap::iterator i; | 
| 327 | – | for (i = parameters_.begin(); i != parameters_.end(); ++i) { | 
| 328 | – | if (!i->second->isOptional() && i->second->empty()) { | 
| 329 | – | err +=  i->second->getKeyword() + "\n"; | 
| 330 | – | } | 
| 331 | – | } | 
| 332 | – |  | 
| 160 |  | CheckParameter(ForceField, isNotEmpty()); | 
| 334 | – | CheckParameter(NComponents,isPositive()); | 
| 161 |  | CheckParameter(TargetTemp, isPositive()); | 
| 162 | < | CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || | 
| 337 | < | isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))|| | 
| 338 | < | isEqualIgnoreCase(std::string("NPTxyz")) ); | 
| 339 | < |  | 
| 162 | > | 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")); | 
| 163 |  | CheckParameter(Dt, isPositive()); | 
| 164 |  | CheckParameter(RunTime, isPositive()); | 
| 342 | – | CheckParameter(InitialConfig, isNotEmpty()); | 
| 165 |  | CheckParameter(FinalConfig, isNotEmpty()); | 
| 344 | – | CheckParameter(NMol, isPositive()); | 
| 345 | – | CheckParameter(Density, isPositive()); | 
| 346 | – | CheckParameter(Box, isPositive()); | 
| 347 | – | CheckParameter(BoxX, isPositive()); | 
| 348 | – | CheckParameter(BoxY, isPositive()); | 
| 349 | – | CheckParameter(BoxZ, isPositive()); | 
| 166 |  | CheckParameter(SampleTime, isNonNegative()); | 
| 167 |  | CheckParameter(ResetTime, isNonNegative()); | 
| 168 |  | CheckParameter(StatusTime, isNonNegative()); | 
| 170 |  | CheckParameter(SwitchingRadius, isNonNegative()); | 
| 171 |  | CheckParameter(Dielectric, isPositive()); | 
| 172 |  | CheckParameter(ThermalTime,  isNonNegative()); | 
| 357 | – | CheckParameter(TargetPressure,  isPositive()); | 
| 173 |  | CheckParameter(TauThermostat, isPositive()); | 
| 174 |  | CheckParameter(TauBarostat, isPositive()); | 
| 175 |  | CheckParameter(ZconsTime, isPositive()); | 
| 361 | – | CheckParameter(NZconstraints, isPositive()); | 
| 176 |  | CheckParameter(ZconsTol, isPositive()); | 
| 363 | – | //CheckParameter(ZconsForcePolicy,); | 
| 177 |  | CheckParameter(Seed, isPositive()); | 
| 178 | < | CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG"))); | 
| 178 | > | CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG")); | 
| 179 |  | CheckParameter(MinimizerMaxIter, isPositive()); | 
| 180 | < | CheckParameter(MinimizerWriteFrq, isPositive()); | 
| 180 | > | CheckParameter(MinimizerWriteFreq, isPositive()); | 
| 181 |  | CheckParameter(MinimizerStepSize, isPositive()); | 
| 182 |  | CheckParameter(MinimizerFTol, isPositive()); | 
| 183 |  | CheckParameter(MinimizerGTol, isPositive()); | 
| 185 |  | CheckParameter(MinimizerLSMaxIter, isPositive()); | 
| 186 |  | CheckParameter(ZconsGap, isPositive()); | 
| 187 |  | CheckParameter(ZconsFixtime, isPositive()); | 
| 188 | < | CheckParameter(ThermodynamicIntegrationLambda, isPositive()); | 
| 188 | > | CheckParameter(ThermodynamicIntegrationLambda, isNonNegative()); | 
| 189 |  | CheckParameter(ThermodynamicIntegrationK, isPositive()); | 
| 190 |  | CheckParameter(ForceFieldVariant, isNotEmpty()); | 
| 191 |  | CheckParameter(ForceFieldFileName, isNotEmpty()); | 
| 192 | < | CheckParameter(ThermIntDistSpringConst, isPositive()); | 
| 193 | < | CheckParameter(ThermIntThetaSpringConst, isPositive()); | 
| 194 | < | CheckParameter(ThermIntOmegaSpringConst, isPositive()); | 
| 195 | < | CheckParameter(SurfaceTension, isPositive()); | 
| 383 | < | CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("UNDAMPED_WOLF")) || isEqualIgnoreCase(std::string("DAMPED_WOLF")) || isEqualIgnoreCase(std::string("REACTION_FIELD")) ); | 
| 384 | < | CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL"))); | 
| 192 | > | CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD")); | 
| 193 | > | CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED")); | 
| 194 | > | CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL")); | 
| 195 | > | CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL")); | 
| 196 |  | //CheckParameter(StatFileFormat,); | 
| 386 | – | //CheckParameter(MixingRule,); | 
| 197 |  | CheckParameter(OrthoBoxTolerance, isPositive()); | 
| 198 | < | CheckParameter(ThermIntDistSpringConst, isPositive()); | 
| 389 | < | CheckParameter(ThermIntThetaSpringConst, isPositive()); | 
| 390 | < | CheckParameter(ThermIntOmegaSpringConst, isPositive()); | 
| 391 | < | CheckParameter(DampingAlpha,isPositive()); | 
| 198 | > | CheckParameter(DampingAlpha,isNonNegative()); | 
| 199 |  | CheckParameter(SkinThickness, isPositive()); | 
| 200 | + | CheckParameter(Viscosity, isNonNegative()); | 
| 201 | + | CheckParameter(BeadSize, isPositive()); | 
| 202 | + | CheckParameter(FrozenBufferRadius, isPositive()); | 
| 203 | + | CheckParameter(LangevinBufferRadius, isPositive()); | 
| 204 | + | CheckParameter(NeighborListNeighbors, isPositive()); | 
| 205 | + | CheckParameter(RNEMD_exchangeTime, isPositive()); | 
| 206 | + | CheckParameter(RNEMD_nBins, isPositive() && isEven()); | 
| 207 | + | CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale")); | 
| 208 | + | CheckParameter(RNEMD_targetFlux, isNonNegative()); | 
| 209 | + | CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape")); | 
| 210 | + | CheckParameter(Alpha, isPositive()); | 
| 211 | + |  | 
| 212 |  |  | 
| 213 | < | //@todo memory leak | 
| 214 | < | if( have_err ) | 
| 215 | < | return strdup( err.c_str() ); | 
| 213 | > | for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) { | 
| 214 | > | if (!(*i)->findMoleculeStamp(moleculeStamps_)) { | 
| 215 | > | std::ostringstream oss; | 
| 216 | > | oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl; | 
| 217 | > | throw OpenMDException(oss.str()); | 
| 218 | > | } | 
| 219 | > | } | 
| 220 | > | } | 
| 221 |  |  | 
| 222 | < | return NULL; | 
| 222 | > | bool Globals::addComponent(Component* comp) { | 
| 223 | > | components_.push_back(comp); | 
| 224 | > | return true; | 
| 225 | > | } | 
| 226 |  |  | 
| 227 | + | bool Globals::addZConsStamp(ZConsStamp* zcons) { | 
| 228 | + | zconstraints_.push_back(zcons); | 
| 229 | + | return true; | 
| 230 | + | } | 
| 231 |  |  | 
| 232 | + | bool Globals::addRestraintStamp(RestraintStamp* rest) { | 
| 233 | + | restraints_.push_back(rest); | 
| 234 | + | return true; | 
| 235 |  | } | 
| 236 |  |  | 
| 237 | < | int Globals::globalEnd( event* the_event ){ | 
| 238 | < |  | 
| 239 | < | the_event->err_msg = checkMe(); | 
| 240 | < | if( the_event->err_msg != NULL ) return 0; | 
| 237 | > | bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) { | 
| 238 | > | std::string molStampName = molStamp->getName(); | 
| 239 | > | std::map<std::string, MoleculeStamp*>::iterator i; | 
| 240 | > | bool ret = false; | 
| 241 | > | i = moleculeStamps_.find(molStampName); | 
| 242 | > | if (i == moleculeStamps_.end()) { | 
| 243 | > | moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp)); | 
| 244 | > | ret = true; | 
| 245 | > | } else { | 
| 246 | > | std::ostringstream oss; | 
| 247 | > | oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n"; | 
| 248 | > | throw OpenMDException(oss.str()); | 
| 249 | > | } | 
| 250 | > | return ret; | 
| 251 | > | } | 
| 252 | > |  | 
| 253 |  |  | 
| 408 | – | return 1; | 
| 254 |  | } |