# | Line 36 | Line 36 | |
---|---|---|
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). |
39 | > | * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
40 | > | * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
41 | */ | |
42 | #include "parallel/ForceMatrixDecomposition.hpp" | |
43 | #include "math/SquareMatrix3.hpp" | |
# | Line 950 | Line 951 | namespace OpenMD { | |
951 | } | |
952 | ||
953 | #else | |
954 | + | |
955 | + | |
956 | + | // cerr << "atoms = " << atom1 << " " << atom2 << "\n"; |
957 | + | // cerr << "pos1 = " << snap_->atomData.position[atom1] << "\n"; |
958 | + | // cerr << "pos2 = " << snap_->atomData.position[atom2] << "\n"; |
959 | ||
960 | idat.atypes = make_pair( atypesLocal[atom1], atypesLocal[atom2]); | |
961 | //idat.atypes = make_pair( ff_->getAtomType(idents[atom1]), | |
# | Line 1000 | Line 1006 | namespace OpenMD { | |
1006 | ||
1007 | void ForceMatrixDecomposition::unpackInteractionData(InteractionData &idat, int atom1, int atom2) { | |
1008 | #ifdef IS_MPI | |
1009 | < | pot_row[atom1] += 0.5 * *(idat.pot); |
1010 | < | pot_col[atom2] += 0.5 * *(idat.pot); |
1009 | > | pot_row[atom1] += RealType(0.5) * *(idat.pot); |
1010 | > | pot_col[atom2] += RealType(0.5) * *(idat.pot); |
1011 | ||
1012 | atomRowData.force[atom1] += *(idat.f1); | |
1013 | atomColData.force[atom2] -= *(idat.f1); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |