| 3 |
|
using namespace std; |
| 4 |
|
|
| 5 |
|
|
| 6 |
< |
#include <cstdlib> |
| 6 |
> |
#include <stdlib.h> |
| 7 |
|
|
| 8 |
|
#ifdef IS_MPI |
| 9 |
|
#include <mpi.h> |
| 26 |
|
|
| 27 |
|
//calc rCut and rList |
| 28 |
|
|
| 29 |
< |
entry_plug->setRcut( 2.5 * bigSigma ); |
| 29 |
> |
entry_plug->setDefaultRcut( 2.5 * bigSigma ); |
| 30 |
> |
|
| 31 |
|
} |
| 32 |
|
|
| 33 |
|
void ForceFields::doForces( int calcPot, int calcStress ){ |
| 38 |
|
double* trq; |
| 39 |
|
double* A; |
| 40 |
|
double* u_l;; |
| 41 |
< |
DirectionalAtom* dAtom; |
| 41 |
> |
SimState* config; |
| 42 |
|
|
| 43 |
|
short int passedCalcPot = (short int)calcPot; |
| 44 |
|
short int passedCalcStress = (short int)calcStress; |
| 54 |
|
entry_plug->molecules[i].calcForces(); |
| 55 |
|
} |
| 56 |
|
|
| 57 |
+ |
config = entry_plug->getConfiguration(); |
| 58 |
|
|
| 59 |
< |
|
| 60 |
< |
frc = Atom::getFrcArray(); |
| 61 |
< |
pos = Atom::getPosArray(); |
| 62 |
< |
trq = Atom::getTrqArray(); |
| 63 |
< |
A = Atom::getAmatArray(); |
| 62 |
< |
u_l = Atom::getUlArray(); |
| 59 |
> |
frc = config->getFrcArray(); |
| 60 |
> |
pos = config->getPosArray(); |
| 61 |
> |
trq = config->getTrqArray(); |
| 62 |
> |
A = config->getAmatArray(); |
| 63 |
> |
u_l = config->getUlArray(); |
| 64 |
|
|
| 65 |
|
isError = 0; |
| 66 |
|
entry_plug->lrPot = 0.0; |
| 69 |
|
entry_plug->tau[i] = 0.0; |
| 70 |
|
} |
| 71 |
|
|
| 72 |
+ |
|
| 73 |
|
fortranForceLoop( pos, |
| 74 |
|
A, |
| 75 |
|
u_l, |
| 81 |
|
&passedCalcStress, |
| 82 |
|
&isError ); |
| 83 |
|
|
| 84 |
+ |
|
| 85 |
+ |
|
| 86 |
|
if( isError ){ |
| 87 |
|
sprintf( painCave.errMsg, |
| 88 |
|
"Error returned from the fortran force calculation.\n" ); |
