ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/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.
branches/development/src/brains/SimCreator.hpp (file contents), Revision 1613 by gezelter, Thu Aug 18 20:18:19 2011 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 >   *
64 >   * The only responsibility of SimCreator is to parse the meta-data
65 >   * file and create a SimInfo instance based on the information
66 >   * returned by parser.
67 >   */
68 >  class SimCreator {
69 >  public:
70  
71 < /**
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:
71 >    virtual ~SimCreator() {}
72  
73 <        virtual ~SimCreator() {}
74 <
75 <        /**
76 <         * Setup Simulation
77 <         * @return a pointer to SimInfo
78 <         * @param mdfile the meta-data file name
80 <         */
81 <        SimInfo* createSim(const std::string & mdFileName, bool loadInitCoords = true);
73 >    /**
74 >     * Setup Simulation
75 >     * @return a pointer to SimInfo
76 >     * @param mdfile the meta-data file name
77 >     */
78 >    SimInfo* createSim(const std::string & mdFileName, bool loadInitCoords = true);
79          
80 <    private:
80 >  private:
81          
82 <        /**
83 <         * Parses the meta-data file
84 <         * @param mdfile
85 <         * @param stamps
86 <         * @param simParams
87 <         */
91 <        void parseFile(const std::string mdFileName,  MakeStamps* stamps, Globals* simParams);
82 >    /**
83 >     * Parses the meta-data file
84 >     * @param mdfile
85 >     * @return simParams
86 >     */
87 >    Globals*  parseFile(std::istream& rawMetaData, const std::string& mdFileName, int mdFileVersion, int metaDataStartingLine);
88  
89  
90 <        /** create the molecules belong to current processor*/
91 <        virtual void createMolecules(SimInfo* info);
90 >    /** create the molecules belong to current processor*/
91 >    virtual void createMolecules(SimInfo* info);
92 >    
93 >    /**
94 >     * Sets the global index for atoms, rigidbodies and cutoff groups
95 >     * and fill up globalGroupMembership and globalMolMembership
96 >     * arrays which map atoms' global index to the global index of the
97 >     * groups (or molecules) they belong to.  These array are never
98 >     * changed during the simulation.
99 >     */
100 >    void setGlobalIndex(SimInfo* info);
101  
102 <        /**
98 <         * Sets the global index for atoms, rigidbodies and cutoff groups and fill up
99 <         * globalGroupMembership and globalMolMembership arrays which map atoms'
100 <         * global index to the global index of the groups (or molecules) they belong to.
101 <         * These array are never changed during the simulation.
102 <         */
103 <        void setGlobalIndex(SimInfo* info);
104 <
105 <        void gatherParameters(SimInfo *info, const std::string& mdfile);            
106 <
102 >    void gatherParameters(SimInfo *info, const std::string& mdfile);            
103          
104 <        /** Extracts the molecules stamps and adds them into SimInfo class */
105 <        void compList(MakeStamps* stamps,  Globals* simParams,
106 <                                     std::vector<std::pair<MoleculeStamp*, int> >& moleculeStamps) ;
111 <
112 <        /**
113 <         * Divide the molecules among the processors
114 <         */
104 >    /**
105 >     * Divide the molecules among the processors
106 >     */
107          
108 <        void divideMolecules(SimInfo* info);
108 >    void divideMolecules(SimInfo* info);
109  
110 <        /** Load initial coordinates */
111 <        void loadCoordinates(SimInfo* info);    
110 >    /** Load initial coordinates */
111 >    void loadCoordinates(SimInfo* info, const std::string& mdFileName);    
112  
113 <        std::string mdFileName_;  //save the meta-data file name which may be used later
122 < };
113 >    std::string mdFileName_;  //save the meta-data file name which may be used later
114  
115 < } //end namespace oopse
115 >  };
116 >
117 > } //end namespace OpenMD
118   #endif //BRAINS_SIMCREATOR_HPP
119  

Comparing:
trunk/src/brains/SimCreator.hpp (property svn:keywords), Revision 385 by tim, Tue Mar 1 20:10:14 2005 UTC vs.
branches/development/src/brains/SimCreator.hpp (property svn:keywords), Revision 1613 by gezelter, Thu Aug 18 20:18:19 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines