| 19 |
|
the_integrator = NULL; |
| 20 |
|
setTemp = 0; |
| 21 |
|
thermalTime = 0.0; |
| 22 |
+ |
rCut = 0.0; |
| 23 |
|
|
| 24 |
|
usePBC = 0; |
| 25 |
|
useLJ = 0; |
| 38 |
|
|
| 39 |
|
simtype fInfo; |
| 40 |
|
int isError; |
| 41 |
+ |
int* excl; |
| 42 |
|
|
| 43 |
|
fInfo.box[0] = box_x; |
| 44 |
|
fInfo.box[1] = box_y; |
| 51 |
|
fInfo.dielect = dielectric; |
| 52 |
|
|
| 53 |
|
fInfo.SIM_uses_PBC = usePBC; |
| 54 |
< |
fInfo.SIM_uses_LJ = useLJ; |
| 54 |
> |
// fInfo.SIM_uses_LJ = useLJ; |
| 55 |
> |
fInfo.SIM_uses_LJ = 0; |
| 56 |
|
//fInfo.SIM_uses_sticky = useSticky; |
| 57 |
|
fInfo.SIM_uses_sticky = 0; |
| 58 |
|
fInfo.SIM_uses_dipoles = useDipole; |
| 59 |
+ |
//fInfo.SIM_uses_dipoles = 0; |
| 60 |
|
fInfo.SIM_uses_RF = useReactionField; |
| 61 |
|
fInfo.SIM_uses_GB = useGB; |
| 62 |
|
fInfo.SIM_uses_EAM = useEAM; |
| 63 |
|
|
| 64 |
+ |
excl = Exclude::getArray(); |
| 65 |
|
|
| 66 |
|
isError = 0; |
| 67 |
|
|
| 74 |
|
globalExcludes; |
| 75 |
|
isError; |
| 76 |
|
|
| 77 |
< |
setFsimulation( &fInfo, &n_atoms, identArray, &n_exclude, excludes, &nGlobalExcludes, globalExcludes, &isError ); |
| 77 |
> |
setFsimulation( &fInfo, &n_atoms, identArray, &n_exclude, excl, |
| 78 |
> |
&nGlobalExcludes, globalExcludes, &isError ); |
| 79 |
|
|
| 80 |
|
if( isError ){ |
| 81 |
|
|