ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1930 by gezelter, Mon Aug 19 13:51:04 2013 UTC vs.
Revision 1940 by gezelter, Fri Nov 1 19:31:41 2013 UTC

# Line 47 | Line 47
47   * @version 1.0
48   */
49  
50 + #ifdef IS_MPI
51 + #include <mpi.h>
52 + #endif
53   #include <algorithm>
54   #include <set>
55   #include <map>
# Line 61 | Line 64
64   #include "io/ForceFieldOptions.hpp"
65   #include "brains/ForceField.hpp"
66   #include "nonbonded/SwitchingFunction.hpp"
64 #ifdef IS_MPI
65 #include <mpi.h>
66 #endif
67  
68   using namespace std;
69   namespace OpenMD {
# Line 372 | Line 372 | namespace OpenMD {
372  
373    void SimInfo::addInteractionPairs(Molecule* mol) {
374      ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
375    vector<Atom*>::iterator atomIter;
375      vector<Bond*>::iterator bondIter;
376      vector<Bend*>::iterator bendIter;
377      vector<Torsion*>::iterator torsionIter;
378      vector<Inversion*>::iterator inversionIter;
380    Atom* atom;
379      Bond* bond;
380      Bend* bend;
381      Torsion* torsion;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines