ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.hpp
(Generate patch)

Comparing trunk/src/io/Globals.hpp (file contents):
Revision 1367 by skuang, Mon Oct 19 13:35:42 2009 UTC vs.
Revision 1423 by gezelter, Tue Mar 30 15:05:13 2010 UTC

# Line 1 | Line 1
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.
# 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   #ifndef IO_GLOBALS_HPP
# Line 55 | Line 55
55   #include "types/MoleculeStamp.hpp"
56   #include "utils/ParameterManager.hpp"
57  
58 < namespace oopse {
58 > namespace OpenMD {
59    class Globals : public DataHolder {
60    public:
61      typedef std::pair<int, int> intPair;
# Line 90 | Line 90 | namespace oopse {
90      DeclareParameter(OrthoBoxTolerance, RealType);
91      DeclareParameter(Minimizer, std::string);
92      DeclareParameter(MinimizerMaxIter, RealType);
93 <    DeclareParameter(MinimizerWriteFrq, int);
93 >    DeclareParameter(MinimizerWriteFreq, int);
94      DeclareParameter(MinimizerStepSize, RealType);
95      DeclareParameter(MinimizerFTol, RealType);
96      DeclareParameter(MinimizerGTol, RealType);
# Line 121 | Line 121 | namespace oopse {
121      DeclareParameter(HydroPropFile, std::string);
122      DeclareParameter(Viscosity, RealType);
123      DeclareParameter(BeadSize, RealType);  
124 –    DeclareParameter(ThermalConductivity, RealType);
125 –    DeclareParameter(ThermalLength, RealType);
124      DeclareParameter(UseSphericalBoundaryConditions, bool);
125      DeclareParameter(FrozenBufferRadius, RealType);
126      DeclareParameter(LangevinBufferRadius, RealType);
# Line 143 | Line 141 | namespace oopse {
141      DeclareParameter(RNEMD_targetFlux, RealType);
142      DeclareParameter(UseRestraints, bool);
143      DeclareParameter(Restraint_file, std::string);
144 +    DeclareParameter(HULL_Method, std::string);
145 +    DeclareParameter(Alpha, RealType);
146      
147    public:
148      bool addComponent(Component* comp);

Diff Legend

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