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

Comparing trunk/src/brains/SimCreator.hpp (file contents):
Revision 385 by tim, Tue Mar 1 20:10:14 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 < /**
43 <  * @file SimCreatorr.hpp
44 <  * @author tlin
45 <  * @date 11/02/2004
46 <  * @time 12:126am
47 <  * @version 1.0
48 <  */
42 > /**
43 > * @file SimCreatorr.hpp
44 > * @author tlin
45 > * @date 11/02/2004
46 > * @time 12:126am
47 > * @version 1.0
48 > */
49  
50   #ifndef BRAINS_SIMCREATOR_HPP
51   #define BRAINS_SIMCREATOR_HPP
52  
53 <
53 > #include <iostream>
54   #include "primitives/Molecule.hpp"
55   #include "brains/SimInfo.hpp"
56 #include "types/MakeStamps.hpp"
56   #include "io/Globals.hpp"
57   #include "UseTheForce/ForceField.hpp"
58  
59 < // this routine is defined in BASS_interface.cpp
61 < //another OOPS
62 < extern void set_interface_stamps( MakeStamps* ms, Globals* g );
59 > namespace OpenMD {
60  
61 < namespace oopse {
61 >  /**
62 >   * @class SimCreator SimCreator.hpp "brains/SimCreator.hpp"
63 >   * The only responsibility of SimCreator is to parse the meta-data file and create a SimInfo
64 >   * instance based on the information returned by parser.
65 >   */
66 >  class SimCreator {
67 >  public:
68  
69 < /**
67 < * @class SimCreator SimCreator.hpp "brains/SimCreator.hpp"
68 < * The only responsibility of SimCreator is to parse the meta-data file and create a SimInfo
69 < * instance based on the information returned by parser.
70 < */
71 < class SimCreator {
72 <    public:
69 >    virtual ~SimCreator() {}
70  
71 <        virtual ~SimCreator() {}
72 <
73 <        /**
74 <         * Setup Simulation
75 <         * @return a pointer to SimInfo
76 <         * @param mdfile the meta-data file name
80 <         */
81 <        SimInfo* createSim(const std::string & mdFileName, bool loadInitCoords = true);
71 >    /**
72 >     * Setup Simulation
73 >     * @return a pointer to SimInfo
74 >     * @param mdfile the meta-data file name
75 >     */
76 >    SimInfo* createSim(const std::string & mdFileName, bool loadInitCoords = true);
77          
78 <    private:
78 >  private:
79          
80 <        /**
81 <         * Parses the meta-data file
82 <         * @param mdfile
83 <         * @param stamps
84 <         * @param simParams
85 <         */
91 <        void parseFile(const std::string mdFileName,  MakeStamps* stamps, Globals* simParams);
80 >    /**
81 >     * Parses the meta-data file
82 >     * @param mdfile
83 >     * @return simParams
84 >     */
85 >    Globals*  parseFile(std::istream& rawMetaData, const std::string& mdFileName, int metaDataStartingLine);
86  
87  
88 <        /** create the molecules belong to current processor*/
89 <        virtual void createMolecules(SimInfo* info);
88 >    /** create the molecules belong to current processor*/
89 >    virtual void createMolecules(SimInfo* info);
90  
91 <        /**
92 <         * Sets the global index for atoms, rigidbodies and cutoff groups and fill up
93 <         * globalGroupMembership and globalMolMembership arrays which map atoms'
94 <         * global index to the global index of the groups (or molecules) they belong to.
95 <         * These array are never changed during the simulation.
96 <         */
97 <        void setGlobalIndex(SimInfo* info);
91 >    /**
92 >     * Sets the global index for atoms, rigidbodies and cutoff groups and fill up
93 >     * globalGroupMembership and globalMolMembership arrays which map atoms'
94 >     * global index to the global index of the groups (or molecules) they belong to.
95 >     * These array are never changed during the simulation.
96 >     */
97 >    void setGlobalIndex(SimInfo* info);
98  
99 <        void gatherParameters(SimInfo *info, const std::string& mdfile);            
106 <
99 >    void gatherParameters(SimInfo *info, const std::string& mdfile);            
100          
101 <        /** Extracts the molecules stamps and adds them into SimInfo class */
102 <        void compList(MakeStamps* stamps,  Globals* simParams,
103 <                                     std::vector<std::pair<MoleculeStamp*, int> >& moleculeStamps) ;
111 <
112 <        /**
113 <         * Divide the molecules among the processors
114 <         */
101 >    /**
102 >     * Divide the molecules among the processors
103 >     */
104          
105 <        void divideMolecules(SimInfo* info);
105 >    void divideMolecules(SimInfo* info);
106  
107 <        /** Load initial coordinates */
108 <        void loadCoordinates(SimInfo* info);    
107 >    /** Load initial coordinates */
108 >    void loadCoordinates(SimInfo* info, const std::string& mdFileName);    
109  
110 <        std::string mdFileName_;  //save the meta-data file name which may be used later
111 < };
110 >    std::string mdFileName_;  //save the meta-data file name which may be used later
111 >  };
112  
113 < } //end namespace oopse
113 > } //end namespace OpenMD
114   #endif //BRAINS_SIMCREATOR_HPP
115  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines