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 ){ |
39 |
|
double* A; |
40 |
|
double* u_l;; |
41 |
|
DirectionalAtom* dAtom; |
42 |
+ |
SimState* config; |
43 |
|
|
46 |
– |
double ut[3]; |
47 |
– |
|
48 |
– |
//u_l = new double[entry_plug->n_atoms]; |
49 |
– |
|
44 |
|
short int passedCalcPot = (short int)calcPot; |
45 |
|
short int passedCalcStress = (short int)calcStress; |
46 |
|
|
47 |
< |
// forces are zeroed here, before any are acumulated. |
47 |
> |
// forces are zeroed here, before any are accumulated. |
48 |
|
// NOTE: do not rezero the forces in Fortran. |
49 |
|
|
56 |
– |
|
50 |
|
for(i=0; i<entry_plug->n_atoms; i++){ |
51 |
< |
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 |
< |
|
51 |
> |
entry_plug->atoms[i]->zeroForces(); |
52 |
|
} |
53 |
|
|
54 |
|
for(i=0; i<entry_plug->n_mol; i++ ){ |
55 |
|
entry_plug->molecules[i].calcForces(); |
56 |
|
} |
57 |
|
|
58 |
< |
frc = Atom::getFrcArray(); |
78 |
< |
pos = Atom::getPosArray(); |
79 |
< |
trq = Atom::getTrqArray(); |
80 |
< |
A = Atom::getAmatArray(); |
81 |
< |
u_l = Atom::getUlArray(); |
82 |
< |
|
58 |
> |
config = entry_plug->getConfiguration(); |
59 |
|
|
60 |
+ |
frc = config->getFrcArray(); |
61 |
+ |
pos = config->getPosArray(); |
62 |
+ |
trq = config->getTrqArray(); |
63 |
+ |
A = config->getAmatArray(); |
64 |
+ |
u_l = config->getUlArray(); |
65 |
+ |
|
66 |
|
isError = 0; |
67 |
|
entry_plug->lrPot = 0.0; |
68 |
|
|
81 |
|
&passedCalcStress, |
82 |
|
&isError ); |
83 |
|
|
102 |
– |
// delete[] u_l; |
103 |
– |
|
84 |
|
if( isError ){ |
85 |
|
sprintf( painCave.errMsg, |
86 |
|
"Error returned from the fortran force calculation.\n" ); |
93 |
|
"returned from the force calculation.\n" ); |
94 |
|
MPIcheckPoint(); |
95 |
|
#endif // is_mpi |
96 |
+ |
|
97 |
|
|
98 |
|
} |
99 |
|
|