ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 2302 by chrisfen, Fri Sep 16 16:07:39 2005 UTC vs.
Revision 2303 by chrisfen, Fri Sep 16 19:00:12 2005 UTC

# Line 53 | Line 53
53   #include "math/Vector3.hpp"
54   #include "primitives/Molecule.hpp"
55   #include "UseTheForce/fCutoffPolicy.h"
56 < #include "UseTheForce/fCoulombicCorrection.h"
56 > #include "UseTheForce/Darkside/fElectrostaticSummationMethod.h"
57   #include "UseTheForce/doForces_interface.h"
58   #include "UseTheForce/notifyCutoffs_interface.h"
59   #include "utils/MemoryUtils.hpp"
# Line 868 | Line 868 | namespace oopse {
868      errorOut = isError;
869  
870      if (simParams_->haveElectrostaticSummationMethod()) {
871 <      std::string myCorrection = simParams_->getElectrostaticSummationMethod();
871 >      std::string myMethod = simParams_->getElectrostaticSummationMethod();
872        if (myMethod == "NONE") {
873          esm = NONE;
874        } else {
# Line 876 | Line 876 | namespace oopse {
876            esm = UNDAMPED_WOLF;
877          } else {
878            if (myMethod == "DAMPED_WOLF") {            
879 <            esm = WOLF;
879 >            esm = DAMPED_WOLF;
880              if (!simParams_->haveDampingAlpha()) {
881                //throw error
882                sprintf( painCave.errMsg,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines