| 46 |  | #include "brains/SimInfo.hpp" | 
| 47 |  | #include "brains/SnapshotManager.hpp" | 
| 48 |  | #include "nonbonded/NonBondedInteraction.hpp" | 
| 49 | – | #include "nonbonded/Cutoffs.hpp" | 
| 49 |  | #include "nonbonded/InteractionManager.hpp" | 
| 50 |  | #include "utils/Tuple.hpp" | 
| 51 |  |  | 
| 52 |  | using namespace std; | 
| 53 | < | namespace OpenMD { | 
| 55 | < |  | 
| 56 | < | typedef tuple3<RealType, RealType, RealType> groupCutoffs; | 
| 53 | > | namespace OpenMD { | 
| 54 |  |  | 
| 55 |  | /** | 
| 56 |  | * @class ForceDecomposition | 
| 110 |  |  | 
| 111 |  | // neighbor list routines | 
| 112 |  | virtual bool checkNeighborList(); | 
| 113 | < | virtual vector<pair<int, int> >  buildNeighborList() = 0; | 
| 113 | > | virtual void buildNeighborList(vector<int>& neighborList, vector<int>& point) = 0; | 
| 114 |  |  | 
| 115 | < | // how to handle cutoffs: | 
| 116 | < | void setCutoffPolicy(CutoffPolicy cp) {cutoffPolicy_ = cp;} | 
| 120 | < | void setUserCutoff(RealType rcut) {userCutoff_ = rcut; userChoseCutoff_ = true; } | 
| 121 | < |  | 
| 115 | > | void setCutoffRadius(RealType rCut); | 
| 116 | > |  | 
| 117 |  | // group bookkeeping | 
| 123 | – | virtual groupCutoffs getGroupCutoffs(int cg1, int cg2) = 0; | 
| 118 |  | virtual Vector3d& getGroupVelocityColumn(int atom2) = 0; | 
| 119 |  |  | 
| 120 |  | // Group->atom bookkeeping | 
| 141 |  | virtual Vector3d& getAtomVelocityColumn(int atom2) = 0; | 
| 142 |  |  | 
| 143 |  | // filling interaction blocks with pointers | 
| 144 | < | virtual void fillInteractionData(InteractionData &idat, int atom1, int atom2) = 0; | 
| 144 | > | virtual void fillInteractionData(InteractionData &idat, int atom1, int atom2, bool newAtom1 = true) = 0; | 
| 145 |  | virtual void unpackInteractionData(InteractionData &idat, int atom1, int atom2) = 0; | 
| 146 |  |  | 
| 147 |  | virtual void fillSelfData(SelfData &sdat, int atom1); | 
| 159 |  | int storageLayout_; | 
| 160 |  | bool needVelocities_; | 
| 161 |  | bool usePeriodicBoundaryConditions_; | 
| 162 | < | RealType skinThickness_;   /**< Verlet neighbor list skin thickness */ | 
| 163 | < | RealType largestRcut_; | 
| 162 | > | RealType skinThickness_;   /**< Verlet neighbor list skin thickness */ | 
| 163 | > | RealType rCut_; | 
| 164 | > | RealType rList_; | 
| 165 | > | RealType rListSq_; | 
| 166 |  |  | 
| 167 |  | vector<int> idents; | 
| 168 | + | vector<int> regions; | 
| 169 |  | potVec pairwisePot; | 
| 170 |  | potVec embeddingPot; | 
| 171 |  | potVec excludedPot; | 
| 190 |  | Vector3i nCells_; | 
| 191 |  | vector<vector<int> > cellList_; | 
| 192 |  | vector<Vector3d> saved_CG_positions_; | 
| 196 | – |  | 
| 197 | – | bool userChoseCutoff_; | 
| 198 | – | RealType userCutoff_; | 
| 199 | – | CutoffPolicy cutoffPolicy_; | 
| 200 | – |  | 
| 201 | – | map<pair<int, int>, tuple3<RealType, RealType, RealType> > gTypeCutoffMap; | 
| 202 | – |  | 
| 193 |  | }; | 
| 194 |  | } | 
| 195 |  | #endif |