1 |
+ |
#include <iostream> |
2 |
+ |
|
3 |
+ |
using namespace std; |
4 |
+ |
|
5 |
+ |
|
6 |
|
#include <cstdlib> |
7 |
|
|
8 |
|
#ifdef IS_MPI |
26 |
|
|
27 |
|
//calc rCut and rList |
28 |
|
|
29 |
< |
entry_plug->rCut = 2.5 * bigSigma; |
30 |
< |
if(entry_plug->rCut > (entry_plug->box_x / 2.0)) |
26 |
< |
entry_plug->rCut = entry_plug->box_x / 2.0; |
27 |
< |
if(entry_plug->rCut > (entry_plug->box_y / 2.0)) |
28 |
< |
entry_plug->rCut = entry_plug->box_y / 2.0; |
29 |
< |
if(entry_plug->rCut > (entry_plug->box_z / 2.0)) |
30 |
< |
entry_plug->rCut = entry_plug->box_z / 2.0; |
31 |
< |
|
32 |
< |
entry_plug->rList = entry_plug->rCut + 1.0; |
33 |
< |
|
29 |
> |
entry_plug->setRcut( 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 |
< |
frc = Atom::getFrcArray(); |
61 |
< |
pos = Atom::getPosArray(); |
62 |
< |
trq = Atom::getTrqArray(); |
63 |
< |
A = Atom::getAmatArray(); |
64 |
< |
u_l = Atom::getUlArray(); |
57 |
> |
config = entry_plug->getConfiguration(); |
58 |
|
|
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; |
67 |
|
|
92 |
|
"returned from the force calculation.\n" ); |
93 |
|
MPIcheckPoint(); |
94 |
|
#endif // is_mpi |
95 |
+ |
|
96 |
|
|
97 |
|
} |
98 |
|
|