Remove __mul24 calls

plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaMapTorques.cu

@@ -81,7 +81,7 @@ void amoebaMapTorqueToForce_kernel( float* torque )
   // ---------------------------------------------------------------------------------------
   
     int ii;
-    int particleIndex            = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int particleIndex            = blockIdx.x*blockDim.x + threadIdx.x;
     float4* atomCoord            = cSim.pPosq;
     int4* multiPoleAtoms         = cAmoebaSim.pMultipoleParticlesIdsAndAxisType;
   

plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaMutualInducedAndGkFields.cu

@@ -253,7 +253,7 @@ void kInitializeMutualInducedAndGkField_kernel(
                    float* inducedDipolePolarS )
 {
 
-    int pos = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int pos = blockIdx.x*blockDim.x + threadIdx.x;
     while( pos < 3*cSim.atoms )
     {
 
@@ -354,7 +354,7 @@ void kSorUpdateMutualInducedAndGkField_kernel(
 {
 
     float polarSOR = 0.70f;
-    int pos        = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int pos        = blockIdx.x*blockDim.x + threadIdx.x;
     while( pos < 3*cSim.atoms )
     {
 
@@ -391,7 +391,7 @@ void kSorUpdateMutualInducedAndGkFieldS_kernel(
 {
 
     float polarSOR = 0.70f;
-    int pos        = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int pos        = blockIdx.x*blockDim.x + threadIdx.x;
     while( pos < 3*cSim.atoms )
     {
         float previousDipole      = inducedDipole[pos];

plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaMutualInducedField.cu

@@ -118,7 +118,7 @@ void kInitializeMutualInducedField_kernel(
                    float* polarizability )
 {
 
-    int pos = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int pos = blockIdx.x*blockDim.x + threadIdx.x;
     while( pos < 3*cSim.atoms )
     {
 
@@ -194,7 +194,7 @@ void kSorUpdateMutualInducedField_kernel(
 {
 
     float polarSOR = 0.70f;
-    int pos        = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int pos        = blockIdx.x*blockDim.x + threadIdx.x;
     while( pos < 3*cSim.atoms )
     {
 

plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu

@@ -84,7 +84,7 @@ void kCudaComputeCheckChiral_kernel( void )
  
     // ---------------------------------------------------------------------------------------
  
-    int particleIndex            = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int particleIndex            = blockIdx.x*blockDim.x + threadIdx.x;
     int numberOfParticles        = cSim.atoms;
     while( particleIndex < numberOfParticles )
     { 
@@ -146,7 +146,7 @@ void kCudaComputeLabFrameMoments_kernel( void )
     float vectorY[3];
     float vectorZ[3];
  
-    int particleIndex            = __mul24(blockIdx.x,blockDim.x) + threadIdx.x;
+    int particleIndex            = blockIdx.x*blockDim.x + threadIdx.x;
 
     float4* particleCoord        = cSim.pPosq;
     int4* multiPoleParticles     = cAmoebaSim.pMultipoleParticlesIdsAndAxisType;