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

Comparing:
trunk/src/hydrodynamics/Sphere.cpp (file contents), Revision 956 by gezelter, Tue May 16 02:06:37 2006 UTC vs.
branches/development/src/hydrodynamics/Sphere.cpp (file contents), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 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, 234107 (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 "hydrodynamics/Sphere.hpp"
44 < #include "utils/OOPSEConstant.hpp"
44 > #include "utils/PhysicalConstants.hpp"
45   #include "math/LU.hpp"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48    
49 <  Sphere::Sphere(Vector3d origin, double radius) : origin_(origin), radius_(radius){
49 >  Sphere::Sphere(Vector3d origin, RealType radius) : origin_(origin), radius_(radius){
50      
51    }
52    
# Line 69 | Line 70 | namespace oopse {
70      return boundary;
71    }
72    
73 <  HydroProps Sphere::getHydroProps(double viscosity, double temperature) {
73 <    HydroProps props;
74 <    props.center =V3Zero;
75 <    double Xitt  = 6.0 * NumericConstant::PI * viscosity * radius_;
76 <    double Xirr = 8.0 * NumericConstant::PI * viscosity * radius_ * radius_ * radius_;
77 <    props.Xi(0, 0) = Xitt;
78 <    props.Xi(1, 1) = Xitt;
79 <    props.Xi(2, 2) = Xitt;
80 <    props.Xi(3, 3) = Xirr;
81 <    props.Xi(4, 4) = Xirr;
82 <    props.Xi(5, 5) = Xirr;
73 >  HydroProp* Sphere::getHydroProp(RealType viscosity, RealType temperature) {
74      
75 <    const double convertConstant = 6.023; //convert poise.angstrom to amu/fs
76 <    props.Xi *= convertConstant;
77 <    Mat6x6d XiCopy = props.Xi;
78 <    invertMatrix(XiCopy, props.D);
79 <    double kt = OOPSEConstant::kB * temperature;
80 <    props.D *= kt;
81 <    props.Xi *= OOPSEConstant::kb * temperature;
75 >    RealType Xitt  = 6.0 * NumericConstant::PI * viscosity * radius_;
76 >    RealType Xirr = 8.0 * NumericConstant::PI * viscosity * radius_ * radius_ * radius_;
77 >
78 >    Mat6x6d Xi, XiCopy, D;
79 >
80 >    Xi(0, 0) = Xitt;
81 >    Xi(1, 1) = Xitt;
82 >    Xi(2, 2) = Xitt;
83 >    Xi(3, 3) = Xirr;
84 >    Xi(4, 4) = Xirr;
85 >    Xi(5, 5) = Xirr;
86      
87 <    return props;
87 >    Xi *= PhysicalConstants::viscoConvert;
88 >    XiCopy = Xi;
89 >
90 >    invertMatrix(XiCopy, D);
91 >    RealType kt = PhysicalConstants::kb * temperature; // in kcal mol^-1
92 >    D *= kt;  // now in angstroms^2 fs^-1  (at least for Trans-trans)
93 >
94 >    HydroProp* hprop = new HydroProp(V3Zero, Xi, D);
95 >    
96 >    return hprop;
97    }
98    
99   }

Comparing:
trunk/src/hydrodynamics/Sphere.cpp (property svn:keywords), Revision 956 by gezelter, Tue May 16 02:06:37 2006 UTC vs.
branches/development/src/hydrodynamics/Sphere.cpp (property svn:keywords), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines