--- trunk/src/UseTheForce/ForceField.cpp	2010/05/10 17:28:26	1442
+++ branches/development/src/UseTheForce/ForceField.cpp	2010/12/28 21:47:55	1530
@@ -52,16 +52,16 @@
 #include "utils/simError.h"
 #include "utils/Tuple.hpp"
 #include "UseTheForce/DarkSide/atype_interface.h"
-#include "UseTheForce/DarkSide/fForceOptions_interface.h"
-#include "UseTheForce/DarkSide/switcheroo_interface.h"
 namespace OpenMD {
 
   ForceField::ForceField() { 
+
     char* tempPath; 
     tempPath = getenv("FORCE_PARAM_PATH");
-
+    
     if (tempPath == NULL) {
-      ffPath_ = "ORNULL(FRC_PATH)";
+      //convert a macro from compiler to a string in c++
+      STR_DEFINE(ffPath_, FRC_PATH );
     } else {
       ffPath_ = tempPath;
     }
@@ -70,7 +70,6 @@ namespace OpenMD {
 
   ForceField::~ForceField() {
     deleteAtypes();
-    deleteSwitch();
   }
 
   AtomType* ForceField::getAtomType(const std::string &at) {
@@ -629,9 +628,4 @@ namespace OpenMD {
     return ffStream;
   }
 
-  void ForceField::setFortranForceOptions(){
-    ForceOptions theseFortranOptions;
-    forceFieldOptions_.makeFortranOptions(theseFortranOptions);
-    setfForceOptions(&theseFortranOptions);
-  }
 } //end namespace OpenMD