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 1331 by gezelter, Thu Apr 2 16:04:52 2009 UTC vs.
Revision 1398 by gezelter, Tue Dec 8 22:17:02 2009 UTC

# Line 6 | Line 6
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.
# Line 37 | Line 28
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>
# Line 49 | Line 49
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  
# Line 88 | Line 88 | Globals::Globals() {
88    DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89    DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91 –  DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
92 –  DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
93 –  DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
91    DefineOptionalParameter(SurfaceTension, "surfaceTension");
92    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
# Line 117 | Line 114 | Globals::Globals() {
114    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
115    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
116    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
120 –  DefineOptionalParameterWithDefaultValue(UseSolidThermInt, "useSolidThermInt", false);
121 –  DefineOptionalParameterWithDefaultValue(UseLiquidThermInt, "useLiquidThermInt", false);
122 –  DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
123 –  DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
124 –  DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
117    DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
118    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
# Line 133 | Line 125 | Globals::Globals() {
125    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
126  
127    DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
128 <  DefineOptionalParameterWithDefaultValue(RNEMD_swapTime, "RNEMD_swapTime", 100.0);
129 <  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 15);
130 <  DefineOptionalParameterWithDefaultValue(RNEMD_swapType, "RNEMD_swapType", "Kinetic");
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 <  
134 >  DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
135 >  DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
136 >  DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
137  
138 +
139    deprecatedKeywords_.insert("nComponents");
140    deprecatedKeywords_.insert("nZconstraints");
141    deprecatedKeywords_.insert("initialConfig");
142 +  deprecatedKeywords_.insert("thermIntDistSpringConst");
143 +  deprecatedKeywords_.insert("thermIntThetaSpringConst");
144 +  deprecatedKeywords_.insert("thermIntOmegaSpringConst");
145 +  deprecatedKeywords_.insert("useSolidThermInt");  
146 +  deprecatedKeywords_.insert("useLiquidThermInt");
147      
148   }
149  
150   Globals::~Globals() {
151      MemoryUtils::deletePointers(components_);
152      MemoryUtils::deletePointers(zconstraints_);
153 +    MemoryUtils::deletePointers(restraints_);
154   }
155  
156   void Globals::validate() {
# Line 185 | Line 188 | void Globals::validate() {
188    CheckParameter(ThermodynamicIntegrationK, isPositive());
189    CheckParameter(ForceFieldVariant, isNotEmpty());
190    CheckParameter(ForceFieldFileName, isNotEmpty());
188 –  CheckParameter(ThermIntDistSpringConst, isPositive());
189 –  CheckParameter(ThermIntThetaSpringConst, isPositive());
190 –  CheckParameter(ThermIntOmegaSpringConst, isPositive());
191    CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
192    CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
193    CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
194    CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
195    //CheckParameter(StatFileFormat,);    
196    CheckParameter(OrthoBoxTolerance, isPositive());  
197 –  CheckParameter(ThermIntDistSpringConst, isPositive());
198 –  CheckParameter(ThermIntThetaSpringConst, isPositive());
199 –  CheckParameter(ThermIntOmegaSpringConst, isPositive());
197    CheckParameter(DampingAlpha,isNonNegative());
198    CheckParameter(SkinThickness, isPositive());
199    CheckParameter(Viscosity, isNonNegative());
# Line 204 | Line 201 | void Globals::validate() {
201    CheckParameter(FrozenBufferRadius, isPositive());
202    CheckParameter(LangevinBufferRadius, isPositive());
203    CheckParameter(NeighborListNeighbors, isPositive());
204 <  CheckParameter(RNEMD_swapTime, isPositive());
205 <  CheckParameter(RNEMD_nBins, isPositive());
206 <  CheckParameter(RNEMD_swapType, isEqualIgnoreCase("Kinetic") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz"));
204 >  CheckParameter(RNEMD_exchangeTime, isPositive());
205 >  CheckParameter(RNEMD_nBins, isPositive() && isEven());
206 >  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
207 >  CheckParameter(RNEMD_targetFlux, isNonNegative());
208  
209    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
210      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
211          std::ostringstream oss;
212          oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
213 <        throw OOPSEException(oss.str());          
213 >        throw OpenMDException(oss.str());          
214      }
215    }
216   }
217 <    
217 >  
218   bool Globals::addComponent(Component* comp) {
219      components_.push_back(comp);
220      return true;
# Line 227 | Line 225 | bool Globals::addZConsStamp(ZConsStamp* zcons) {
225      return true;
226   }
227  
228 + bool Globals::addRestraintStamp(RestraintStamp* rest) {
229 +    restraints_.push_back(rest);
230 +    return true;
231 + }
232 +
233   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
234      std::string molStampName = molStamp->getName();
235      std::map<std::string, MoleculeStamp*>::iterator i;
# Line 238 | Line 241 | bool Globals::addMoleculeStamp(MoleculeStamp* molStamp
241      } else {
242          std::ostringstream oss;
243          oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
244 <        throw OOPSEException(oss.str());  
244 >        throw OpenMDException(oss.str());  
245      }
246      return ret;
247   }

Diff Legend

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