ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1050 by chrisfen, Fri Sep 22 22:19:59 2006 UTC vs.
Revision 1089 by chrisfen, Wed Nov 1 22:22:44 2006 UTC

# Line 669 | Line 669 | namespace oopse {
669      // set the useRF logical
670      useRF = 0;
671      useSF = 0;
672 +    useSP = 0;
673  
674  
675      if (simParams_->haveElectrostaticSummationMethod()) {
676        std::string myMethod = simParams_->getElectrostaticSummationMethod();
677        toUpper(myMethod);
678        if (myMethod == "REACTION_FIELD"){
679 <        useRF=1;
679 >        useRF = 1;
680        } else if (myMethod == "SHIFTED_FORCE"){
681          useSF = 1;
682        } else if (myMethod == "SHIFTED_POTENTIAL"){
# Line 1125 | Line 1126 | namespace oopse {
1126                       "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1127              painCave.isFatal = 0;
1128              simError();
1129 +          } else {
1130 +            alphaVal = simParams_->getDampingAlpha();
1131            }
1132 +          
1133          } else {
1134            // throw error        
1135            sprintf( painCave.errMsg,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines