ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/SimInfo.hpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.hpp (file contents):
Revision 2303 by chrisfen, Fri Sep 16 19:00:12 2005 UTC vs.
Revision 2469 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 95 | Line 95 | namespace oopse{
95       * @param simParams
96       * @note
97       */
98 <    SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs, ForceField* ff, Globals* simParams);
98 >    SimInfo(ForceField* ff, Globals* simParams);
99      virtual ~SimInfo();
100  
101      /**
# Line 298 | Line 298 | namespace oopse{
298  
299        return i != molecules_.end() ? i->second : NULL;
300      }
301
302    /** Calculate the maximum cutoff radius based on the atom types */
303    double calcMaxCutoffRadius();
301  
302      double getRcut() {
303        return rcut_;
# Line 308 | Line 305 | namespace oopse{
305  
306      double getRsw() {
307        return rsw_;
308 +    }
309 +
310 +    double getList() {
311 +      return rlist_;
312      }
313          
314      std::string getFinalConfigFileName() {
# Line 440 | Line 441 | namespace oopse{
441  
442      /** Figure out which coulombic correction method to use and pass to fortran */
443      void setupElectrostaticSummationMethod( int isError );
444 +
445 +    /** Figure out which polynomial type to use for the switching function */
446 +    void setupSwitchingFunction();
447  
448      /** Calculates the number of degress of freedom in the whole system */
449      void calcNdf();
450      void calcNdfRaw();
451      void calcNdfTrans();
452  
453 +    ForceField* forceField_;      
454 +    Globals* simParams_;
455 +
456 +    std::map<int, Molecule*>  molecules_; /**< Molecule array */
457 +
458      /**
459       * Adds molecule stamp and the total number of the molecule with same molecule stamp in the whole
460       * system.
461       */
462      void addMoleculeStamp(MoleculeStamp* molStamp, int nmol);
454
455    MakeStamps* stamps_;
456    ForceField* forceField_;      
457    Globals* simParams_;
458
459    std::map<int, Molecule*>  molecules_; /**< Molecule array */
463          
464      //degress of freedom
465      int ndf_;           /**< number of degress of freedom (excludes constraints),  ndf_ is local */
# Line 519 | Line 522 | namespace oopse{
522          
523      double rcut_;       /**< cutoff radius*/
524      double rsw_;        /**< radius of switching function*/
525 +    double rlist_;      /**< neighbor list radius */
526  
527      bool fortranInitialized_; /**< flag indicate whether fortran side is initialized */
528  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines