Adding back in CalcAmoebaForcesAndEnergyKernel

plugins/amoeba/platforms/cuda/src/AmoebaCudaKernelFactory.cpp

@@ -56,7 +56,7 @@ extern "C" OPENMMCUDA_EXPORT void registerKernelFactories() {
              platform.registerKernelFactory(CalcAmoebaGeneralizedKirkwoodForceKernel::Name(), factory);
              platform.registerKernelFactory(CalcAmoebaVdwForceKernel::Name(), factory);
              platform.registerKernelFactory(CalcAmoebaWcaDispersionForceKernel::Name(), factory);
-//             platform.registerKernelFactory(CalcAmoebaForcesAndEnergyKernel::Name(), factory);
+             platform.registerKernelFactory(CalcAmoebaForcesAndEnergyKernel::Name(), factory);
         }
     }
 }

plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp

@@ -76,8 +76,9 @@ void CalcAmoebaForcesAndEnergyKernel::beginComputation(ContextImpl& context, boo
     if(includeForces && data.getHasAmoebaGeneralizedKirkwood() ){
         gpu->bIncludeGBSA = 1;
     }
-    cudaCalcForcesAndEnergyKernel->beginComputation( context, includeForces, includeEnergy);
+    cudaCalcForcesAndEnergyKernel->beginComputation( context, 1, includeEnergy);
     gpu->bIncludeGBSA = originalIncludeGBSA;
+
 }
 
 double CalcAmoebaForcesAndEnergyKernel::finishComputation(ContextImpl& context, bool includeForces, bool includeEnergy) {