# | Line 35 | Line 35 | |
---|---|---|
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). |
38 | > | * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). |
39 | * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). | |
40 | * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). | |
41 | */ | |
42 | ||
43 | + | #ifdef IS_MPI |
44 | + | #include <mpi.h> |
45 | + | #endif |
46 | + | |
47 | #include <algorithm> | |
48 | #include <cassert> | |
49 | #include <string> | |
# | Line 47 | Line 51 | |
51 | ||
52 | #include "utils/OpenMDBitSet.hpp" | |
53 | #include "utils/Algorithm.hpp" | |
50 | – | #ifdef IS_MPI |
51 | – | #include <mpi.h> |
52 | – | #endif |
54 | ||
55 | namespace OpenMD { | |
56 | int OpenMDBitSet::countBits() { | |
# | Line 209 | Line 210 | namespace OpenMD { | |
210 | ||
211 | std::vector<int> bsInt(bitset_.begin(), bitset_.end()); | |
212 | ||
213 | < | MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bsInt[0], |
214 | < | bsInt.size(), MPI::INT, MPI::LOR); |
213 | > | MPI_Allreduce(MPI_IN_PLACE, &bsInt[0], |
214 | > | bsInt.size(), MPI_INT, MPI_LOR, MPI_COMM_WORLD); |
215 | ||
216 | std::transform(bsInt.begin(), bsInt.end(), | |
217 | std::back_inserter( result.bitset_ ), to_bool<int>()); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |