--- trunk/src/io/ForceFieldOptions.cpp	2005/12/30 23:15:59	834
+++ trunk/src/io/ForceFieldOptions.cpp	2006/07/16 02:48:00	1005
@@ -53,10 +53,12 @@ namespace oopse {
       DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 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(vdw14scale, "vdW-14-scale", 0.0);
-      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
+      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0)
       DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
+      DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
+      DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
     }
 
 
@@ -64,13 +66,18 @@ namespace oopse {
     
     fortranForceOptions.vdw14scale = this->getvdw14scale();
     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 +87,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;
     }