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

Comparing branches/development/src/brains/SimInfo.hpp (file contents):
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC vs.
Revision 1808 by gezelter, Mon Oct 22 20:42:10 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   /**
# Line 59 | Line 60
60   #include "math/Vector3.hpp"
61   #include "math/SquareMatrix3.hpp"
62   #include "types/MoleculeStamp.hpp"
63 < #include "UseTheForce/ForceField.hpp"
63 > #include "brains/ForceField.hpp"
64   #include "utils/PropertyMap.hpp"
65   #include "utils/LocalIndexManager.hpp"
66   #include "nonbonded/SwitchingFunction.hpp"
67  
67 – //another nonsense macro declaration
68 – #define __OPENMD_C
69 – #include "brains/fSimulation.h"
70 –
68   using namespace std;
69   namespace OpenMD{
70 <  //forward decalration
70 >  //forward declaration
71    class SnapshotManager;
72    class Molecule;
73    class SelectionManager;
# Line 94 | Line 91 | namespace OpenMD{
91      /**
92       * Constructor of SimInfo
93       *
94 <     * @param molStampPairs MoleculeStamp Array. The first element of
98 <     * the pair is molecule stamp, the second element is the total
99 <     * number of molecules with the same molecule stamp in the system
94 >     * @param ff pointer to a concrete ForceField instance
95       *
96 <     * @param ff pointer of a concrete ForceField instance
102 <     *
103 <     * @param simParams
96 >     * @param simParams pointer to the simulation parameters in a Globals object
97       */
98      SimInfo(ForceField* ff, Globals* simParams);
99      virtual ~SimInfo();
# Line 111 | Line 104 | namespace OpenMD{
104       * @return return true if adding successfully, return false if the
105       * molecule is already in SimInfo
106       *
107 <     * @param mol molecule to be added
107 >     * @param mol Molecule to be added
108       */
109      bool addMolecule(Molecule* mol);
110  
# Line 170 | Line 163 | namespace OpenMD{
163        return nAtoms_;
164      }
165  
166 +    /** Returns the number of effective cutoff groups on local processor */
167 +    unsigned int getNLocalCutoffGroups();
168 +
169      /** Returns the number of local bonds */        
170      unsigned int getNBonds(){
171        return nBonds_;
# Line 222 | Line 218 | namespace OpenMD{
218       * @param i the iterator of molecule array
219       */
220      Molecule* nextMolecule(MoleculeIterator& i);
221 +
222 +    /** Returns the total number of fluctuating charges that are present */
223 +    int getNFluctuatingCharges() {
224 +      return nGlobalFluctuatingCharges_;
225 +    }
226  
227      /** Returns the number of degrees of freedom */
228      int getNdf() {
229        return ndf_ - getFdf();
230      }
231  
232 +    /** Returns the number of degrees of freedom (LOCAL) */
233 +    int getNdfLocal() {
234 +      return ndfLocal_;
235 +    }
236 +
237      /** Returns the number of raw degrees of freedom */
238      int getNdfRaw() {
239        return ndfRaw_;
# Line 277 | Line 283 | namespace OpenMD{
283        return simParams_;
284      }
285  
280 –    /** Returns the velocity of center of mass of the whole system.*/
281 –    Vector3d getComVel();
282 –
283 –    /** Returns the center of the mass of the whole system.*/
284 –    Vector3d getCom();
285 –    /** Returns the center of the mass and Center of Mass velocity of
286 –        the whole system.*/
287 –    void getComAll(Vector3d& com,Vector3d& comVel);
288 –
289 –    /** Returns intertia tensor for the entire system and system
290 –        Angular Momentum.*/
291 –    void getInertiaTensor(Mat3x3d &intertiaTensor,Vector3d &angularMomentum);
292 –    
293 –    /** Returns system angular momentum */
294 –    Vector3d getAngularMomentum();
295 –
296 –    /** Returns volume of system as estimated by an ellipsoid defined
297 –        by the radii of gyration*/
298 –    void getGyrationalVolume(RealType &vol);
299 –    /** Overloaded version of gyrational volume that also returns
300 –        det(I) so dV/dr can be calculated*/
301 –    void getGyrationalVolume(RealType &vol, RealType &detI);
302 –
286      void update();
287      /**
288 <     * Setup Fortran Simulation
288 >     * Do final bookkeeping before Force managers need their data.
289       */
290 <    void setupFortran();
290 >    void prepareTopology();
291  
292  
293      /** Returns the local index manager */
# Line 355 | Line 338 | namespace OpenMD{
338       * processor, these should be identical.
339       */
340      vector<int> getGlobalGroupIndices();
341 +
342          
343      string getFinalConfigFileName() {
344        return finalConfigFileName_;
# Line 397 | Line 381 | namespace OpenMD{
381  
382      /**
383       * Sets GlobalGroupMembership
400 –     * @see #SimCreator::setGlobalIndex
384       */  
385      void setGlobalGroupMembership(const vector<int>& globalGroupMembership) {
386        assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
# Line 406 | Line 389 | namespace OpenMD{
389  
390      /**
391       * Sets GlobalMolMembership
409 –     * @see #SimCreator::setGlobalIndex
392       */        
393      void setGlobalMolMembership(const vector<int>& globalMolMembership) {
394        assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
# Line 414 | Line 396 | namespace OpenMD{
396      }
397  
398  
399 <    bool isFortranInitialized() {
400 <      return fortranInitialized_;
399 >    bool isTopologyDone() {
400 >      return topologyDone_;
401      }
402          
403      bool getCalcBoxDipole() {
# Line 516 | Line 498 | namespace OpenMD{
498      int nIntegrableObjects_;  /**< number of integrable objects in local processor */
499      int nCutoffGroups_;       /**< number of cutoff groups in local processor */
500      int nConstraints_;        /**< number of constraints in local processors */
501 +    int nFluctuatingCharges_; /**< number of fluctuating charges in local processor */
502          
503      /// Counts of global objects
504      int nGlobalMols_;              /**< number of molecules in the system (GLOBAL) */
# Line 523 | Line 506 | namespace OpenMD{
506      int nGlobalCutoffGroups_;      /**< number of cutoff groups in this system (GLOBAL) */
507      int nGlobalIntegrableObjects_; /**< number of integrable objects in this system */
508      int nGlobalRigidBodies_;       /**< number of rigid bodies in this system (GLOBAL) */
509 +    int nGlobalFluctuatingCharges_;/**< number of fluctuating charges in this system (GLOBAL) */
510 +    
511        
512      /// Degress of freedom
513      int ndf_;          /**< number of degress of freedom (excludes constraints) (LOCAL) */
514 +    int ndfLocal_;     /**< number of degrees of freedom (LOCAL, excludes constraints) */
515      int fdf_local;     /**< number of frozen degrees of freedom (LOCAL) */
516      int fdf_;          /**< number of frozen degrees of freedom (GLOBAL) */
517      int ndfRaw_;       /**< number of degress of freedom (includes constraints),  (LOCAL) */
# Line 537 | Line 523 | namespace OpenMD{
523      bool usesDirectionalAtoms_;   /**< are there atoms with position AND orientation? */
524      bool usesMetallicAtoms_;      /**< are there transition metal atoms? */
525      bool usesElectrostaticAtoms_; /**< are there electrostatic atoms? */
526 +    bool usesFluctuatingCharges_; /**< are there fluctuating charges? */
527      bool usesAtomicVirial_;       /**< are we computing atomic virials? */
528      bool requiresPrepair_;        /**< does this simulation require a pre-pair loop? */
529      bool requiresSkipCorrection_; /**< does this simulation require a skip-correction? */
# Line 545 | Line 532 | namespace OpenMD{
532    public:
533      bool usesElectrostaticAtoms() { return usesElectrostaticAtoms_; }
534      bool usesDirectionalAtoms() { return usesDirectionalAtoms_; }
535 <    bool usesMetallicAtoms() { return usesMetallicAtoms_; }
535 >    bool usesFluctuatingCharges() { return usesFluctuatingCharges_; }
536      bool usesAtomicVirial() { return usesAtomicVirial_; }
537      bool requiresPrepair() { return requiresPrepair_; }
538      bool requiresSkipCorrection() { return requiresSkipCorrection_;}
# Line 554 | Line 541 | namespace OpenMD{
541    private:
542      /// Data structures holding primary simulation objects
543      map<int, Molecule*>  molecules_;  /**< map holding pointers to LOCAL molecules */
557 –    simtype fInfo_;                   /**< A dual struct shared by C++
558 –                                         and Fortran to pass
559 –                                         information about what types
560 –                                         of calculation are
561 –                                         required */
544  
545      /// Stamps are templates for objects that are then used to create
546      /// groups of objects.  For example, a molecule stamp contains
# Line 595 | Line 577 | namespace OpenMD{
577    public:
578      vector<int> getIdentArray() { return identArray_; }
579    private:
580 +    
581 +    /**
582 +     * A vector which contains the fractional contribution of an
583 +     * atom's mass to the total mass of the cutoffGroup that atom
584 +     * belongs to.  In the case of single atom cutoff groups, the mass
585 +     * factor for that atom is 1.  For massless atoms, the factor is
586 +     * also 1.
587 +     */
588 +    vector<RealType> massFactors_;
589 +  public:
590 +    vector<RealType> getMassFactors() { return massFactors_; }
591 +
592 +    PairList* getExcludedInteractions() { return &excludedInteractions_; }
593 +    PairList* getOneTwoInteractions() { return &oneTwoInteractions_; }
594 +    PairList* getOneThreeInteractions() { return &oneThreeInteractions_; }
595 +    PairList* getOneFourInteractions() { return &oneFourInteractions_; }
596 +
597 +  private:
598                
599      /// lists to handle atoms needing special treatment in the non-bonded interactions
600      PairList excludedInteractions_;  /**< atoms excluded from interacting with each other */
# Line 625 | Line 625 | namespace OpenMD{
625      string restFileName_;
626          
627  
628 <    bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
628 >    bool topologyDone_;  /** flag to indicate whether the topology has
629 >                             been scanned and all the relevant
630 >                             bookkeeping has been done*/
631      
632      bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
633                              the simulation box dipole moment */
# Line 659 | Line 661 | namespace OpenMD{
661      
662      /**
663       * Set MolToProcMap array
662 –     * @see #SimCreator::divideMolecules
664       */
665      void setMolToProcMap(const vector<int>& molToProcMap) {
666        molToProcMap_ = molToProcMap;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines