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

Comparing trunk/src/brains/SimInfo.hpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1287 by gezelter, Wed Sep 10 18:11:32 2008 UTC

# Line 54 | Line 54
54   #include <utility>
55   #include <vector>
56  
57 < #include "brains/Exclude.hpp"
57 > #include "brains/PairList.hpp"
58   #include "io/Globals.hpp"
59   #include "math/Vector3.hpp"
60   #include "math/SquareMatrix3.hpp"
# Line 73 | Line 73 | namespace oopse{
73    class SnapshotManager;
74    class Molecule;
75    class SelectionManager;
76 +  class StuntDouble;
77    /**
78     * @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
79     * @brief One of the heavy weight classes of OOPSE, SimInfo maintains a list of molecules.
80 <   * The Molecule class maintains all of the concrete objects
81 <   * (atoms, bond, bend, torsions, rigid bodies, cutoff groups, constrains).
82 <   * In both the  single and parallel versions,  atoms and
83 <   * rigid bodies have both global and local indices.  The local index is
84 <   * not relevant to molecules or cutoff groups.
85 <   */
80 >    * The Molecule class maintains all of the concrete objects
81 >    * (atoms, bond, bend, torsions, inversions, rigid bodies, cutoff groups,
82 >    * constraints). In both the single and parallel versions, atoms and
83 >    * rigid bodies have both global and local indices.  The local index is
84 >    * not relevant to molecules or cutoff groups.
85 >    */
86    class SimInfo {
87    public:
88      typedef std::map<int, Molecule*>::iterator  MoleculeIterator;
# Line 170 | Line 171 | namespace oopse{
171        return nTorsions_;
172      }
173  
174 +    /** Returns the number of local torsions */        
175 +    unsigned int getNInversions() {
176 +      return nInversions_;
177 +    }
178      /** Returns the number of local rigid bodies */        
179      unsigned int getNRigidBodies() {
180        return nRigidBodies_;
# Line 271 | Line 276 | namespace oopse{
276      /** Returns system angular momentum */
277      Vector3d getAngularMomentum();
278  
279 +    /** Returns volume of system as estimated by an ellipsoid defined by the radii of gyration*/
280 +    void getGyrationalVolume(RealType &vol);
281 +    /** Overloaded version of gyrational volume that also returns det(I) so dV/dr can be calculated*/
282 +    void getGyrationalVolume(RealType &vol, RealType &detI);
283      /** main driver function to interact with fortran during the initialization and molecule migration */
284      void update();
285  
# Line 320 | Line 329 | namespace oopse{
329      std::string getFinalConfigFileName() {
330        return finalConfigFileName_;
331      }
332 <        
332 >
333      void setFinalConfigFileName(const std::string& fileName) {
334        finalConfigFileName_ = fileName;
335      }
336  
337 +    std::string getRawMetaData() {
338 +      return rawMetaData_;
339 +    }
340 +    void setRawMetaData(const std::string& rawMetaData) {
341 +      rawMetaData_ = rawMetaData;
342 +    }
343 +        
344      std::string getDumpFileName() {
345        return dumpFileName_;
346      }
# Line 354 | Line 370 | namespace oopse{
370       * @see #SimCreator::setGlobalIndex
371       */  
372      void setGlobalGroupMembership(const std::vector<int>& globalGroupMembership) {
373 <      assert(globalGroupMembership.size() == nGlobalAtoms_);
373 >      assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
374        globalGroupMembership_ = globalGroupMembership;
375      }
376  
# Line 363 | Line 379 | namespace oopse{
379       * @see #SimCreator::setGlobalIndex
380       */        
381      void setGlobalMolMembership(const std::vector<int>& globalMolMembership) {
382 <      assert(globalMolMembership.size() == nGlobalAtoms_);
382 >      assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
383        globalMolMembership_ = globalMolMembership;
384      }
385  
# Line 372 | Line 388 | namespace oopse{
388        return fortranInitialized_;
389      }
390          
391 +    bool getCalcBoxDipole() {
392 +      return calcBoxDipole_;
393 +    }
394 +
395 +    bool getUseAtomicVirial() {
396 +      return useAtomicVirial_;
397 +    }
398 +
399      //below functions are just forward functions
400      //To compose or to inherit is always a hot debate. In general, is-a relation need subclassing, in the
401      //the other hand, has-a relation need composing.
# Line 413 | Line 437 | namespace oopse{
437      GenericData* getPropertyByName(const std::string& propName);
438  
439      /**
440 <     * add all exclude pairs of a molecule into exclude list.
440 >     * add all special interaction pairs (including excluded
441 >     * interactions) in a molecule into the appropriate lists.
442       */
443 <    void addExcludePairs(Molecule* mol);
443 >    void addInteractionPairs(Molecule* mol);
444  
445      /**
446 <     * remove all exclude pairs which belong to a molecule from exclude list
446 >     * remove all special interaction pairs which belong to a molecule
447 >     * from the appropriate lists.
448       */
449 +    void removeInteractionPairs(Molecule* mol);
450  
424 –    void removeExcludePairs(Molecule* mol);
451  
426 –
452      /** Returns the unique atom types of local processor in an array */
453      std::set<AtomType*> getUniqueAtomTypes();
454          
# Line 451 | Line 476 | namespace oopse{
476      /** Figure out which polynomial type to use for the switching function */
477      void setupSwitchingFunction();
478  
479 +    /** Determine if we need to accumulate the simulation box dipole */
480 +    void setupAccumulateBoxDipole();
481 +
482      /** Calculates the number of degress of freedom in the whole system */
483      void calcNdf();
484      void calcNdfRaw();
# Line 500 | Line 528 | namespace oopse{
528      std::vector<MoleculeStamp*> moleculeStamps_;      /**< molecule stamps array */        
529          
530      //number of local objects
531 <    int nAtoms_;                        /**< number of atoms in local processor */
532 <    int nBonds_;                        /**< number of bonds in local processor */
533 <    int nBends_;                        /**< number of bends in local processor */
534 <    int nTorsions_;                    /**< number of torsions in local processor */
535 <    int nRigidBodies_;              /**< number of rigid bodies in local processor */
536 <    int nIntegrableObjects_;    /**< number of integrable objects in local processor */
537 <    int nCutoffGroups_;             /**< number of cutoff groups in local processor */
538 <    int nConstraints_;              /**< number of constraints in local processors */
531 >    int nAtoms_;              /**< number of atoms in local processor */
532 >    int nBonds_;              /**< number of bonds in local processor */
533 >    int nBends_;              /**< number of bends in local processor */
534 >    int nTorsions_;           /**< number of torsions in local processor */
535 >    int nInversions_;         /**< number of inversions in local processor */
536 >    int nRigidBodies_;        /**< number of rigid bodies in local processor */
537 >    int nIntegrableObjects_;  /**< number of integrable objects in local processor */
538 >    int nCutoffGroups_;       /**< number of cutoff groups in local processor */
539 >    int nConstraints_;        /**< number of constraints in local processors */
540  
541      simtype fInfo_; /**< A dual struct shared by c++/fortran which indicates the atom types in simulation*/
542 <    Exclude exclude_;      
542 >    PairList excludedInteractions_;      
543 >    PairList oneTwoInteractions_;      
544 >    PairList oneThreeInteractions_;      
545 >    PairList oneFourInteractions_;      
546      PropertyMap properties_;                  /**< Generic Property */
547      SnapshotManager* sman_;               /**< SnapshotManager */
548  
# Line 522 | Line 554 | namespace oopse{
554       */        
555      LocalIndexManager localIndexMan_;
556  
557 +    // unparsed MetaData block for storing in Dump and EOR files:
558 +    std::string rawMetaData_;
559 +
560      //file names
561      std::string finalConfigFileName_;
562      std::string dumpFileName_;
# Line 532 | Line 567 | namespace oopse{
567      RealType rsw_;        /**< radius of switching function*/
568      RealType rlist_;      /**< neighbor list radius */
569  
570 <    bool fortranInitialized_; /**< flag indicate whether fortran side is initialized */
570 >    bool ljsp_; /**< use shifted potential for LJ*/
571 >    bool ljsf_; /**< use shifted force for LJ*/
572  
573 < #ifdef IS_MPI
573 >    bool fortranInitialized_; /**< flag indicate whether fortran side
574 >                                 is initialized */
575 >    
576 >    bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
577 >                            the simulation box dipole moment */
578 >    
579 >    bool useAtomicVirial_; /**< flag to indicate whether or not we use
580 >                              Atomic Virials to calculate the pressure */
581 >
582 >    public:
583 >     /**
584 >      * return an integral objects by its global index. In MPI version, if the StuntDouble with specified
585 >      * global index does not belong to local processor, a NULL will be return.
586 >      */
587 >      StuntDouble* getIOIndexToIntegrableObject(int index);
588 >      void setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v);
589 >    private:
590 >      std::vector<StuntDouble*> IOIndexToIntegrableObject;
591 >  //public:
592 >    //void setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v);
593 >    /**
594 >     * return a StuntDouble by its global index. In MPI version, if the StuntDouble with specified
595 >     * global index does not belong to local processor, a NULL will be return.
596 >     */
597 >    //StuntDouble* getStuntDoubleFromGlobalIndex(int index);
598 >  //private:
599 >    //std::vector<StuntDouble*> sdByGlobalIndex_;
600 >    
601      //in Parallel version, we need MolToProc
602    public:
603                  
# Line 561 | Line 624 | namespace oopse{
624      void setupFortranParallel();
625          
626      /**
627 <     * The size of molToProcMap_ is equal to total number of molecules in the system.
628 <     *  It maps a molecule to the processor on which it resides. it is filled by SimCreator once and only
629 <     * once.
627 >     * The size of molToProcMap_ is equal to total number of molecules
628 >     * in the system.  It maps a molecule to the processor on which it
629 >     * resides. it is filled by SimCreator once and only once.
630       */        
631      std::vector<int> molToProcMap_;
632  
570 – #endif
633  
634    };
635  

Diff Legend

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