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

Comparing:
trunk/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (file contents), Revision 891 by tim, Wed Feb 22 20:35:16 2006 UTC vs.
branches/development/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (file contents), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 54 | Line 55
55   #include <iostream>
56   #include "utils/any.hpp"
57  
58 < namespace oopse {
58 > namespace OpenMD {
59  
60    //forward declaration
61    class HydrodynamicsModel;
62    class HydrodynamicsModelCreator;
63 <  class Molecule;
64 <  typedef std::map<std::string, boost::any> DynamicProperty;  
63 >  class StuntDouble;
64 >  class SimInfo;
65  
66    /**
67 <   * @class HydrodynamicsModelFactory HydrodynamicsModelFactory.hpp "UseTheForce/HydrodynamicsModelFactory.hpp"
67 >   * @class HydrodynamicsModelFactory
68     * Factory pattern and Singleton Pattern are used to define an interface for creating an HydrodynamicsModel.
69     */
70    class HydrodynamicsModelFactory {
# Line 91 | Line 92 | namespace oopse {
92      /**
93       * Registers a creator with a type identifier
94       * @return true if registration is successful, otherwise return false
95 <     * @id the identification of the concrete object
95 <     * @creator the object responsible to create the concrete object
95 >     * @param creator the object responsible to create the concrete object
96       */
97      bool registerHydrodynamicsModel(HydrodynamicsModelCreator* creator);
98  
# Line 101 | Line 101 | namespace oopse {
101       * was previously registered, the function returns true.
102       * @return truethe type identifier was previously registered and the creator is removed,
103       * otherwise return false
104 <     * @id the identification of the concrete object
104 >     * @param id the identification of the concrete object
105       */
106      bool unregisterHydrodynamicsModel(const std::string& id);
107      /**
# Line 110 | Line 110 | namespace oopse {
110       * @return a pointer of the concrete object, return NULL if no creator is registed for
111       * creating this concrete object
112       * @param id the identification of the concrete object
113 +     * @param sd a pointer to the StuntDouble being modeled
114 +     * @param info a pointer to the SimInfo object
115       */
116 <    HydrodynamicsModel* createHydrodynamicsModel(const std::string& id, Molecule* mol, const DynamicProperty& param);
116 >    HydrodynamicsModel* createHydrodynamicsModel(const std::string& id, StuntDouble* sd, SimInfo* info);
117  
118      /**
119       *  Returns all of the registed  type identifiers
# Line 128 | Line 130 | namespace oopse {
130    /** write out all of the type identifiers to an output stream */
131    std::ostream& operator <<(std::ostream& o, HydrodynamicsModelFactory& factory);
132  
133 < }//namespace oopse
133 > }//namespace OpenMD
134   #endif //INTEGRATORS_INTEGRATORFACTORY_HPP
135  

Comparing:
trunk/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (property svn:keywords), Revision 891 by tim, Wed Feb 22 20:35:16 2006 UTC vs.
branches/development/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (property svn:keywords), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines