| # | Line 1 | Line 1 | |
|---|---|---|
| 1 | #include <math.h> | |
| 2 | #include <iostream> | |
| 3 | ||
| 4 | – | using namespace std; |
| 4 | ||
| 5 | + | |
| 6 | #ifdef IS_MPI | |
| 7 | #include <mpi.h> | |
| 8 | #endif //is_mpi | |
| # | Line 36 | Line 36 | double Thermo::getKinetic() { | |
| 36 | double mass = integrableObject->getMass(); | |
| 37 | Vector3d vel = integrableObject->getVel(); | |
| 38 | ||
| 39 | < | kinetic = mass * (vel[0]*vel[0] + vel[1]*vel[1] + vel[2]*vel[2]); |
| 39 | > | kinetic += mass * (vel[0]*vel[0] + vel[1]*vel[1] + vel[2]*vel[2]); |
| 40 | ||
| 41 | if (integrableObject->isDirectional()) { | |
| 42 | angMom = integrableObject->getJ(); | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |