code clean up

tests/lbpm_freelee_simulator.cpp

@@ -1,45 +1,33 @@
+#include <exception>
+#include <fstream>
+#include <iostream>
+#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <iostream>
-#include <exception>
-#include <stdexcept>
-#include <fstream>
 
-#include "models/FreeLeeModel.h"
 #include "common/Utilities.h"
+#include "models/FreeLeeModel.h"
 
-//#define WRE_SURFACES
+//*******************************************************************
-
+// Implementation of Free-Energy Two-Phase LBM (Lee model)
-/*
+//*******************************************************************
- * Simulator for two-phase flow in porous media
- * James E. McClure 2013-2014
- */
-
-
-//*************************************************************************
-// Implementation of Two-Phase Immiscible LBM using CUDA
-//*************************************************************************
 
 int main( int argc, char **argv )
 {
 	  
-	// Initialize MPI
+    // Initialize
     Utilities::startup( argc, argv );
-  Utilities::MPI comm( MPI_COMM_WORLD );
-  int rank = comm.getRank();
-  int nprocs = comm.getSize();
 
     // Load the input database
     auto db = std::make_shared<Database>( argv[1] );
   
-  // Initialize MPI and error handlers
-  auto multiple = db->getWithDefault<bool>( "MPI_THREAD_MULTIPLE", true );
-  //Utilities::startup( argc, argv, multiple );
-  //Utilities::MPI::changeProfileLevel( 1 );
-
     { // Limit scope so variables that contain communicators will free before MPI_Finialize
 
+        Utilities::MPI comm( MPI_COMM_WORLD );
+        int rank = comm.getRank();
+        int nprocs = comm.getSize();
+
         if (rank == 0){
             printf("********************************************************\n");
             printf("Running Free Energy Lee LBM	\n");
@@ -63,8 +51,8 @@ int main(int argc, char **argv)
         LeeModel.ReadParams( filename );
         LeeModel.SetDomain();    
         LeeModel.ReadInput();    
-    LeeModel.Create();       // creating the model will create data structure to match the pore structure and allocate variables
+        LeeModel.Create();       
-    LeeModel.Initialize();   // initializing the model will set initial conditions for variables
+        LeeModel.Initialize();   
         LeeModel.Run();	       
         LeeModel.WriteDebug();
 
@@ -78,4 +66,5 @@ int main(int argc, char **argv)
     } // Limit scope so variables that contain communicators will free before MPI_Finialize
 
     Utilities::shutdown();
+    return 0;
 }