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

Comparing trunk/src/lattice/LatticeCreator.hpp (file contents):
Revision 482 by gezelter, Tue Apr 12 21:27:33 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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 LATTICE_LATTICECREATOR_HPP
42 > #ifndef LATTICE_LATTICECREATOR_HPP
43   #define LATTICE_LATTICECREATOR_HPP
44 +
45   #include <string>
45 #include "lattice/BaseLattice.hpp"
46  
47 + namespace OpenMD {
48  
49 < namespace oopse {
49 >  class Lattice;
50  
51 < class BaseLatticeCreator{
51 >  /**
52 >   * @class Lattice
53 >   * @todo document
54 >   */
55 >  class LatticeCreator {
56    public:
57 <    virtual BaseLattice* createLattice() = 0;
58 <    const std::string& getType() {return latticeType;}
59 <    
60 <  protected:
61 <    BaseLatticeCreator(const std::string& latType);
57 >    LatticeCreator(const std::string& ident) : ident_(ident) {}
58 >    virtual ~LatticeCreator() {}
59 >        
60 >    const std::string& getIdent() const { return ident_; }
61 >
62 >    virtual Lattice* create() const = 0;
63 >            
64    private:
65 <     std::string latticeType;
66 < };
65 >    std::string ident_;
66 >  };
67  
68 < template<class LatticeClass>
69 < class LatticeCreator : public BaseLatticeCreator
70 < {
71 < public:
72 <        LatticeCreator(const std::string& latticeType): BaseLatticeCreator(latticeType) {}
73 <        virtual BaseLattice* createLattice()  { return new LatticeClass();}
74 < };
68 >  /**
69 >   * @class LatticeBuilder
70 >   * @todo document
71 >   */
72 >  template<class ConcreteLattice>
73 >  class LatticeBuilder : public LatticeCreator {
74 >  public:
75 >    LatticeBuilder(const std::string& ident) : LatticeCreator(ident) {}
76 >    virtual  Lattice* create() const {return new ConcreteLattice();}
77 >  };
78  
79   }
80 < #endif
80 >
81 > #endif //USETHEFORCE_FORCEFIELDCREATOR_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines