| 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 |  | #ifndef HYDRODYNAMICS_ELLIPSOID_HPP | 
| 43 |  | #define HYDRODYNAMICS_ELLIPSOID_HPP | 
| 44 |  | #include "hydrodynamics/Shape.hpp" | 
| 45 |  | #include "math/SquareMatrix3.hpp" | 
| 46 | < | namespace oopse { | 
| 46 | > | namespace OpenMD { | 
| 47 |  |  | 
| 48 | < | /** @class Ellipsoid */ | 
| 48 | > | /** @class Ellipsoid | 
| 49 | > | * | 
| 50 | > | * An ellipsoid in OpenMD is restricted to having two equal | 
| 51 | > | * equatorial semi-axes.  OpenMD treats the "special" axis as the | 
| 52 | > | * z-coordinate in the body fixed reference frame.  That is: | 
| 53 | > | * | 
| 54 | > | *   z^2 / a^2  +  (x^2 + y^2) / b^2   = 1 | 
| 55 | > | * | 
| 56 | > | * If a >= b, the ellipsoid is a prolate spheroid, and if a < b, | 
| 57 | > | * the ellipsoid is oblate.  Ellipsoids are specified in the constructor | 
| 58 | > | * using an axial length (a), and a equatorial length (b).  A Vector3d | 
| 59 | > | * can be used to position the center of the ellipsoid, and a rotation | 
| 60 | > | * matrix can also be used to orient the ellipsoid to a preferred lab-fixed | 
| 61 | > | * coordinate frame. | 
| 62 | > | */ | 
| 63 |  | class Ellipsoid : public Shape{ | 
| 64 |  | public: | 
| 65 | < | Ellipsoid(Vector3d origin, RealType rMajor, RealType rMinor, Mat3x3d rotMat); | 
| 65 | > | Ellipsoid(Vector3d origin, RealType rAxial, RealType rEquatorial, Mat3x3d rotMat); | 
| 66 |  | virtual bool isInterior(Vector3d pos); | 
| 67 |  | virtual std::pair<Vector3d, Vector3d> getBoundingBox(); | 
| 68 |  | virtual bool hasAnalyticalSolution() {return true;} | 
| 69 |  |  | 
| 70 |  | virtual HydroProp* getHydroProp(RealType viscosity, RealType temperature); | 
| 71 |  |  | 
| 72 | < |  | 
| 72 | > | RealType getRAxial() {return rAxial_;} | 
| 73 | > | RealType getREquatorial() {return rEquatorial_;} | 
| 74 |  | RealType getRMajor() {return rMajor_;} | 
| 75 |  | RealType getRMinor() {return rMinor_;} | 
| 76 |  |  | 
| 77 |  | private: | 
| 78 |  |  | 
| 79 |  | Vector3d origin_; | 
| 80 | + | RealType rAxial_; | 
| 81 | + | RealType rEquatorial_; | 
| 82 |  | RealType rMajor_; | 
| 83 |  | RealType rMinor_; | 
| 84 |  | Mat3x3d rotMat_; |