| 600 |
|
//setup fortran force field |
| 601 |
|
/** @deprecate */ |
| 602 |
|
int isError = 0; |
| 603 |
+ |
|
| 604 |
+ |
setupCutoff(); |
| 605 |
|
|
| 606 |
|
setupElectrostaticSummationMethod( isError ); |
| 607 |
|
setupSwitchingFunction(); |
| 613 |
|
painCave.isFatal = 1; |
| 614 |
|
simError(); |
| 615 |
|
} |
| 614 |
– |
|
| 615 |
– |
|
| 616 |
– |
setupCutoff(); |
| 616 |
|
|
| 617 |
|
calcNdf(); |
| 618 |
|
calcNdfRaw(); |
| 1073 |
|
int sm = UNDAMPED; |
| 1074 |
|
RealType alphaVal; |
| 1075 |
|
RealType dielectric; |
| 1076 |
< |
|
| 1076 |
> |
|
| 1077 |
|
errorOut = isError; |
| 1079 |
– |
alphaVal = simParams_->getDampingAlpha(); |
| 1078 |
|
dielectric = simParams_->getDielectric(); |
| 1079 |
|
|
| 1080 |
|
if (simParams_->haveElectrostaticSummationMethod()) { |
| 1120 |
|
if (myScreen == "DAMPED") { |
| 1121 |
|
sm = DAMPED; |
| 1122 |
|
if (!simParams_->haveDampingAlpha()) { |
| 1123 |
< |
//throw error |
| 1123 |
> |
// first set a cutoff dependent alpha value |
| 1124 |
> |
// we assume alpha depends linearly with rcut from 0 to 20.5 ang |
| 1125 |
> |
alphaVal = 0.5125 - rcut_* 0.025; |
| 1126 |
> |
// for values rcut > 20.5, alpha is zero |
| 1127 |
> |
if (alphaVal < 0) alphaVal = 0; |
| 1128 |
> |
|
| 1129 |
> |
// throw warning |
| 1130 |
|
sprintf( painCave.errMsg, |
| 1131 |
|
"SimInfo warning: dampingAlpha was not specified in the input file.\n" |
| 1132 |
< |
"\tA default value of %f (1/ang) will be used.\n", alphaVal); |
| 1132 |
> |
"\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_); |
| 1133 |
|
painCave.isFatal = 0; |
| 1134 |
|
simError(); |
| 1135 |
|
} |
