       lambdaCoulomb = DeviceGetLambdaCoulomb(mA, kA, mB, kB, box,
                                              gpu_isFraction, gpu_molIndex,
                                              gpu_kindIndex, gpu_lambdaCoulomb);
-      gpu_REn[threadID] = CalcCoulombGPU(distSq, kA, kB,
-                                         qi_qj_fact, gpu_rCutLow[0],
-                                         gpu_ewald[0], gpu_VDW_Kind[0],
+      gpu_REn[threadID] = CalcCoulombGPU(distSq,
+                                         kA,
+                                         kB,
+                                         qi_qj_fact,
+                                         gpu_rCutLow[0],
+                                         gpu_ewald[0],
+                                         gpu_VDW_Kind[0],
                                          gpu_alpha[box],
                                          gpu_rCutCoulomb[box],
                                          gpu_isMartini[0],

                                       sc_alpha, sc_power, gpu_sigmaSq);
  } else
    return CalcCoulombSwitchGPU(distSq, qi_qj_fact, gpu_alpha, gpu_ewald,
                                gpu_rCutCoulomb, gpu_lambdaCoulomb, sc_coul,
                                sc_sigma_6, sc_alpha, sc_power, gpu_sigmaSq);
}

__device__ double CalcEnGPU(double distSq, int kind1, int kind2,

//ElectroStatic Calculation
//**************************************************************//
__device__ double CalcCoulombParticleGPU(double distSq, double qi_qj_fact,
                                         double gpu_ewald, double gpu_alpha,
                                         double gpu_lambdaCoulomb, bool sc_coul,
                                         double sc_sigma_6, double sc_alpha,
                                         uint sc_power, double gpu_sigmaSq)
{
  if(gpu_lambdaCoulomb >= 0.999999) {
    return CalcCoulombParticleGPUNoLambda(distSq, qi_qj_fact, gpu_ewald, gpu_alpha);
