34 |
|
setTemp = 0; |
35 |
|
thermalTime = 0.0; |
36 |
|
rCut = 0.0; |
37 |
+ |
ecr = 0.0; |
38 |
+ |
est = 0.0; |
39 |
|
|
40 |
|
usePBC = 0; |
41 |
|
useLJ = 0; |
124 |
|
refreshSim(); |
125 |
|
} |
126 |
|
|
127 |
< |
if (rCut > maxCutoff) { |
127 |
> |
if( ecr > maxCutoff ){ |
128 |
> |
|
129 |
|
sprintf( painCave.errMsg, |
130 |
< |
"New Box size is forcing cutoff radius down to %lf\n", |
130 |
> |
"New Box size is forcing electrostatic cutoff radius " |
131 |
> |
"down to %lf\n", |
132 |
|
maxCutoff ); |
133 |
|
painCave.isFatal = 0; |
134 |
|
simError(); |
135 |
|
|
136 |
< |
status = 0; |
137 |
< |
LJ_new_rcut(&rCut, &status); |
138 |
< |
if (status != 0) { |
139 |
< |
sprintf( painCave.errMsg, |
136 |
< |
"Error in recomputing LJ shifts based on new rcut\n"); |
137 |
< |
painCave.isFatal = 1; |
138 |
< |
simError(); |
139 |
< |
} |
136 |
> |
ecr = maxCutoff; |
137 |
> |
est = 0.05 * ecr; |
138 |
> |
|
139 |
> |
refreshSim(); |
140 |
|
} |
141 |
+ |
|
142 |
|
} |
143 |
|
|
144 |
|
|