ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/hydrodynamics/HydrodynamicsModel.hpp
(Generate patch)

Comparing trunk/src/applications/hydrodynamics/HydrodynamicsModel.hpp (file contents):
Revision 891 by tim, Wed Feb 22 20:35:16 2006 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   #ifndef APPLICATION_HYDRODYNAMICS_HYDRODYNAMICSMODEL_HPP
42   #define APPLICATION_HYDRODYNAMICS_HYDRODYNAMICSMODEL_HPP
# Line 46 | Line 46
46   #include "math/SquareMatrix3.hpp"
47   #include "math/DynamicRectMatrix.hpp"
48   #include "primitives/Molecule.hpp"
49 < #include "applications/hydrodynamics/MoleculeShape.hpp"
50 < #include "utils/any.hpp"
51 < namespace oopse {
52 < struct HydrodynamicProps {
53 <    Vector3d diffCenter;
54 <    Mat3x3d transDiff;
55 <    Mat3x3d rotDiff;
56 <    Mat3x3d transRotDiff;
57 < };
49 > #include "hydrodynamics/HydroProp.hpp"
50 > #include "utils/PhysicalConstants.hpp"
51  
52 < struct BeadParam {
52 > namespace OpenMD {
53 >  
54 >  struct BeadParam {
55      std::string atomName;
56      Vector3d pos;
57 <    double radius;
58 < };
57 >    RealType radius;
58 >  };
59 >  
60 >  class Shape;
61 >  class Sphere;
62 >  class Ellipsoid;
63 >  class CompositeShape;
64 >  
65 >  class HydrodynamicsModel {
66 >  public:
67 >    HydrodynamicsModel(StuntDouble* sd, SimInfo* info) : sd_(sd), info_(info) {}
68 >    virtual ~HydrodynamicsModel() {}
69  
70 < typedef std::map<std::string, boost::any> DynamicProperty;
71 <
72 < class HydrodynamicsModel {
73 <    public:
74 <        HydrodynamicsModel(Molecule* mol, const DynamicProperty& extraParams) : mol_(mol) {}
75 <        bool calcHydrodyanmicsProps(double eta);
76 <
77 <        Vector3d getDiffCenter();
78 <        Mat3x3d getTransDiff();
79 <        Mat3x3d getRotDiff();
80 <        Mat3x3d getTransRotDiff();
81 <        void writeBeads(std::ostream& os);
82 <        void writeDiffCenterAndDiffTensor(std::ostream& os);
83 <    protected:
84 <        Molecule* mol_;
85 <    private:
86 <        virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
87 <
88 <
89 <        HydrodynamicProps props_;
85 <        std::vector<BeadParam> beads_;
86 <        
87 < };
88 <
89 <
70 >    virtual bool calcHydroProps(Shape* shape, RealType viscosity, RealType temperature);
71 >    
72 >    virtual void init() {};
73 >    virtual void writeBeads(std::ostream& os) = 0;
74 >    void writeHydroProps(std::ostream& os);
75 >    HydroProp* getHydroPropsAtCR() {return cr_;}
76 >    HydroProp* getHydroPropsAtCD() {return cd_;}
77 >    
78 >    void setCR(HydroProp* cr) {cr_ = cr;}
79 >    void setCD(HydroProp* cd) {cd_ = cd;}
80 >    std::string getStuntDoubleName() { return sd_->getType();}
81 >  protected:
82 >    StuntDouble* sd_;
83 >    SimInfo* info_;
84 >  private:
85 >    HydroProp* cr_;
86 >    HydroProp* cd_;
87 >    std::vector<BeadParam> beads_;
88 >  };
89 >  
90   }
91  
92   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines