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 892 by tim, Thu Feb 23 23:16:43 2006 UTC vs.
branches/development/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 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   /**
# Line 54 | Line 54
54   #include <iostream>
55   #include "utils/any.hpp"
56  
57 < namespace oopse {
57 > namespace OpenMD {
58  
59    //forward declaration
60    class HydrodynamicsModel;
61    class HydrodynamicsModelCreator;
62    class StuntDouble;
63 <  typedef std::map<std::string, boost::any> DynamicProperty;  
63 >  class SimInfo;
64  
65    /**
66     * @class HydrodynamicsModelFactory HydrodynamicsModelFactory.hpp "UseTheForce/HydrodynamicsModelFactory.hpp"
# Line 111 | Line 111 | namespace oopse {
111       * creating this concrete object
112       * @param id the identification of the concrete object
113       */
114 <    HydrodynamicsModel* createHydrodynamicsModel(const std::string& id, StuntDouble* sd, const DynamicProperty& param);
114 >    HydrodynamicsModel* createHydrodynamicsModel(const std::string& id, StuntDouble* sd, SimInfo* info);
115  
116      /**
117       *  Returns all of the registed  type identifiers
# Line 128 | Line 128 | namespace oopse {
128    /** write out all of the type identifiers to an output stream */
129    std::ostream& operator <<(std::ostream& o, HydrodynamicsModelFactory& factory);
130  
131 < }//namespace oopse
131 > }//namespace OpenMD
132   #endif //INTEGRATORS_INTEGRATORFACTORY_HPP
133  

Comparing:
trunk/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (property svn:keywords), Revision 892 by tim, Thu Feb 23 23:16:43 2006 UTC vs.
branches/development/src/applications/hydrodynamics/HydrodynamicsModelFactory.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines