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 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC vs.
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC

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

Diff Legend

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