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 1569 by gezelter, Thu May 26 13:55:04 2011 UTC

# Line 64 | Line 64
64   #include "utils/LocalIndexManager.hpp"
65   #include "nonbonded/SwitchingFunction.hpp"
66  
67 //another nonsense macro declaration
68 #define __OPENMD_C
69 #include "brains/fSimulation.h"
70
67   using namespace std;
68   namespace OpenMD{
69 <  //forward decalration
69 >  //forward declaration
70    class SnapshotManager;
71    class Molecule;
72    class SelectionManager;
# Line 302 | Line 298 | namespace OpenMD{
298  
299      void update();
300      /**
301 <     * Setup Fortran Simulation
301 >     * Do final bookkeeping before Force managers need their data.
302       */
303 <    void setupFortran();
303 >    void prepareTopology();
304  
305  
306      /** Returns the local index manager */
# Line 355 | Line 351 | namespace OpenMD{
351       * processor, these should be identical.
352       */
353      vector<int> getGlobalGroupIndices();
354 +
355          
356      string getFinalConfigFileName() {
357        return finalConfigFileName_;
# Line 414 | Line 411 | namespace OpenMD{
411      }
412  
413  
414 <    bool isFortranInitialized() {
415 <      return fortranInitialized_;
414 >    bool isTopologyDone() {
415 >      return topologyDone_;
416      }
417          
418      bool getCalcBoxDipole() {
# Line 554 | Line 551 | namespace OpenMD{
551    private:
552      /// Data structures holding primary simulation objects
553      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 */
554  
555      /// Stamps are templates for objects that are then used to create
556      /// groups of objects.  For example, a molecule stamp contains
# Line 595 | Line 587 | namespace OpenMD{
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 +  private:
602 +
603                
604      /// lists to handle atoms needing special treatment in the non-bonded interactions
605      PairList excludedInteractions_;  /**< atoms excluded from interacting with each other */
# Line 625 | Line 630 | namespace OpenMD{
630      string restFileName_;
631          
632  
633 <    bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
633 >    bool topologyDone_;  /** flag to indicate whether the topology has
634 >                             been scanned and all the relevant
635 >                             bookkeeping has been done*/
636      
637      bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
638                              the simulation box dipole moment */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines