--- trunk/src/io/ForceFieldOptions.cpp	2005/12/30 23:15:59	834
+++ trunk/src/io/ForceFieldOptions.cpp	2008/09/14 01:32:26	1293
@@ -38,7 +38,7 @@
  * University of Notre Dame has been advised of the possibility of
  * such damages.
  */
-#define __C
+#define __OOPSE_C
 #include "io/ForceFieldOptions.hpp"
 
 namespace oopse {
@@ -51,26 +51,41 @@ namespace oopse {
       DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
       DefineOptionalParameterWithDefaultValue(EnergyMixingRule, "EnergyMixingRule", "geometric");
       DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 1.0);
+      DefineOptionalParameterWithDefaultValue(MetallicEnergyUnitScaling, "MetallicEnergyUnitScaling", 1.0);
       DefineOptionalParameterWithDefaultValue(DistanceUnitScaling, "DistanceUnitScaling", 1.0);
       DefineOptionalParameterWithDefaultValue(AngleUnitScaling, "AngleUnitScaling", 1.0);
-      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180 is trans");
+      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180_is_trans");
+      DefineOptionalParameterWithDefaultValue(vdw12scale, "vdW-12-scale", 0.0);
+      DefineOptionalParameterWithDefaultValue(vdw13scale, "vdW-13-scale", 0.0);
       DefineOptionalParameterWithDefaultValue(vdw14scale, "vdW-14-scale", 0.0);
-      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
-      DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
+      DefineOptionalParameterWithDefaultValue(electrostatic12scale, "electrostatic-12-scale", 0.0)
+      DefineOptionalParameterWithDefaultValue(electrostatic13scale, "electrostatic-13-scale", 0.0)
+      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0)
+      DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
+      DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
     }
 
 
   void ForceFieldOptions::makeFortranOptions(ForceOptions& fortranForceOptions){
     
+    fortranForceOptions.vdw12scale = this->getvdw12scale();
+    fortranForceOptions.vdw13scale = this->getvdw13scale();
     fortranForceOptions.vdw14scale = this->getvdw14scale();
+    fortranForceOptions.electrostatic12scale = this->getelectrostatic12scale();
+    fortranForceOptions.electrostatic13scale = this->getelectrostatic13scale();
     fortranForceOptions.electrostatic14scale = this->getelectrostatic14scale();
+    fortranForceOptions.GayBerneMu = this->getGayBerneMu();
+    fortranForceOptions.GayBerneNu = this->getGayBerneNu();
 
+
     std::string DistanceMix = this->getDistanceMixingRule();
     toUpper(DistanceMix);
     if(DistanceMix == "ARITHMETIC"){
       fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
     }else if(DistanceMix == "GEOMETRIC"){
       fortranForceOptions.DistanceMixingRule = GEOMETRIC_MIXING_RULE;
+    }else if(DistanceMix == "CUBIC"){
+      fortranForceOptions.DistanceMixingRule = CUBIC_MIXING_RULE;
     }else{
       fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
     }
@@ -80,6 +95,8 @@ namespace oopse {
       fortranForceOptions.EnergyMixingRule = ARITHMETIC_MIXING_RULE;
     }else if(EnergyMix == "GEOMETRIC"){
       fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
+    }else if(EnergyMix == "HHG"){
+      fortranForceOptions.EnergyMixingRule = HHG_MIXING_RULE;
     }else{
       fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
     }