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 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1744 by gezelter, Tue Jun 5 18:07:08 2012 UTC

# Line 60 | Line 60
60   #include "math/Vector3.hpp"
61   #include "math/SquareMatrix3.hpp"
62   #include "types/MoleculeStamp.hpp"
63 < #include "UseTheForce/ForceField.hpp"
63 > #include "brains/ForceField.hpp"
64   #include "utils/PropertyMap.hpp"
65   #include "utils/LocalIndexManager.hpp"
66   #include "nonbonded/SwitchingFunction.hpp"
# Line 223 | Line 223 | namespace OpenMD{
223       */
224      Molecule* nextMolecule(MoleculeIterator& i);
225  
226 +    /** Returns the total number of fluctuating charges that are present */
227 +    int getNFluctuatingCharges() {
228 +      return nGlobalFluctuatingCharges_;
229 +    }
230 +
231      /** Returns the number of degrees of freedom */
232      int getNdf() {
233        return ndf_ - getFdf();
234      }
235  
236 +    /** Returns the number of degrees of freedom (LOCAL) */
237 +    int getNdfLocal() {
238 +      return ndfLocal_;
239 +    }
240 +
241      /** Returns the number of raw degrees of freedom */
242      int getNdfRaw() {
243        return ndfRaw_;
# Line 517 | Line 527 | namespace OpenMD{
527      int nIntegrableObjects_;  /**< number of integrable objects in local processor */
528      int nCutoffGroups_;       /**< number of cutoff groups in local processor */
529      int nConstraints_;        /**< number of constraints in local processors */
530 +    int nFluctuatingCharges_; /**< number of fluctuating charges in local processor */
531          
532      /// Counts of global objects
533      int nGlobalMols_;              /**< number of molecules in the system (GLOBAL) */
# Line 524 | Line 535 | namespace OpenMD{
535      int nGlobalCutoffGroups_;      /**< number of cutoff groups in this system (GLOBAL) */
536      int nGlobalIntegrableObjects_; /**< number of integrable objects in this system */
537      int nGlobalRigidBodies_;       /**< number of rigid bodies in this system (GLOBAL) */
538 +    int nGlobalFluctuatingCharges_;/**< number of fluctuating charges in this system (GLOBAL) */
539 +    
540        
541      /// Degress of freedom
542      int ndf_;          /**< number of degress of freedom (excludes constraints) (LOCAL) */
543 +    int ndfLocal_;     /**< number of degrees of freedom (LOCAL, excludes constraints) */
544      int fdf_local;     /**< number of frozen degrees of freedom (LOCAL) */
545      int fdf_;          /**< number of frozen degrees of freedom (GLOBAL) */
546      int ndfRaw_;       /**< number of degress of freedom (includes constraints),  (LOCAL) */
# Line 538 | Line 552 | namespace OpenMD{
552      bool usesDirectionalAtoms_;   /**< are there atoms with position AND orientation? */
553      bool usesMetallicAtoms_;      /**< are there transition metal atoms? */
554      bool usesElectrostaticAtoms_; /**< are there electrostatic atoms? */
555 +    bool usesFluctuatingCharges_; /**< are there fluctuating charges? */
556      bool usesAtomicVirial_;       /**< are we computing atomic virials? */
557      bool requiresPrepair_;        /**< does this simulation require a pre-pair loop? */
558      bool requiresSkipCorrection_; /**< does this simulation require a skip-correction? */
# Line 546 | Line 561 | namespace OpenMD{
561    public:
562      bool usesElectrostaticAtoms() { return usesElectrostaticAtoms_; }
563      bool usesDirectionalAtoms() { return usesDirectionalAtoms_; }
564 <    bool usesMetallicAtoms() { return usesMetallicAtoms_; }
564 >    bool usesFluctuatingCharges() { return usesFluctuatingCharges_; }
565      bool usesAtomicVirial() { return usesAtomicVirial_; }
566      bool requiresPrepair() { return requiresPrepair_; }
567      bool requiresSkipCorrection() { return requiresSkipCorrection_;}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines