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 1024 by tim, Wed Aug 30 18:42:29 2006 UTC vs.
Revision 1050 by chrisfen, Fri Sep 22 22:19:59 2006 UTC

# Line 600 | Line 600 | namespace oopse {
600      //setup fortran force field
601      /** @deprecate */    
602      int isError = 0;
603 +    
604 +    setupCutoff();
605      
606      setupElectrostaticSummationMethod( isError );
607      setupSwitchingFunction();
# Line 611 | Line 613 | namespace oopse {
613        painCave.isFatal = 1;
614        simError();
615      }
614  
615    
616    setupCutoff();
616  
617      calcNdf();
618      calcNdfRaw();
# Line 784 | Line 783 | namespace oopse {
783      fInfo_.SIM_uses_SF = useSF;
784      fInfo_.SIM_uses_SP = useSP;
785      fInfo_.SIM_uses_BoxDipole = useBoxDipole;
787
788    if( myMethod == "REACTION_FIELD") {
789      
790      if (simParams_->haveDielectric()) {
791        fInfo_.dielect = simParams_->getDielectric();
792      } else {
793        sprintf(painCave.errMsg,
794                "SimSetup Error: No Dielectric constant was set.\n"
795                "\tYou are trying to use Reaction Field without"
796                "\tsetting a dielectric constant!\n");
797        painCave.isFatal = 1;
798        simError();
799      }      
800    }
801
786    }
787  
788    void SimInfo::setupFortranSim() {
# Line 1074 | Line 1058 | namespace oopse {
1058      int sm = UNDAMPED;
1059      RealType alphaVal;
1060      RealType dielectric;
1061 <
1061 >    
1062      errorOut = isError;
1079    alphaVal = simParams_->getDampingAlpha();
1080    dielectric = simParams_->getDielectric();
1063  
1064      if (simParams_->haveElectrostaticSummationMethod()) {
1065        std::string myMethod = simParams_->getElectrostaticSummationMethod();
# Line 1094 | Line 1076 | namespace oopse {
1076              if (myMethod == "SHIFTED_FORCE") {            
1077                esm = SHIFTED_FORCE;
1078              } else {
1079 <              if (myMethod == "REACTION_FIELD") {            
1079 >              if (myMethod == "REACTION_FIELD") {
1080                  esm = REACTION_FIELD;
1081 +                dielectric = simParams_->getDielectric();
1082 +                if (!simParams_->haveDielectric()) {
1083 +                  // throw warning
1084 +                  sprintf( painCave.errMsg,
1085 +                           "SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1086 +                           "\tA default value of %f will be used for the dielectric.\n", dielectric);
1087 +                  painCave.isFatal = 0;
1088 +                  simError();
1089 +                }
1090                } else {
1091                  // throw error        
1092                  sprintf( painCave.errMsg,
# Line 1122 | Line 1113 | namespace oopse {
1113          if (myScreen == "DAMPED") {
1114            sm = DAMPED;
1115            if (!simParams_->haveDampingAlpha()) {
1116 <            //throw error
1116 >            // first set a cutoff dependent alpha value
1117 >            // we assume alpha depends linearly with rcut from 0 to 20.5 ang
1118 >            alphaVal = 0.5125 - rcut_* 0.025;
1119 >            // for values rcut > 20.5, alpha is zero
1120 >            if (alphaVal < 0) alphaVal = 0;
1121 >
1122 >            // throw warning
1123              sprintf( painCave.errMsg,
1124                       "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1125 <                     "\tA default value of %f (1/ang) will be used.\n", alphaVal);
1125 >                     "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1126              painCave.isFatal = 0;
1127              simError();
1128            }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines