| 58 | 
  | 
    ForceMatrixDecomposition(SimInfo* info) : ForceDecomposition(info) {}; | 
| 59 | 
  | 
 | 
| 60 | 
  | 
    void distributeInitialData(); | 
| 61 | 
+ | 
    void zeroWorkArrays(); | 
| 62 | 
  | 
    void distributeData(); | 
| 63 | 
  | 
    void collectIntermediateData(); | 
| 64 | 
  | 
    void distributeIntermediateData(); | 
| 92 | 
  | 
 | 
| 93 | 
  | 
    // filling interaction blocks with pointers | 
| 94 | 
  | 
    InteractionData fillInteractionData(int atom1, int atom2); | 
| 95 | 
+ | 
    void unpackInteractionData(InteractionData idat, int atom1, int atom2); | 
| 96 | 
  | 
    InteractionData fillSkipData(int atom1, int atom2); | 
| 97 | 
  | 
 | 
| 98 | 
  | 
  private:  | 
| 99 | 
  | 
    int nLocal_; | 
| 100 | 
  | 
    int nGroups_; | 
| 101 | 
+ | 
    vector<int> identsLocal; | 
| 102 | 
  | 
    vector<int> AtomLocalToGlobal; | 
| 103 | 
  | 
    vector<int> cgLocalToGlobal; | 
| 101 | 
– | 
    vector<RealType> pot_local; | 
| 104 | 
  | 
    vector<RealType> massFactorsLocal; | 
| 105 | 
  | 
    vector<vector<int> > skipsForLocalAtom; | 
| 106 | 
  | 
    vector<vector<int> > toposForLocalAtom; | 
| 121 | 
  | 
    Communicator<Row, RealType>* AtomCommRealRow;  | 
| 122 | 
  | 
    Communicator<Row, Vector3d>* AtomCommVectorRow;  | 
| 123 | 
  | 
    Communicator<Row, Mat3x3d>*  AtomCommMatrixRow;  | 
| 124 | 
+ | 
    Communicator<Row, potVec>* AtomCommPotRow; | 
| 125 | 
  | 
 | 
| 126 | 
  | 
    Communicator<Column, int>* AtomCommIntColumn; | 
| 127 | 
  | 
    Communicator<Column, RealType>* AtomCommRealColumn;  | 
| 128 | 
  | 
    Communicator<Column, Vector3d>* AtomCommVectorColumn;  | 
| 129 | 
< | 
    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn;  | 
| 129 | 
> | 
    Communicator<Column, Mat3x3d>*  AtomCommMatrixColumn; | 
| 130 | 
> | 
    Communicator<Column, potVec>* AtomCommPotColumn;  | 
| 131 | 
  | 
 | 
| 132 | 
  | 
    Communicator<Row, int>* cgCommIntRow; | 
| 133 | 
  | 
    Communicator<Row, Vector3d>* cgCommVectorRow;  | 
| 134 | 
  | 
    Communicator<Column, int>* cgCommIntColumn; | 
| 135 | 
  | 
    Communicator<Column, Vector3d>* cgCommVectorColumn;  | 
| 136 | 
  | 
 | 
| 137 | 
< | 
    vector<vector<RealType> > pot_row; | 
| 138 | 
< | 
    vector<vector<RealType> > pot_col; | 
| 137 | 
> | 
    // work arrays for assembling potential energy | 
| 138 | 
> | 
    vector<potVec> pot_row; | 
| 139 | 
> | 
    vector<potVec> pot_col; | 
| 140 | 
> | 
    potVec pot_local; | 
| 141 | 
  | 
 | 
| 142 | 
  | 
    vector<int> identsRow; | 
| 143 | 
  | 
    vector<int> identsCol; | 
| 144 | 
  | 
 | 
| 145 | 
+ | 
    vector<AtomType*> atypesRow; | 
| 146 | 
+ | 
    vector<AtomType*> atypesCol; | 
| 147 | 
+ | 
 | 
| 148 | 
  | 
    vector<int> AtomRowToGlobal; | 
| 149 | 
  | 
    vector<int> AtomColToGlobal; | 
| 150 | 
  | 
 | 
| 163 | 
  | 
    vector<vector<int> > skipsForRowAtom; | 
| 164 | 
  | 
    vector<vector<int> > toposForRowAtom; | 
| 165 | 
  | 
    vector<vector<int> > topoDistRow; | 
| 157 | 
– | 
 | 
| 158 | 
– | 
 | 
| 166 | 
  | 
#endif | 
| 167 | 
  | 
 | 
| 168 | 
  | 
  }; |