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

Comparing branches/development/src/brains/SimCreator.hpp (file contents):
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC vs.
Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

# Line 36 | Line 36
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).                        
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   /**
44 < * @file SimCreatorr.hpp
44 > * @file SimCreator.hpp
45   * @author tlin
46   * @date 11/02/2004
47   * @time 12:126am
# Line 54 | Line 55
55   #include "primitives/Molecule.hpp"
56   #include "brains/SimInfo.hpp"
57   #include "io/Globals.hpp"
58 < #include "UseTheForce/ForceField.hpp"
58 > #include "brains/ForceField.hpp"
59  
60   namespace OpenMD {
61  
# Line 84 | Line 85 | namespace OpenMD {
85       * @param mdfile
86       * @return simParams
87       */
88 <    Globals*  parseFile(std::istream& rawMetaData, const std::string& mdFileName, int metaDataStartingLine);
88 >    Globals*  parseFile(std::istream& rawMetaData, const std::string& mdFileName, int mdFileVersion, int metaDataStartingLine);
89  
90  
91      /** create the molecules belong to current processor*/
92      virtual void createMolecules(SimInfo* info);
93 +
94 +    /**
95 +     * Figure out the data storage layout based on what kinds of
96 +     * objects are being simulated
97 +     */
98 +    int computeStorageLayout(SimInfo* info);
99      
100      /**
101       * Sets the global index for atoms, rigidbodies and cutoff groups

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines