ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimInfo.hpp
(Generate patch)

Comparing:
trunk/src/brains/SimInfo.hpp (file contents), Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/brains/SimInfo.hpp (file contents), Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 54 | Line 54
54   #include <utility>
55   #include <vector>
56  
57 < #include "brains/Exclude.hpp"
57 > #include "brains/PairList.hpp"
58   #include "io/Globals.hpp"
59   #include "math/Vector3.hpp"
60   #include "math/SquareMatrix3.hpp"
# Line 62 | Line 62
62   #include "UseTheForce/ForceField.hpp"
63   #include "utils/PropertyMap.hpp"
64   #include "utils/LocalIndexManager.hpp"
65 + #include "nonbonded/Electrostatic.hpp"
66  
67   //another nonsense macro declaration
68 < #define __C
68 > #define __OPENMD_C
69   #include "brains/fSimulation.h"
70  
71 < namespace oopse{
71 > namespace OpenMD{
72  
73    //forward decalration
74    class SnapshotManager;
75    class Molecule;
76    class SelectionManager;
77    class StuntDouble;
78 +  class Electrostatic;
79    /**
80     * @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
81 <   * @brief One of the heavy weight classes of OOPSE, SimInfo maintains a list of molecules.
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
# Line 314 | Line 316 | namespace oopse{
316        return i != molecules_.end() ? i->second : NULL;
317      }
318  
319 +    int getGlobalMolMembership(int id){
320 +      return globalMolMembership_[id];
321 +    }
322 +
323      RealType getRcut() {
324        return rcut_;
325      }
# Line 370 | Line 376 | namespace oopse{
376       * @see #SimCreator::setGlobalIndex
377       */  
378      void setGlobalGroupMembership(const std::vector<int>& globalGroupMembership) {
379 <      assert(globalGroupMembership.size() == nGlobalAtoms_);
379 >      assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
380        globalGroupMembership_ = globalGroupMembership;
381      }
382  
# Line 379 | Line 385 | namespace oopse{
385       * @see #SimCreator::setGlobalIndex
386       */        
387      void setGlobalMolMembership(const std::vector<int>& globalMolMembership) {
388 <      assert(globalMolMembership.size() == nGlobalAtoms_);
388 >      assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
389        globalMolMembership_ = globalMolMembership;
390      }
391  
# Line 437 | Line 443 | namespace oopse{
443      GenericData* getPropertyByName(const std::string& propName);
444  
445      /**
446 <     * add all exclude pairs of a molecule into exclude list.
446 >     * add all special interaction pairs (including excluded
447 >     * interactions) in a molecule into the appropriate lists.
448       */
449 <    void addExcludePairs(Molecule* mol);
449 >    void addInteractionPairs(Molecule* mol);
450  
451      /**
452 <     * remove all exclude pairs which belong to a molecule from exclude list
452 >     * remove all special interaction pairs which belong to a molecule
453 >     * from the appropriate lists.
454       */
455 +    void removeInteractionPairs(Molecule* mol);
456  
448    void removeExcludePairs(Molecule* mol);
457  
450
458      /** Returns the unique atom types of local processor in an array */
459      std::set<AtomType*> getUniqueAtomTypes();
460          
# Line 516 | Line 523 | namespace oopse{
523      std::vector<int> globalGroupMembership_;
524  
525      /**
526 <     * the size of globalGroupMembership_  is nGlobalAtoms. Its index is  global index of an atom, and the
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       */
# Line 538 | Line 545 | namespace oopse{
545      int nConstraints_;        /**< number of constraints in local processors */
546  
547      simtype fInfo_; /**< A dual struct shared by c++/fortran which indicates the atom types in simulation*/
548 <    Exclude exclude_;      
548 >    PairList excludedInteractions_;      
549 >    PairList oneTwoInteractions_;      
550 >    PairList oneThreeInteractions_;      
551 >    PairList oneFourInteractions_;      
552      PropertyMap properties_;                  /**< Generic Property */
553      SnapshotManager* sman_;               /**< SnapshotManager */
554  
# Line 563 | Line 573 | namespace oopse{
573      RealType rsw_;        /**< radius of switching function*/
574      RealType rlist_;      /**< neighbor list radius */
575  
576 <    bool ljsp_; /**< use shifted potential for LJ*/
577 <    bool ljsf_; /**< use shifted force for LJ*/
576 >    int ljsp_; /**< use shifted potential for LJ*/
577 >    int ljsf_; /**< use shifted force for LJ*/
578  
579 <    bool fortranInitialized_; /**< flag indicate whether fortran side
570 <                                 is initialized */
579 >    bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
580      
581      bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
582                              the simulation box dipole moment */
# Line 629 | Line 638 | namespace oopse{
638  
639    };
640  
641 < } //namespace oopse
641 > } //namespace OpenMD
642   #endif //BRAINS_SIMMODEL_HPP
643  

Comparing:
trunk/src/brains/SimInfo.hpp (property svn:keywords), Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/brains/SimInfo.hpp (property svn:keywords), Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines