52 |
|
namespace OpenMD { |
53 |
|
|
54 |
|
Electrostatic::Electrostatic(): name_("Electrostatic"), initialized_(false), |
55 |
< |
forceField_(NULL) {} |
55 |
> |
forceField_(NULL), info_(NULL) {} |
56 |
|
|
57 |
|
void Electrostatic::initialize() { |
58 |
|
|
59 |
< |
Globals* simParams_; |
59 |
> |
Globals* simParams_ = info_->getSimParams(); |
60 |
|
|
61 |
|
summationMap_["HARD"] = esm_HARD; |
62 |
|
summationMap_["SWITCHING_FUNCTION"] = esm_SWITCHING_FUNCTION; |
407 |
|
return; |
408 |
|
} |
409 |
|
|
410 |
< |
void Electrostatic::setElectrostaticCutoffRadius( RealType theECR, |
411 |
< |
RealType theRSW ) { |
412 |
< |
cutoffRadius_ = theECR; |
410 |
> |
void Electrostatic::setCutoffRadius( RealType rCut ) { |
411 |
> |
cutoffRadius_ = rCut; |
412 |
|
rrf_ = cutoffRadius_; |
414 |
– |
rt_ = theRSW; |
413 |
|
haveCutoffRadius_ = true; |
414 |
|
} |
415 |
+ |
|
416 |
+ |
void Electrostatic::setSwitchingRadius( RealType rSwitch ) { |
417 |
+ |
rt_ = rSwitch; |
418 |
+ |
} |
419 |
|
void Electrostatic::setElectrostaticSummationMethod( ElectrostaticSummationMethod esm ) { |
420 |
|
summationMethod_ = esm; |
421 |
|
} |