ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/parallel/ForceDecomposition.hpp
(Generate patch)

Comparing:
branches/development/src/parallel/Decomposition.hpp (file contents), Revision 1545 by gezelter, Fri Apr 8 21:25:19 2011 UTC vs.
branches/development/src/parallel/ForceDecomposition.hpp (file contents), Revision 1562 by gezelter, Thu May 12 17:00:14 2011 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2011 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
# Line 39 | Line 39
39   * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42 < #ifndef PARALLEL_DECOMPOSITION_HPP
43 < #define PARALLEL_DECOMPOSITION_HPP
42 > #ifndef PARALLEL_FORCEDECOMPOSITION_HPP
43 > #define PARALLEL_FORCEDECOMPOSITION_HPP
44  
45   #include "brains/SimInfo.hpp"
46   #include "nonbonded/NonBondedInteraction.hpp"
# Line 49 | Line 49 | namespace OpenMD {
49   namespace OpenMD {
50    
51    /**
52 <   * @class Decomposition
53 <   * Decomposition is an interface for passing out and collecting information
54 <   * from many processors at various stages of the main non-bonded ForceLoop.
52 >   * @class ForceDecomposition
53     *
54 +   * ForceDecomposition is an interface for passing out and collecting
55 +   * information from many processors at various stages of the main
56 +   * non-bonded ForceLoop.
57 +   *
58     * The pairwise force calculation has an outer-running loop (the "I"
59     * loop) and an inner-running loop (the "J" loop).  In parallel
60     * decompositions, these loop over different groups of atoms on
# Line 76 | Line 78 | namespace OpenMD {
78     *  end
79     * collectData                        (parallel communication)
80     *
81 <   * Decomposition provides the interface for ForceLoop to do the
81 >   * ForceDecomposition provides the interface for ForceLoop to do the
82     * communication steps and to iterate using the correct set of atoms
83     * and cutoff groups.
84     */
85 <  class Decomposition {
85 >  class ForceDecomposition {
86    public:
87  
88 <    Decomposition(SimInfo* info) : info_(info) {}
89 <    virtual ~Decomposition() {}
88 >    ForceDecomposition(SimInfo* info);
89 >    virtual ~ForceDecomposition() {}
90      
91      virtual void distributeInitialData() = 0;
92      virtual void distributeData() = 0;
# Line 100 | Line 102 | namespace OpenMD {
102      virtual pair<int, int> getGroupTypes(int cg1, int cg2) = 0;
103  
104      // Group->atom bookkeeping
105 <    virtual vector<int> getAtomsInGroupI(int cg1) = 0;
106 <    virtual vector<int> getAtomsInGroupJ(int cg2) = 0;
107 <    virtual Vector3d getAtomToGroupVectorI(int atom1, int cg1) = 0;
108 <    virtual Vector3d getAtomToGroupVectorJ(int atom2, int cg2) = 0;
109 <    virtual RealType getMfactI(int atom1) = 0;
110 <    virtual RealType getMfactJ(int atom2) = 0;
105 >    virtual vector<int> getAtomsInGroupRow(int cg1) = 0;
106 >    virtual vector<int> getAtomsInGroupColumn(int cg2) = 0;
107 >    virtual Vector3d getAtomToGroupVectorRow(int atom1, int cg1) = 0;
108 >    virtual Vector3d getAtomToGroupVectorColumn(int atom2, int cg2) = 0;
109 >    virtual RealType getMfactRow(int atom1) = 0;
110 >    virtual RealType getMfactColumn(int atom2) = 0;
111  
112      // spatial data
113      virtual Vector3d getIntergroupVector(int cg1, int cg2) = 0;
# Line 113 | Line 115 | namespace OpenMD {
115        
116      // atom bookkeeping
117      virtual vector<int> getAtomList() = 0;
118 <    virtual vector<int> getSkipsForAtom(int atom1) = 0
118 >    virtual vector<int> getSkipsForAtom(int atom1) = 0;
119      virtual bool skipAtomPair(int atom1, int atom2) = 0;
120 <    virtual void addForceToAtomI(int atom1, Vector3d fg) = 0;
121 <    virtual void addForceToAtomJ(int atom2, Vector3d fg) = 0;
120 >    virtual void addForceToAtomRow(int atom1, Vector3d fg) = 0;
121 >    virtual void addForceToAtomColumn(int atom2, Vector3d fg) = 0;
122  
123      // filling interaction blocks with pointers
124      virtual InteractionData fillInteractionData(int atom1, int atom2) = 0;
# Line 145 | Line 147 | namespace OpenMD {
147                                         //& column.  It will be up to
148                                         //the specific decomposition
149                                         //method to fill this.
150 +    vector<Vector3i> cellOffsets_;
151 +    int nOffset_;
152    };    
153   }
154   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines