 }
 
 __device__ double CalcVirSwitchMartiniGPU(double distSq, int index,
-    double *gpu_sigmaSq, double *gpu_n,
-    double *gpu_epsilon_Cn,
-    double gpu_rCut, double gpu_rOn,
-    double gpu_lambdaVDW,
-    double sc_sigma_6, double sc_alpha,
-    uint sc_power)
+                                          double *gpu_sigmaSq, double *gpu_n,
+                                          double *gpu_epsilon_Cn,
+                                          double gpu_rCut, double gpu_rOn,
+                                          double sc_sigma_6, double sc_alpha,
+                                          uint sc_power,
+                                          double gpu_lambdaVDW)
 {
   if(gpu_lambdaVDW >= 0.999999) {
     return CalcVirSwitchMartiniGPU(distSq, index, gpu_sigmaSq, gpu_n,


__device__ double CalcVirShiftGPU(double distSq, int index, double *gpu_sigmaSq,
                                  double *gpu_n, double *gpu_epsilon_Cn,
                                  double gpu_lambdaVDW, double sc_sigma_6,
                                  double sc_alpha, uint sc_power)
{
  if(gpu_lambdaVDW >= 0.999999) {
    return CalcVirShiftGPU(distSq, index, gpu_sigmaSq, gpu_n, gpu_epsilon_Cn);

}

__device__ double CalcVirSwitchMartiniGPU(double distSq, int index,
                                          double *gpu_sigmaSq, double *gpu_n,
                                          double *gpu_epsilon_Cn,
                                          double gpu_rCut, double gpu_rOn)
{
  double r_1 = 1.0 / sqrt(distSq);
  double r_8 = pow(r_1, 8);
