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

Comparing trunk/src/applications/hydrodynamics/BeadModel.hpp (file contents):
Revision 898 by tim, Wed Mar 15 15:51:44 2006 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 7 | Line 7
7   * redistribute this software in source and binary code form, provided
8   * that the following conditions are met:
9   *
10 < * 1. Acknowledgement of the program authors must be made in any
11 < *    publication of scientific results based in part on use of the
12 < *    program.  An acceptable form of acknowledgement is citation of
13 < *    the article in which the program was described (Matthew
14 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
15 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
16 < *    Parallel Simulation Engine for Molecular Dynamics,"
17 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
18 < *
19 < * 2. Redistributions of source code must retain the above copyright
10 > * 1. Redistributions of source code must retain the above copyright
11   *    notice, this list of conditions and the following disclaimer.
12   *
13 < * 3. Redistributions in binary form must reproduce the above copyright
13 > * 2. Redistributions in binary form must reproduce the above copyright
14   *    notice, this list of conditions and the following disclaimer in the
15   *    documentation and/or other materials provided with the
16   *    distribution.
# Line 38 | Line 29
29   * arising out of the use of or inability to use software, even if the
30   * University of Notre Dame has been advised of the possibility of
31   * such damages.
32 + *
33 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
34 + * research, please cite the appropriate papers when you publish your
35 + * work.  Good starting points are:
36 + *                                                                      
37 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
38 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
39 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
40 + * [4]  Vardeman & Gezelter, in progress (2009).                        
41   */
42   #ifndef APPLICATION_HYDRODYNAMICS_BEADMODEL_HPP
43   #define APPLICATION_HYDRODYNAMICS_BEADMODEL_HPP
44  
45 < #include "applications/hydrodynamics/HydrodynamicsModel.hpp"
45 > #include "applications/hydrodynamics/ApproximationModel.hpp"
46 > #include "utils/ElementsTable.hpp"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50 < class BeadModel : public HydrodynamicsModel {
50 > class BeadModel : public ApproximationModel {
51      public:
52 <        BeadModel(StuntDouble* sd, const DynamicProperty& extraParams) : HydrodynamicsModel(sd, extraParams) {}
52 >        BeadModel(StuntDouble* sd, SimInfo* info) : ApproximationModel(sd, info) {}
53      private:
54          virtual bool createBeads(std::vector<BeadParam>& beads);
55          bool createSingleBead(Atom* atom, std::vector<BeadParam>& beads);        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines