| 1 |
+ |
#include <iostream> |
| 2 |
+ |
|
| 3 |
+ |
using namespace std; |
| 4 |
+ |
|
| 5 |
+ |
|
| 6 |
|
#include <cstdlib> |
| 7 |
|
|
| 8 |
|
#ifdef IS_MPI |
| 48 |
|
double* u_l;; |
| 49 |
|
DirectionalAtom* dAtom; |
| 50 |
|
|
| 46 |
– |
double ut[3]; |
| 47 |
– |
|
| 48 |
– |
//u_l = new double[entry_plug->n_atoms]; |
| 49 |
– |
|
| 51 |
|
short int passedCalcPot = (short int)calcPot; |
| 52 |
|
short int passedCalcStress = (short int)calcStress; |
| 53 |
|
|
| 54 |
< |
// forces are zeroed here, before any are acumulated. |
| 54 |
> |
// forces are zeroed here, before any are accumulated. |
| 55 |
|
// NOTE: do not rezero the forces in Fortran. |
| 56 |
|
|
| 56 |
– |
|
| 57 |
|
for(i=0; i<entry_plug->n_atoms; i++){ |
| 58 |
< |
entry_plug->atoms[i]->zeroForces(); |
| 59 |
< |
|
| 60 |
< |
// if( entry_plug->atoms[i]->isDirectional() ){ |
| 61 |
< |
// dAtom = (DirectionalAtom *)entry_plug->atoms[i]; |
| 62 |
< |
// dAtom->getU(ut); |
| 63 |
< |
|
| 64 |
< |
|
| 65 |
< |
// if(dAtom->getIndex()== 1){ |
| 66 |
< |
// std::cerr << "atom 2's u_l = " << ut[0] << ", " << ut[1] |
| 67 |
< |
// << ", " << ut[2] << "\n"; |
| 68 |
< |
// } |
| 69 |
< |
// } |
| 70 |
< |
|
| 58 |
> |
entry_plug->atoms[i]->zeroForces(); |
| 59 |
|
} |
| 60 |
|
|
| 61 |
|
for(i=0; i<entry_plug->n_mol; i++ ){ |
| 68 |
|
A = Atom::getAmatArray(); |
| 69 |
|
u_l = Atom::getUlArray(); |
| 70 |
|
|
| 83 |
– |
|
| 71 |
|
isError = 0; |
| 72 |
|
entry_plug->lrPot = 0.0; |
| 73 |
|
|
| 86 |
|
&passedCalcStress, |
| 87 |
|
&isError ); |
| 88 |
|
|
| 102 |
– |
// delete[] u_l; |
| 103 |
– |
|
| 89 |
|
if( isError ){ |
| 90 |
|
sprintf( painCave.errMsg, |
| 91 |
|
"Error returned from the fortran force calculation.\n" ); |
