969 |
|
if (simParams_->haveSwitchingRadius()) { |
970 |
|
rsw_ = simParams_->getSwitchingRadius(); |
971 |
|
} else { |
972 |
< |
rsw_ = rcut_; |
973 |
< |
} |
972 |
> |
if (fInfo_.SIM_uses_Charges | |
973 |
> |
fInfo_.SIM_uses_Dipoles | |
974 |
> |
fInfo_.SIM_uses_RF) { |
975 |
> |
|
976 |
> |
rsw_ = 0.85 * rcut_; |
977 |
> |
sprintf(painCave.errMsg, |
978 |
> |
"SimCreator Warning: No value was set for the switchingRadius.\n" |
979 |
> |
"\tOOPSE will use a default value of 85\% of the cutoffRadius" |
980 |
> |
"\tswitchingRadius = %f. for this simulation\n", rsw_); |
981 |
> |
painCave.isFatal = 0; |
982 |
> |
simError(); |
983 |
> |
} else { |
984 |
> |
rsw_ = rcut_; |
985 |
> |
sprintf(painCave.errMsg, |
986 |
> |
"SimCreator Warning: No value was set for the switchingRadius.\n" |
987 |
> |
"\tOOPSE will use the same value as the cutoffRadius.\n" |
988 |
> |
"\tswitchingRadius = %f. for this simulation\n", rsw_); |
989 |
> |
painCave.isFatal = 0; |
990 |
> |
simError(); |
991 |
> |
} |
992 |
> |
|
993 |
|
notifyFortranCutoffs(&rcut_, &rsw_); |
994 |
|
|
995 |
|
} else { |
1117 |
|
} |
1118 |
|
|
1119 |
|
// let's pass some summation method variables to fortran |
1120 |
< |
setElectrostaticSumMethod( &esm ); |
1120 |
> |
setElectrostaticSummationMethod( &esm ); |
1121 |
|
setFortranElectrostaticMethod( &esm ); |
1122 |
|
setScreeningMethod( &sm ); |
1123 |
|
setDampingAlpha( &alphaVal ); |