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 1467 by gezelter, Sat Jul 17 15:33:03 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 64 | Line 64
64   #include "utils/LocalIndexManager.hpp"
65  
66   //another nonsense macro declaration
67 < #define __C
67 > #define __OPENMD_C
68   #include "brains/fSimulation.h"
69  
70 < namespace oopse{
70 > namespace OpenMD{
71  
72    //forward decalration
73    class SnapshotManager;
# Line 76 | Line 76 | namespace oopse{
76    class StuntDouble;
77    /**
78     * @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
79 <   * @brief One of the heavy weight classes of OOPSE, SimInfo maintains a list of molecules.
79 >   * @brief One of the heavy weight classes of OpenMD, SimInfo maintains a list of molecules.
80      * The Molecule class maintains all of the concrete objects
81      * (atoms, bond, bend, torsions, inversions, rigid bodies, cutoff groups,
82      * constraints). In both the single and parallel versions, atoms and
# Line 312 | Line 312 | namespace oopse{
312        i = molecules_.find(index);
313  
314        return i != molecules_.end() ? i->second : NULL;
315 +    }
316 +
317 +    int getGlobalMolMembership(int id){
318 +      return globalMolMembership_[id];
319      }
320  
321      RealType getRcut() {
# Line 370 | Line 374 | namespace oopse{
374       * @see #SimCreator::setGlobalIndex
375       */  
376      void setGlobalGroupMembership(const std::vector<int>& globalGroupMembership) {
377 <      assert(globalGroupMembership.size() == nGlobalAtoms_);
377 >      assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
378        globalGroupMembership_ = globalGroupMembership;
379      }
380  
# Line 379 | Line 383 | namespace oopse{
383       * @see #SimCreator::setGlobalIndex
384       */        
385      void setGlobalMolMembership(const std::vector<int>& globalMolMembership) {
386 <      assert(globalMolMembership.size() == nGlobalAtoms_);
386 >      assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
387        globalMolMembership_ = globalMolMembership;
388      }
389  
# Line 437 | Line 441 | namespace oopse{
441      GenericData* getPropertyByName(const std::string& propName);
442  
443      /**
444 <     * add all exclude pairs of a molecule into exclude list.
444 >     * add all special interaction pairs (including excluded
445 >     * interactions) in a molecule into the appropriate lists.
446       */
447 <    void addExcludePairs(Molecule* mol);
447 >    void addInteractionPairs(Molecule* mol);
448  
449      /**
450 <     * remove all exclude pairs which belong to a molecule from exclude list
450 >     * remove all special interaction pairs which belong to a molecule
451 >     * from the appropriate lists.
452       */
453 +    void removeInteractionPairs(Molecule* mol);
454  
448    void removeExcludePairs(Molecule* mol);
455  
450
456      /** Returns the unique atom types of local processor in an array */
457      std::set<AtomType*> getUniqueAtomTypes();
458          
# Line 516 | Line 521 | namespace oopse{
521      std::vector<int> globalGroupMembership_;
522  
523      /**
524 <     * the size of globalGroupMembership_  is nGlobalAtoms. Its index is  global index of an atom, and the
524 >     * the size of globalMolMembership_  is nGlobalAtoms. Its index is  global index of an atom, and the
525       * corresponding content is the global index of molecule this atom belong to.
526       * It is filled by SimCreator once and only once, since it is never changed during the simulation.
527       */
# Line 538 | Line 543 | namespace oopse{
543      int nConstraints_;        /**< number of constraints in local processors */
544  
545      simtype fInfo_; /**< A dual struct shared by c++/fortran which indicates the atom types in simulation*/
546 <    Exclude exclude_;      
546 >    PairList excludedInteractions_;      
547 >    PairList oneTwoInteractions_;      
548 >    PairList oneThreeInteractions_;      
549 >    PairList oneFourInteractions_;      
550      PropertyMap properties_;                  /**< Generic Property */
551      SnapshotManager* sman_;               /**< SnapshotManager */
552  
# Line 563 | Line 571 | namespace oopse{
571      RealType rsw_;        /**< radius of switching function*/
572      RealType rlist_;      /**< neighbor list radius */
573  
574 <    bool ljsp_; /**< use shifted potential for LJ*/
575 <    bool ljsf_; /**< use shifted force for LJ*/
574 >    int ljsp_; /**< use shifted potential for LJ*/
575 >    int ljsf_; /**< use shifted force for LJ*/
576  
577 <    bool fortranInitialized_; /**< flag indicate whether fortran side
570 <                                 is initialized */
577 >    bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
578      
579      bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
580                              the simulation box dipole moment */
# Line 629 | Line 636 | namespace oopse{
636  
637    };
638  
639 < } //namespace oopse
639 > } //namespace OpenMD
640   #endif //BRAINS_SIMMODEL_HPP
641  

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 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines