--- trunk/src/io/ForceFieldOptions.hpp	2005/12/05 22:23:57	788
+++ trunk/src/io/ForceFieldOptions.hpp	2005/12/28 21:44:06	822
@@ -45,6 +45,8 @@
 #include "utils/ParameterManager.hpp"
 #include "utils/StringUtils.hpp"
 #include "io/ParamConstraint.hpp"
+#define __C
+#include "UseTheForce/fForceOptions.h"
 
 namespace oopse {
   
@@ -63,21 +65,7 @@ namespace oopse {
     DeclareParameter(dielectric, double);
     
   public:
-    ForceFieldOptions() {
-      DefineOptionalParameter(Name, "Name");
-      DefineOptionalParameterWithDefaultValue(vdWtype, "vdWtype", "Lennard-Jones");
-      DefineOptionalParameterWithDefaultValue(DistanceMixingRule, "DistanceMixingRule", "arithmetic");
-      DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
-      DefineOptionalParameterWithDefaultValue(EnergyMixingRule, "EnergyMixingRule", "geometric");
-      DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 1.0);
-      DefineOptionalParameterWithDefaultValue(DistanceUnitScaling, "DistanceUnitScaling", 1.0);
-      DefineOptionalParameterWithDefaultValue(AngleUnitScaling, "AngleUnitScaling", 1.0);
-      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180 is trans");
-      DefineOptionalParameterWithDefaultValue(vdw14scale, "vdW-14-scale", 0.0);
-      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
-      DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
-    }
-        
+    ForceFieldOptions();
     ForceFieldOptions(const ForceFieldOptions&);
     ForceFieldOptions& operator = (const ForceFieldOptions&);
     
@@ -111,7 +99,8 @@ namespace oopse {
       
       return result;
     }
-    
+
+    void makeFortranOptions(ForceOptions & fortranForceOptions);
   private:
     typedef std::map<std::string, ParameterBase*> ParamMap;
     ParamMap parameters_;