From 667e80622481e35ff5aa13abeb03ff9b4e570ecc Mon Sep 17 00:00:00 2001
From: dqueteschiner <daniel.queteschiner@jku.at>
Date: Tue, 24 Mar 2015 12:58:33 +0100
Subject: [PATCH] use static_cast instead of old-style casts

---
 .../clockModel/clockModel/clockModel.C        | 10 ++++----
 .../IBVoidFraction/IBVoidFraction.C           | 24 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
index 0db24157..f31fd79f 100644
--- a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
@@ -423,10 +423,10 @@ void Foam::clockModel::getRAMUsage() const
     	MPI_Comm_rank(MPI_COMM_WORLD,&myrank);
 	int numprocs=-10;
 	MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
-	
+
 	pid_t myPID = getpid();	//get PID of running process
 	//Pout << myPID << "\n";
-	
+
 	std::string fileName = "/proc/"; //build path to /proc/PID/smaps and open file
 	std::stringstream strs;
 	strs << myPID;
@@ -461,11 +461,10 @@ void Foam::clockModel::getRAMUsage() const
 			SwapMem = SwapMem + temp;
 			//Pout << strs.str() << " ";
 			}
-		
 		}
 	}
-	double SwapMB = (double)SwapMem/1024.0; //kB -> MB
-	double RssMB = (double)RssMem/1024.0;
+	double SwapMB = static_cast<double>(SwapMem)/1024.0; //kB -> MB
+	double RssMB = static_cast<double>(RssMem)/1024.0;
 
 	inFile.close();
 
@@ -480,7 +479,6 @@ void Foam::clockModel::getRAMUsage() const
 
 	//Pout << "SWAP Memory used: " << SwapMem <<"MB\n";
 	//Pout << "Rss Memory used: " << RssMem <<"MB\n";
-	
 
 	return;
 }
diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
index 1affe4e7..c81b9d07 100755
--- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
+++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
@@ -413,25 +413,25 @@ double IBVoidFraction::minPeriodicDistance(vector    cellCentrePosition,
                                            boundBox  globalBb,
                                            vector&   minPeriodicPos)const
 {
-    double centreDist=999e32;
+    double centreDist = 999e32;
     vector positionCenterPeriodic;
-    
-    for(int xDir=-1; xDir<=1; xDir++)
+
+    for (int xDir=-1; xDir<=1; xDir++)
     {
         positionCenterPeriodic[0] =  positionCenter[0]
-                                  + (double)xDir
-                                  *(globalBb.max()[0]-globalBb.min()[0]);
-        for(int yDir=-1; yDir<=1; yDir++)
+                                  + static_cast<double>(xDir)
+                                  * (globalBb.max()[0] - globalBb.min()[0]);
+        for (int yDir=-1; yDir<=1; yDir++)
         {
             positionCenterPeriodic[1] =  positionCenter[1]
-                                      + (double)yDir
-                                      * (globalBb.max()[1]-globalBb.min()[1]);                        
-            for(int zDir=-1; zDir<=1; zDir++)
+                                      + static_cast<double>(yDir)
+                                      * (globalBb.max()[1] - globalBb.min()[1]);
+            for (int zDir=-1; zDir<=1; zDir++)
             {
                 positionCenterPeriodic[2] =  positionCenter[2]
-                                          + (double)zDir
-                                          * (globalBb.max()[2]-globalBb.min()[2]);
-                if( mag(cellCentrePosition-positionCenterPeriodic)<centreDist)
+                                          + static_cast<double>(zDir)
+                                          * (globalBb.max()[2] - globalBb.min()[2]);
+                if (mag(cellCentrePosition-positionCenterPeriodic) < centreDist)
                 {
                     centreDist     = mag(cellCentrePosition-positionCenterPeriodic);
                     minPeriodicPos = positionCenterPeriodic;