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 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC vs.
Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC

# Line 62 | Line 62
62   #include "UseTheForce/ForceField.hpp"
63   #include "utils/PropertyMap.hpp"
64   #include "utils/LocalIndexManager.hpp"
65 + #include "nonbonded/SwitchingFunction.hpp"
66  
67 < //another nonsense macro declaration
67 < #define __OPENMD_C
68 < #include "brains/fSimulation.h"
69 <
67 > using namespace std;
68   namespace OpenMD{
69 <
72 <  //forward decalration
69 >  //forward declaration
70    class SnapshotManager;
71    class Molecule;
72    class SelectionManager;
73    class StuntDouble;
74 +
75    /**
76 <   * @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
77 <   * @brief One of the heavy weight classes of OpenMD, SimInfo maintains a list of molecules.
78 <    * The Molecule class maintains all of the concrete objects
79 <    * (atoms, bond, bend, torsions, inversions, rigid bodies, cutoff groups,
80 <    * constraints). In both the single and parallel versions, atoms and
81 <    * rigid bodies have both global and local indices.  The local index is
82 <    * not relevant to molecules or cutoff groups.
83 <    */
76 >   * @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
77 >   *
78 >   * @brief One of the heavy-weight classes of OpenMD, SimInfo
79 >   * maintains objects and variables relating to the current
80 >   * simulation.  This includes the master list of Molecules.  The
81 >   * Molecule class maintains all of the concrete objects (Atoms,
82 >   * Bond, Bend, Torsions, Inversions, RigidBodies, CutoffGroups,
83 >   * Constraints). In both the single and parallel versions, Atoms and
84 >   * RigidBodies have both global and local indices.
85 >   */
86    class SimInfo {
87    public:
88 <    typedef std::map<int, Molecule*>::iterator  MoleculeIterator;
89 <
88 >    typedef map<int, Molecule*>::iterator  MoleculeIterator;
89 >    
90      /**
91       * Constructor of SimInfo
92 <     * @param molStampPairs MoleculeStamp Array. The first element of the pair is molecule stamp, the
93 <     * second element is the total number of molecules with the same molecule stamp in the system
92 >     *
93 >     * @param molStampPairs MoleculeStamp Array. The first element of
94 >     * the pair is molecule stamp, the second element is the total
95 >     * number of molecules with the same molecule stamp in the system
96 >     *
97       * @param ff pointer of a concrete ForceField instance
98 +     *
99       * @param simParams
96     * @note
100       */
101      SimInfo(ForceField* ff, Globals* simParams);
102      virtual ~SimInfo();
103  
104      /**
105       * Adds a molecule
106 <     * @return return true if adding successfully, return false if the molecule is already in SimInfo
106 >     *
107 >     * @return return true if adding successfully, return false if the
108 >     * molecule is already in SimInfo
109 >     *
110       * @param mol molecule to be added
111       */
112      bool addMolecule(Molecule* mol);
113  
114      /**
115       * Removes a molecule from SimInfo
116 <     * @return true if removing successfully, return false if molecule is not in this SimInfo
116 >     *
117 >     * @return true if removing successfully, return false if molecule
118 >     * is not in this SimInfo
119       */
120      bool removeMolecule(Molecule* mol);
121  
# Line 127 | Line 135 | namespace OpenMD{
135      }
136  
137      /**
138 <     * Returns the total number of integrable objects (total number of rigid bodies plus the total number
139 <     * of atoms which do not belong to the rigid bodies) in the system
138 >     * Returns the total number of integrable objects (total number of
139 >     * rigid bodies plus the total number of atoms which do not belong
140 >     * to the rigid bodies) in the system
141       */
142      int getNGlobalIntegrableObjects() {
143        return nGlobalIntegrableObjects_;
144      }
145  
146      /**
147 <     * Returns the total number of integrable objects (total number of rigid bodies plus the total number
148 <     * of atoms which do not belong to the rigid bodies) in the system
147 >     * Returns the total number of integrable objects (total number of
148 >     * rigid bodies plus the total number of atoms which do not belong
149 >     * to the rigid bodies) in the system
150       */
151      int getNGlobalRigidBodies() {
152        return nGlobalRigidBodies_;
# Line 231 | Line 241 | namespace OpenMD{
241  
242      int getFdf();
243      
244 <    //getNZconstraint and setNZconstraint ruin the coherent of SimInfo class, need refactorying
244 >    //getNZconstraint and setNZconstraint ruin the coherence of
245 >    //SimInfo class, need refactoring
246          
247      /** Returns the total number of z-constraint molecules in the system */
248      int getNZconstraint() {
# Line 267 | Line 278 | namespace OpenMD{
278  
279      /** Returns the center of the mass of the whole system.*/
280      Vector3d getCom();
281 <   /** Returns the center of the mass and Center of Mass velocity of the whole system.*/
281 >    /** Returns the center of the mass and Center of Mass velocity of
282 >        the whole system.*/
283      void getComAll(Vector3d& com,Vector3d& comVel);
284  
285 <    /** Returns intertia tensor for the entire system and system Angular Momentum.*/
285 >    /** Returns intertia tensor for the entire system and system
286 >        Angular Momentum.*/
287      void getInertiaTensor(Mat3x3d &intertiaTensor,Vector3d &angularMomentum);
288      
289      /** Returns system angular momentum */
290      Vector3d getAngularMomentum();
291  
292 <    /** Returns volume of system as estimated by an ellipsoid defined by the radii of gyration*/
292 >    /** Returns volume of system as estimated by an ellipsoid defined
293 >        by the radii of gyration*/
294      void getGyrationalVolume(RealType &vol);
295 <    /** Overloaded version of gyrational volume that also returns det(I) so dV/dr can be calculated*/
295 >    /** Overloaded version of gyrational volume that also returns
296 >        det(I) so dV/dr can be calculated*/
297      void getGyrationalVolume(RealType &vol, RealType &detI);
298 <    /** main driver function to interact with fortran during the initialization and molecule migration */
298 >
299      void update();
300 +    /**
301 +     * Do final bookkeeping before Force managers need their data.
302 +     */
303 +    void prepareTopology();
304  
305 +
306      /** Returns the local index manager */
307      LocalIndexManager* getLocalIndexManager() {
308        return &localIndexMan_;
# Line 318 | Line 338 | namespace OpenMD{
338        return globalMolMembership_[id];
339      }
340  
341 <    RealType getRcut() {
342 <      return rcut_;
343 <    }
341 >    /**
342 >     * returns a vector which maps the local atom index on this
343 >     * processor to the global atom index.  With only one processor,
344 >     * these should be identical.
345 >     */
346 >    vector<int> getGlobalAtomIndices();
347  
348 <    RealType getRsw() {
349 <      return rsw_;
350 <    }
351 <
352 <    RealType getList() {
353 <      return rlist_;
354 <    }
348 >    /**
349 >     * returns a vector which maps the local cutoff group index on
350 >     * this processor to the global cutoff group index.  With only one
351 >     * processor, these should be identical.
352 >     */
353 >    vector<int> getGlobalGroupIndices();
354 >
355          
356 <    std::string getFinalConfigFileName() {
356 >    string getFinalConfigFileName() {
357        return finalConfigFileName_;
358      }
359  
360 <    void setFinalConfigFileName(const std::string& fileName) {
360 >    void setFinalConfigFileName(const string& fileName) {
361        finalConfigFileName_ = fileName;
362      }
363  
364 <    std::string getRawMetaData() {
364 >    string getRawMetaData() {
365        return rawMetaData_;
366      }
367 <    void setRawMetaData(const std::string& rawMetaData) {
367 >    void setRawMetaData(const string& rawMetaData) {
368        rawMetaData_ = rawMetaData;
369      }
370          
371 <    std::string getDumpFileName() {
371 >    string getDumpFileName() {
372        return dumpFileName_;
373      }
374          
375 <    void setDumpFileName(const std::string& fileName) {
375 >    void setDumpFileName(const string& fileName) {
376        dumpFileName_ = fileName;
377      }
378  
379 <    std::string getStatFileName() {
379 >    string getStatFileName() {
380        return statFileName_;
381      }
382          
383 <    void setStatFileName(const std::string& fileName) {
383 >    void setStatFileName(const string& fileName) {
384        statFileName_ = fileName;
385      }
386          
387 <    std::string getRestFileName() {
387 >    string getRestFileName() {
388        return restFileName_;
389      }
390          
391 <    void setRestFileName(const std::string& fileName) {
391 >    void setRestFileName(const string& fileName) {
392        restFileName_ = fileName;
393      }
394  
# Line 373 | Line 396 | namespace OpenMD{
396       * Sets GlobalGroupMembership
397       * @see #SimCreator::setGlobalIndex
398       */  
399 <    void setGlobalGroupMembership(const std::vector<int>& globalGroupMembership) {
399 >    void setGlobalGroupMembership(const vector<int>& globalGroupMembership) {
400        assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
401        globalGroupMembership_ = globalGroupMembership;
402      }
# Line 382 | Line 405 | namespace OpenMD{
405       * Sets GlobalMolMembership
406       * @see #SimCreator::setGlobalIndex
407       */        
408 <    void setGlobalMolMembership(const std::vector<int>& globalMolMembership) {
408 >    void setGlobalMolMembership(const vector<int>& globalMolMembership) {
409        assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
410        globalMolMembership_ = globalMolMembership;
411      }
412  
413  
414 <    bool isFortranInitialized() {
415 <      return fortranInitialized_;
414 >    bool isTopologyDone() {
415 >      return topologyDone_;
416      }
417          
418      bool getCalcBoxDipole() {
# Line 400 | Line 423 | namespace OpenMD{
423        return useAtomicVirial_;
424      }
425  
403    //below functions are just forward functions
404    //To compose or to inherit is always a hot debate. In general, is-a relation need subclassing, in the
405    //the other hand, has-a relation need composing.
426      /**
427       * Adds property into property map
428       * @param genData GenericData to be added into PropertyMap
# Line 413 | Line 433 | namespace OpenMD{
433       * Removes property from PropertyMap by name
434       * @param propName the name of property to be removed
435       */
436 <    void removeProperty(const std::string& propName);
436 >    void removeProperty(const string& propName);
437  
438      /**
439       * clear all of the properties
# Line 424 | Line 444 | namespace OpenMD{
444       * Returns all names of properties
445       * @return all names of properties
446       */
447 <    std::vector<std::string> getPropertyNames();
447 >    vector<string> getPropertyNames();
448  
449      /**
450       * Returns all of the properties in PropertyMap
451       * @return all of the properties in PropertyMap
452       */      
453 <    std::vector<GenericData*> getProperties();
453 >    vector<GenericData*> getProperties();
454  
455      /**
456       * Returns property
# Line 438 | Line 458 | namespace OpenMD{
458       * @return a pointer point to property with propName. If no property named propName
459       * exists, return NULL
460       */      
461 <    GenericData* getPropertyByName(const std::string& propName);
461 >    GenericData* getPropertyByName(const string& propName);
462  
463      /**
464       * add all special interaction pairs (including excluded
# Line 452 | Line 472 | namespace OpenMD{
472       */
473      void removeInteractionPairs(Molecule* mol);
474  
475 <
476 <    /** Returns the unique atom types of local processor in an array */
457 <    std::set<AtomType*> getUniqueAtomTypes();
475 >    /** Returns the set of atom types present in this simulation */
476 >    set<AtomType*> getSimulatedAtomTypes();
477          
478 <    friend std::ostream& operator <<(std::ostream& o, SimInfo& info);
478 >    friend ostream& operator <<(ostream& o, SimInfo& info);
479  
480      void getCutoff(RealType& rcut, RealType& rsw);
481          
482    private:
483  
484 <    /** fill up the simtype struct*/
485 <    void setupSimType();
484 >    /** fill up the simtype struct and other simulation-related variables */
485 >    void setupSimVariables();
486  
468    /**
469     * Setup Fortran Simulation
470     * @see #setupFortranParallel
471     */
472    void setupFortranSim();
487  
474    /** Figure out the radius of cutoff, radius of switching function and pass them to fortran */
475    void setupCutoff();
476
477    /** Figure out which coulombic correction method to use and pass to fortran */
478    void setupElectrostaticSummationMethod( int isError );
479
480    /** Figure out which polynomial type to use for the switching function */
481    void setupSwitchingFunction();
482
488      /** Determine if we need to accumulate the simulation box dipole */
489      void setupAccumulateBoxDipole();
490  
# Line 488 | Line 493 | namespace OpenMD{
493      void calcNdfRaw();
494      void calcNdfTrans();
495  
491    ForceField* forceField_;      
492    Globals* simParams_;
493
494    std::map<int, Molecule*>  molecules_; /**< Molecule array */
495
496      /**
497 <     * Adds molecule stamp and the total number of the molecule with same molecule stamp in the whole
498 <     * system.
497 >     * Adds molecule stamp and the total number of the molecule with
498 >     * same molecule stamp in the whole system.
499       */
500      void addMoleculeStamp(MoleculeStamp* molStamp, int nmol);
501        
502    //degress of freedom
503    int ndf_;           /**< number of degress of freedom (excludes constraints),  ndf_ is local */
504    int fdf_local;       /**< number of frozen degrees of freedom */
505    int fdf_;            /**< number of frozen degrees of freedom */
506    int ndfRaw_;    /**< number of degress of freedom (includes constraints),  ndfRaw_ is local */
507    int ndfTrans_; /**< number of translation degress of freedom, ndfTrans_ is local */
508    int nZconstraint_; /** number of  z-constraint molecules, nZconstraint_ is global */
509        
510    //number of global objects
511    int nGlobalMols_;       /**< number of molecules in the system */
512    int nGlobalAtoms_;   /**< number of atoms in the system */
513    int nGlobalCutoffGroups_; /**< number of cutoff groups in this system */
514    int nGlobalIntegrableObjects_; /**< number of integrable objects in this system */
515    int nGlobalRigidBodies_; /**< number of rigid bodies in this system */
516    /**
517     * the size of globalGroupMembership_  is nGlobalAtoms. Its index is  global index of an atom, and the
518     * corresponding content is the global index of cutoff group this atom belong to.
519     * It is filled by SimCreator once and only once, since it never changed during the simulation.
520     */
521    std::vector<int> globalGroupMembership_;
501  
502 <    /**
503 <     * the size of globalMolMembership_  is nGlobalAtoms. Its index is  global index of an atom, and the
504 <     * corresponding content is the global index of molecule this atom belong to.
526 <     * It is filled by SimCreator once and only once, since it is never changed during the simulation.
527 <     */
528 <    std::vector<int> globalMolMembership_;        
502 >    // Other classes holdingn important information
503 >    ForceField* forceField_; /**< provides access to defined atom types, bond types, etc. */
504 >    Globals* simParams_;     /**< provides access to simulation parameters set by user */
505  
506 <        
531 <    std::vector<int> molStampIds_;                                /**< stamp id array of all molecules in the system */
532 <    std::vector<MoleculeStamp*> moleculeStamps_;      /**< molecule stamps array */        
533 <        
534 <    //number of local objects
506 >    ///  Counts of local objects
507      int nAtoms_;              /**< number of atoms in local processor */
508      int nBonds_;              /**< number of bonds in local processor */
509      int nBends_;              /**< number of bends in local processor */
# Line 541 | Line 513 | namespace OpenMD{
513      int nIntegrableObjects_;  /**< number of integrable objects in local processor */
514      int nCutoffGroups_;       /**< number of cutoff groups in local processor */
515      int nConstraints_;        /**< number of constraints in local processors */
516 +        
517 +    /// Counts of global objects
518 +    int nGlobalMols_;              /**< number of molecules in the system (GLOBAL) */
519 +    int nGlobalAtoms_;             /**< number of atoms in the system (GLOBAL) */
520 +    int nGlobalCutoffGroups_;      /**< number of cutoff groups in this system (GLOBAL) */
521 +    int nGlobalIntegrableObjects_; /**< number of integrable objects in this system */
522 +    int nGlobalRigidBodies_;       /**< number of rigid bodies in this system (GLOBAL) */
523 +      
524 +    /// Degress of freedom
525 +    int ndf_;          /**< number of degress of freedom (excludes constraints) (LOCAL) */
526 +    int fdf_local;     /**< number of frozen degrees of freedom (LOCAL) */
527 +    int fdf_;          /**< number of frozen degrees of freedom (GLOBAL) */
528 +    int ndfRaw_;       /**< number of degress of freedom (includes constraints),  (LOCAL) */
529 +    int ndfTrans_;     /**< number of translation degress of freedom, (LOCAL) */
530 +    int nZconstraint_; /**< number of  z-constraint molecules (GLOBAL) */
531  
532 <    simtype fInfo_; /**< A dual struct shared by c++/fortran which indicates the atom types in simulation*/
533 <    PairList excludedInteractions_;      
534 <    PairList oneTwoInteractions_;      
535 <    PairList oneThreeInteractions_;      
536 <    PairList oneFourInteractions_;      
537 <    PropertyMap properties_;                  /**< Generic Property */
538 <    SnapshotManager* sman_;               /**< SnapshotManager */
532 >    /// logicals
533 >    bool usesPeriodicBoundaries_; /**< use periodic boundary conditions? */
534 >    bool usesDirectionalAtoms_;   /**< are there atoms with position AND orientation? */
535 >    bool usesMetallicAtoms_;      /**< are there transition metal atoms? */
536 >    bool usesElectrostaticAtoms_; /**< are there electrostatic atoms? */
537 >    bool usesAtomicVirial_;       /**< are we computing atomic virials? */
538 >    bool requiresPrepair_;        /**< does this simulation require a pre-pair loop? */
539 >    bool requiresSkipCorrection_; /**< does this simulation require a skip-correction? */
540 >    bool requiresSelfCorrection_; /**< does this simulation require a self-correction? */
541  
542 +  public:
543 +    bool usesElectrostaticAtoms() { return usesElectrostaticAtoms_; }
544 +    bool usesDirectionalAtoms() { return usesDirectionalAtoms_; }
545 +    bool usesMetallicAtoms() { return usesMetallicAtoms_; }
546 +    bool usesAtomicVirial() { return usesAtomicVirial_; }
547 +    bool requiresPrepair() { return requiresPrepair_; }
548 +    bool requiresSkipCorrection() { return requiresSkipCorrection_;}
549 +    bool requiresSelfCorrection() { return requiresSelfCorrection_;}
550 +
551 +  private:
552 +    /// Data structures holding primary simulation objects
553 +    map<int, Molecule*>  molecules_;  /**< map holding pointers to LOCAL molecules */
554 +
555 +    /// Stamps are templates for objects that are then used to create
556 +    /// groups of objects.  For example, a molecule stamp contains
557 +    /// information on how to build that molecule (i.e. the topology,
558 +    /// the atoms, the bonds, etc.)  Once the system is built, the
559 +    /// stamps are no longer useful.
560 +    vector<int> molStampIds_;                /**< stamp id for molecules in the system */
561 +    vector<MoleculeStamp*> moleculeStamps_;  /**< molecule stamps array */        
562 +
563 +    /**
564 +     * A vector that maps between the global index of an atom, and the
565 +     * global index of cutoff group the atom belong to.  It is filled
566 +     * by SimCreator once and only once, since it never changed during
567 +     * the simulation.  It should be nGlobalAtoms_ in size.
568 +     */
569 +    vector<int> globalGroupMembership_;
570 +  public:
571 +    vector<int> getGlobalGroupMembership() { return globalGroupMembership_; }
572 +  private:
573 +
574 +    /**
575 +     * A vector that maps between the global index of an atom and the
576 +     * global index of the molecule the atom belongs to.  It is filled
577 +     * by SimCreator once and only once, since it is never changed
578 +     * during the simulation. It shoudl be nGlobalAtoms_ in size.
579 +     */
580 +    vector<int> globalMolMembership_;
581 +
582      /**
583 <     * The reason to have a local index manager is that when molecule is migrating to other processors,
584 <     * the atoms and the rigid-bodies will release their local indices to LocalIndexManager. Combining the
585 <     * information of molecule migrating to current processor, Migrator class can query  the LocalIndexManager
586 <     * to make a efficient data moving plan.
583 >     * A vector that maps between the local index of an atom and the
584 >     * index of the AtomType.
585 >     */
586 >    vector<int> identArray_;
587 >  public:
588 >    vector<int> getIdentArray() { return identArray_; }
589 >  private:
590 >    
591 >    /**
592 >     * A vector which contains the fractional contribution of an
593 >     * atom's mass to the total mass of the cutoffGroup that atom
594 >     * belongs to.  In the case of single atom cutoff groups, the mass
595 >     * factor for that atom is 1.  For massless atoms, the factor is
596 >     * also 1.
597 >     */
598 >    vector<RealType> massFactors_;
599 >  public:
600 >    vector<RealType> getMassFactors() { return massFactors_; }
601 >
602 >    PairList getExcludedInteractions() { return excludedInteractions_; }
603 >    PairList getOneTwoInteractions() { return oneTwoInteractions_; }
604 >    PairList getOneThreeInteractions() { return oneThreeInteractions_; }
605 >    PairList getOneFourInteractions() { return oneFourInteractions_; }
606 >
607 >  private:
608 >
609 >              
610 >    /// lists to handle atoms needing special treatment in the non-bonded interactions
611 >    PairList excludedInteractions_;  /**< atoms excluded from interacting with each other */
612 >    PairList oneTwoInteractions_;    /**< atoms that are directly Bonded */
613 >    PairList oneThreeInteractions_;  /**< atoms sharing a Bend */    
614 >    PairList oneFourInteractions_;   /**< atoms sharing a Torsion */
615 >
616 >    PropertyMap properties_;       /**< Generic Properties can be added */
617 >    SnapshotManager* sman_;        /**< SnapshotManager (handles particle positions, etc.) */
618 >
619 >    /**
620 >     * The reason to have a local index manager is that when molecule
621 >     * is migrating to other processors, the atoms and the
622 >     * rigid-bodies will release their local indices to
623 >     * LocalIndexManager. Combining the information of molecule
624 >     * migrating to current processor, Migrator class can query the
625 >     * LocalIndexManager to make a efficient data moving plan.
626       */        
627      LocalIndexManager localIndexMan_;
628  
629      // unparsed MetaData block for storing in Dump and EOR files:
630 <    std::string rawMetaData_;
630 >    string rawMetaData_;
631  
632 <    //file names
633 <    std::string finalConfigFileName_;
634 <    std::string dumpFileName_;
635 <    std::string statFileName_;
636 <    std::string restFileName_;
632 >    // file names
633 >    string finalConfigFileName_;
634 >    string dumpFileName_;
635 >    string statFileName_;
636 >    string restFileName_;
637          
570    RealType rcut_;       /**< cutoff radius*/
571    RealType rsw_;        /**< radius of switching function*/
572    RealType rlist_;      /**< neighbor list radius */
638  
639 <    int ljsp_; /**< use shifted potential for LJ*/
640 <    int ljsf_; /**< use shifted force for LJ*/
641 <
577 <    bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
639 >    bool topologyDone_;  /** flag to indicate whether the topology has
640 >                             been scanned and all the relevant
641 >                             bookkeeping has been done*/
642      
643      bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
644                              the simulation box dipole moment */
645      
646      bool useAtomicVirial_; /**< flag to indicate whether or not we use
647                                Atomic Virials to calculate the pressure */
648 <
649 <    public:
586 <     /**
587 <      * return an integral objects by its global index. In MPI version, if the StuntDouble with specified
588 <      * global index does not belong to local processor, a NULL will be return.
589 <      */
590 <      StuntDouble* getIOIndexToIntegrableObject(int index);
591 <      void setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v);
592 <    private:
593 <      std::vector<StuntDouble*> IOIndexToIntegrableObject;
594 <  //public:
595 <    //void setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v);
648 >    
649 >  public:
650      /**
651 <     * return a StuntDouble by its global index. In MPI version, if the StuntDouble with specified
652 <     * global index does not belong to local processor, a NULL will be return.
653 <     */
654 <    //StuntDouble* getStuntDoubleFromGlobalIndex(int index);
655 <  //private:
656 <    //std::vector<StuntDouble*> sdByGlobalIndex_;
651 >     * return an integral objects by its global index. In MPI
652 >     * version, if the StuntDouble with specified global index does
653 >      * not belong to local processor, a NULL will be return.
654 >      */
655 >    StuntDouble* getIOIndexToIntegrableObject(int index);
656 >    void setIOIndexToIntegrableObject(const vector<StuntDouble*>& v);
657      
658 <    //in Parallel version, we need MolToProc
658 >  private:
659 >    vector<StuntDouble*> IOIndexToIntegrableObject;
660 >    
661    public:
662                  
663      /**
# Line 613 | Line 669 | namespace OpenMD{
669        //assert(globalIndex < molToProcMap_.size());
670        return molToProcMap_[globalIndex];
671      }
672 <
672 >    
673      /**
674       * Set MolToProcMap array
675       * @see #SimCreator::divideMolecules
676       */
677 <    void setMolToProcMap(const std::vector<int>& molToProcMap) {
677 >    void setMolToProcMap(const vector<int>& molToProcMap) {
678        molToProcMap_ = molToProcMap;
679      }
680          
681    private:
626
627    void setupFortranParallel();
682          
683      /**
684       * The size of molToProcMap_ is equal to total number of molecules
685       * in the system.  It maps a molecule to the processor on which it
686       * resides. it is filled by SimCreator once and only once.
687       */        
688 <    std::vector<int> molToProcMap_;
688 >    vector<int> molToProcMap_;
689  
636
690    };
691  
692   } //namespace OpenMD

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines