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

Comparing trunk/src/applications/hydrodynamics/CompositeShape.hpp (file contents):
Revision 906 by tim, Fri Mar 17 23:20:35 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  
42   #ifndef APPLICATION_HYDRODYNAMICS_COMPOSITESHAPE_HPP
43   #define APPLICATION_HYDRODYNAMICS_COMPOSITESHAPE_HPP
44 < #include "applications/hydrodynamics/Shape.hpp"
44 > #include "hydrodynamics/Shape.hpp"
45   #include <vector>
46 < namespace oopse {
47 < /**
48 < * @class CompositexShape
49 < * Combine composite pattern and visitor pattern
50 < */
51 < class CompositeShape : public Shape {
52 <
53 <    public:
54 <        CompositeShape() {}
55 <        virtual ~CompositeShape();
56 <        virtual bool isInterior(Vector3d pos);
57 <        virtual std::pair<Vector3d, Vector3d> getBox();
58 <        virtual bool hasAnalyticalSolution() { return false;}
59 <       virtual bool calcHydroProps(HydrodynamicsModel* model, double viscosity, double temperature);
60 <        void addShape(Shape* s) {shapes_.push_back(s);}
61 <
62 <    private:
63 <
64 <        std::vector<Shape*> shapes_;        
65 <
46 > namespace OpenMD {
47 >  /**
48 >   * @class CompositeShape
49 >   * Combine composite pattern and visitor pattern
50 >   */
51 >  class CompositeShape : public Shape {
52 >    
53 >  public:
54 >    CompositeShape() {}
55 >    virtual ~CompositeShape();
56 >    virtual bool isInterior(Vector3d pos);
57 >    virtual std::pair<Vector3d, Vector3d> getBoundingBox();
58 >    virtual bool hasAnalyticalSolution() { return false;}
59 >    virtual HydroProp* getHydroProp(RealType viscosity, RealType temperature);
60 >    void addShape(Shape* s) {shapes_.push_back(s);}
61 >    
62 >  private:
63 >    
64 >    std::vector<Shape*> shapes_;      
65   };
66  
67   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines