198 |
|
} |
199 |
|
|
200 |
|
|
201 |
< |
if (entry_plug->useThermInt) { |
202 |
< |
myStunts = entry_plug->integrableObjects; |
201 |
> |
if (entry_plug->useSolidThermInt && !entry_plug->useLiquidThermInt) { |
202 |
|
|
203 |
|
factor = pow(entry_plug->thermIntLambda, entry_plug->thermIntK); |
204 |
< |
for (i=0; i < myStunts.size(); i++) { |
204 |
> |
for (i=0; i < entry_plug->integrableObjects.size(); i++) { |
205 |
|
for (j=0; j< 3; j++) |
206 |
|
frc[3*i + j] *= factor; |
207 |
< |
if (myStunts[i]->isDirectional()) { |
207 |
> |
if (entry_plug->integrableObjects[i]->isDirectional()) { |
208 |
|
for (j=0; j< 3; j++) |
209 |
|
trq[3*i + j] *= factor; |
210 |
|
} |
211 |
|
} |
212 |
|
entry_plug->vRaw = entry_plug->lrPot; |
213 |
|
entry_plug->lrPot *= factor; |
214 |
< |
entry_plug->lrPot += entry_plug->restraint->Calc_Restraint_Forces(myStunts); |
214 |
> |
entry_plug->lrPot += entry_plug->restraint->Calc_Restraint_Forces(entry_plug->integrableObjects); |
215 |
> |
entry_plug->vHarm = entry_plug->restraint->getVharm(); |
216 |
> |
} |
217 |
> |
|
218 |
> |
if (entry_plug->useLiquidThermInt) { |
219 |
> |
|
220 |
> |
factor = pow(entry_plug->thermIntLambda, entry_plug->thermIntK); |
221 |
> |
for (i=0; i < entry_plug->integrableObjects.size(); i++) { |
222 |
> |
for (j=0; j< 3; j++) |
223 |
> |
frc[3*i + j] *= factor; |
224 |
> |
if (entry_plug->integrableObjects[i]->isDirectional()) { |
225 |
> |
for (j=0; j< 3; j++) |
226 |
> |
trq[3*i + j] *= factor; |
227 |
> |
} |
228 |
> |
} |
229 |
> |
entry_plug->vRaw = entry_plug->lrPot; |
230 |
> |
entry_plug->lrPot *= factor; |
231 |
> |
entry_plug->lrPot += entry_plug->restraint->Calc_Restraint_Forces(entry_plug->integrableObjects); |
232 |
|
entry_plug->vHarm = entry_plug->restraint->getVharm(); |
233 |
|
} |
234 |
|
|
266 |
|
|
267 |
|
|
268 |
|
void ForceFields::initRestraints(){ |
269 |
< |
|
269 |
> |
int i; |
270 |
|
// store the initial info. |
271 |
< |
entry_plug->restraint->Store_Init_Info(); |
271 |
> |
// set the omega values to zero |
272 |
> |
for (i=0; i<entry_plug->integrableObjects.size(); i++) |
273 |
> |
entry_plug->integrableObjects[i]->setZangle( 0.0 ); |
274 |
|
|
275 |
+ |
entry_plug->restraint->Store_Init_Info(entry_plug->integrableObjects); |
276 |
+ |
|
277 |
|
} |
278 |
|
|
279 |
|
void ForceFields::dumpzAngle(){ |
280 |
|
|
281 |
|
// store the initial info. |
282 |
< |
entry_plug->restraint->Write_zAngle_File(); |
282 |
> |
entry_plug->restraint->Write_zAngle_File(entry_plug->integrableObjects); |
283 |
|
|
284 |
|
} |