| 526 |
|
int useDirectionalAtom = 0; |
| 527 |
|
int useElectrostatics = 0; |
| 528 |
|
//usePBC and useRF are from simParams |
| 529 |
< |
int usePBC = simParams_->getPBC(); |
| 529 |
> |
int usePBC = simParams_->getUsePeriodicBoundaryConditions(); |
| 530 |
|
int useRF; |
| 531 |
+ |
std::string myMethod; |
| 532 |
|
|
| 533 |
|
// set the useRF logical |
| 534 |
< |
std::string myMethod = simParams_->getElectrostaticSummationMethod(); |
| 535 |
< |
if (myMethod == "REACTION_FIELD") |
| 536 |
< |
useRF = 1; |
| 537 |
< |
else |
| 538 |
< |
useRF = 0; |
| 534 |
> |
useRF = 0; |
| 535 |
> |
if (simParams_->haveElectrostaticSummationMethod()) { |
| 536 |
> |
myMethod = simParams_->getElectrostaticSummationMethod(); |
| 537 |
> |
if (myMethod == "REACTION_FIELD") |
| 538 |
> |
useRF = 1; |
| 539 |
> |
} |
| 540 |
|
|
| 541 |
|
//loop over all of the atom types |
| 542 |
|
for (i = atomTypes.begin(); i != atomTypes.end(); ++i) { |
| 808 |
|
|
| 809 |
|
if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) { |
| 810 |
|
|
| 811 |
< |
if (!simParams_->haveRcut()){ |
| 811 |
> |
if (!simParams_->haveCutoffRadius()){ |
| 812 |
|
sprintf(painCave.errMsg, |
| 813 |
|
"SimCreator Warning: No value was set for the cutoffRadius.\n" |
| 814 |
|
"\tOOPSE will use a default value of 15.0 angstroms" |
| 817 |
|
simError(); |
| 818 |
|
rcut = 15.0; |
| 819 |
|
} else{ |
| 820 |
< |
rcut = simParams_->getRcut(); |
| 820 |
> |
rcut = simParams_->getCutoffRadius(); |
| 821 |
|
} |
| 822 |
|
|
| 823 |
< |
if (!simParams_->haveRsw()){ |
| 823 |
> |
if (!simParams_->haveSwitchingRadius()){ |
| 824 |
|
sprintf(painCave.errMsg, |
| 825 |
|
"SimCreator Warning: No value was set for switchingRadius.\n" |
| 826 |
|
"\tOOPSE will use a default value of\n" |
| 829 |
|
simError(); |
| 830 |
|
rsw = 0.95 * rcut; |
| 831 |
|
} else{ |
| 832 |
< |
rsw = simParams_->getRsw(); |
| 832 |
> |
rsw = simParams_->getSwitchingRadius(); |
| 833 |
|
} |
| 834 |
|
|
| 835 |
|
} else { |
| 836 |
|
// if charge, dipole or reaction field is not used and the cutofff radius is not specified in |
| 837 |
|
//meta-data file, the maximum cutoff radius calculated from forcefiled will be used |
| 838 |
|
|
| 839 |
< |
if (simParams_->haveRcut()) { |
| 840 |
< |
rcut = simParams_->getRcut(); |
| 839 |
> |
if (simParams_->haveCutoffRadius()) { |
| 840 |
> |
rcut = simParams_->getCutoffRadius(); |
| 841 |
|
} else { |
| 842 |
|
//set cutoff radius to the maximum cutoff radius based on atom types in the whole system |
| 843 |
|
rcut = calcMaxCutoffRadius(); |
| 844 |
|
} |
| 845 |
|
|
| 846 |
< |
if (simParams_->haveRsw()) { |
| 847 |
< |
rsw = simParams_->getRsw(); |
| 846 |
> |
if (simParams_->haveSwitchingRadius()) { |
| 847 |
> |
rsw = simParams_->getSwitchingRadius(); |
| 848 |
|
} else { |
| 849 |
|
rsw = rcut; |
| 850 |
|
} |
| 861 |
|
int cp = TRADITIONAL_CUTOFF_POLICY; |
| 862 |
|
if (simParams_->haveCutoffPolicy()) { |
| 863 |
|
std::string myPolicy = simParams_->getCutoffPolicy(); |
| 864 |
+ |
toUpper(myPolicy); |
| 865 |
|
if (myPolicy == "MIX") { |
| 866 |
|
cp = MIX_CUTOFF_POLICY; |
| 867 |
|
} else { |
| 904 |
|
|
| 905 |
|
if (simParams_->haveElectrostaticSummationMethod()) { |
| 906 |
|
std::string myMethod = simParams_->getElectrostaticSummationMethod(); |
| 907 |
+ |
toUpper(myMethod); |
| 908 |
|
if (myMethod == "NONE") { |
| 909 |
|
esm = NONE; |
| 910 |
|
} else { |
