ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/hydrodynamics/Ellipsoid.cpp
(Generate patch)

Comparing trunk/src/hydrodynamics/Ellipsoid.cpp (file contents):
Revision 1184 by xsun, Fri Oct 5 19:01:12 2007 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 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 "hydrodynamics/Ellipsoid.hpp"
43 < #include "utils/OOPSEConstant.hpp"
43 > #include "utils/PhysicalConstants.hpp"
44   #include "math/LU.hpp"
45  
46 < namespace oopse {
46 > namespace OpenMD {
47    
48    Ellipsoid::Ellipsoid(Vector3d origin, RealType rAxial, RealType rEquatorial,
49                         Mat3x3d rotMat) : origin_(origin), rAxial_(rAxial),
# Line 120 | Line 120 | namespace oopse {
120      Xi(4,4) = XirrB;
121      Xi(5,5) = XirrA;
122  
123 <    const RealType convertConstant = 1.439326479e4; // converts Poise angstroms
124 <                                                    // to kcal fs mol^-1 Angstrom^-1
125 <
126 <    Xi *= convertConstant;    
123 >    Xi *= PhysicalConstants::viscoConvert;    
124      
125      XiCopy = Xi;
126      invertMatrix(XiCopy, D);
127 <    RealType kt = OOPSEConstant::kb * temperature; // in kcal mol^-1
127 >    RealType kt = PhysicalConstants::kb * temperature; // in kcal mol^-1
128      D *= kt;
129    
130      HydroProp* hprop = new HydroProp(V3Zero, Xi, D);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines