small updates and removing X permissions

src/lagrangian/Allwmake

@@ -5,7 +5,13 @@ wmake libso basic
 wmake libso solidParticle
 wmake libso intermediate
 wmake libso dieselSpray
+<<<<<<< HEAD:src/lagrangian/Allwmake
 wmake libso molecularDynamics/potential
 wmake libso molecularDynamics/molecule
 
  
+=======
+(cd molecularDynamics && wmake libso potential)
+(cd molecularDynamics && wmake libso molecule)
+
+>>>>>>> small updates and removing X permissions:src/lagrangian/Allwmake

src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H

@@ -36,12 +36,12 @@ inline Foam::label Foam::pairPotentialList::pairPotentialIndex
 
     if (a < b)
     {
-        index = a*(2*nIds() - a - 1) / 2 + b;
+        index = a*(2*nIds() - a - 1)/2 + b;
     }
 
     else
     {
-        index = b*(2*nIds() - b - 1) / 2 + a;
+        index = b*(2*nIds() - b - 1)/2 + a;
     }
 
     if (index > size() - 1)