--- trunk/src/brains/SimInfo.cpp	2005/12/12 19:32:50	809
+++ trunk/src/brains/SimInfo.cpp	2006/02/01 21:06:43	879
@@ -63,6 +63,8 @@
 #include "utils/MemoryUtils.hpp"
 #include "utils/simError.h"
 #include "selection/SelectionManager.hpp"
+#include "io/ForceFieldOptions.hpp"
+#include "UseTheForce/ForceField.hpp"
 
 #ifdef IS_MPI
 #include "UseTheForce/mpiComponentPlan.h"
@@ -920,10 +922,19 @@ namespace oopse {
 
   void SimInfo::setupCutoff() {           
     
+    ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
+
     // Check the cutoff policy
-    int cp =  TRADITIONAL_CUTOFF_POLICY;
-    if (simParams_->haveCutoffPolicy()) {
-      std::string myPolicy = simParams_->getCutoffPolicy();
+    int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
+
+    std::string myPolicy;
+    if (forceFieldOptions_.haveCutoffPolicy()){
+      myPolicy = forceFieldOptions_.getCutoffPolicy();
+    }else if (simParams_->haveCutoffPolicy()) {
+      myPolicy = simParams_->getCutoffPolicy();
+    }
+
+    if (!myPolicy.empty()){
       toUpper(myPolicy);
       if (myPolicy == "MIX") {
         cp = MIX_CUTOFF_POLICY;
@@ -958,8 +969,28 @@ namespace oopse {
       if (simParams_->haveSwitchingRadius()) {
 	rsw_  = simParams_->getSwitchingRadius();
       } else {
-	rsw_ = rcut_;
+	if (fInfo_.SIM_uses_Charges | 
+	    fInfo_.SIM_uses_Dipoles | 
+	    fInfo_.SIM_uses_RF) {
+	  
+	  rsw_ = 0.85 * rcut_;
+	  sprintf(painCave.errMsg,
+		  "SimCreator Warning: No value was set for the switchingRadius.\n"
+		  "\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
+		  "\tswitchingRadius = %f. for this simulation\n", rsw_);
+        painCave.isFatal = 0;
+	simError();
+	} else {
+	  rsw_ = rcut_;
+	  sprintf(painCave.errMsg,
+		  "SimCreator Warning: No value was set for the switchingRadius.\n"
+		  "\tOOPSE will use the same value as the cutoffRadius.\n"
+		  "\tswitchingRadius = %f. for this simulation\n", rsw_);
+	  painCave.isFatal = 0;
+	  simError();
+	}
       }
+      
       notifyFortranCutoffs(&rcut_, &rsw_);
       
     } else {
@@ -1087,7 +1118,7 @@ namespace oopse {
     }
     
     // let's pass some summation method variables to fortran
-    setElectrostaticSumMethod( &esm );
+    setElectrostaticSummationMethod( &esm );
     setFortranElectrostaticMethod( &esm );
     setScreeningMethod( &sm );
     setDampingAlpha( &alphaVal );