Revert Amber-MD#1159

Author: Daniel R. Roe

src/PotentialTerm_LJ_Coulomb.cpp

@@ -96,7 +96,7 @@ void PotentialTerm_LJ_Coulomb::CalcForce(Frame& frameIn, CharMask const& maskIn)
       {
         NonbondType LJ = GetLJparam(*atoms_, *nonbond_, *idx, *jdx);
         //NonBondKernel(frameIn, *idx, *jdx, LJ.A(), LJ.B(), maskIn, *E_vdw_, *E_elec_);
-        nonbond.Calc_F_E(frameIn, *idx, *jdx, LJ.A(), LJ.B(), LJ.C(), QFAC_, (*atoms_)[*idx].Charge(), (*atoms_)[*jdx].Charge(), 1, 1, maskIn, *E_vdw_, *E_elec_);
+        nonbond.Calc_F_E(frameIn, *idx, *jdx, LJ.A(), LJ.B(), QFAC_, (*atoms_)[*idx].Charge(), (*atoms_)[*jdx].Charge(), 1, 1, maskIn, *E_vdw_, *E_elec_);
       } // END idx not bonded to jdx
     } // END inner loop over jdx
   } // END outer loop over idx
@@ -112,7 +112,7 @@ void PotentialTerm_LJ_Coulomb::CalcForce(Frame& frameIn, CharMask const& maskIn)
       if (excluded.find( *idx1 ) == excluded.end())
       {
         NonbondType LJ = GetLJparam(*atoms_, *nonbond_, *idx0, *idx1);
-        nonbond.Calc_F_E(frameIn, *idx0, *idx1, LJ.A(), LJ.B(), LJ.C(), QFAC_, (*atoms_)[*idx0].Charge(), (*atoms_)[*idx1].Charge(), 1, 1, maskIn, *E_vdw_, *E_elec_);
+        nonbond.Calc_F_E(frameIn, *idx0, *idx1, LJ.A(), LJ.B(), QFAC_, (*atoms_)[*idx0].Charge(), (*atoms_)[*idx1].Charge(), 1, 1, maskIn, *E_vdw_, *E_elec_);
         //NonBondKernel(frameIn, *idx0, *idx1, LJ.A(), LJ.B(), maskIn, *E_vdw_, *E_elec_);
       }
     } // END inner loop over idx1