From de743e75b72c01fd3538976de81cc0f93e453974 Mon Sep 17 00:00:00 2001
From: JamesEMcclure <jemcclur@gmail.com>
Date: Wed, 17 Mar 2021 05:15:17 -0400
Subject: [PATCH] include convert IO

---
 tests/CMakeLists.txt |  4 ++--
 tests/convertIO.cpp  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8df4e6bd..2c4b8431 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,8 +35,8 @@ ADD_LBPM_EXECUTABLE( GenerateSphereTest )
 #ADD_LBPM_EXECUTABLE( BlobAnalysis )
 #ADD_LBPM_EXECUTABLE( BlobIdentify )
 #ADD_LBPM_EXECUTABLE( BlobIdentifyParallel )
-#ADD_LBPM_EXECUTABLE( convertIO )
-#ADD_LBPM_EXECUTABLE( DataAggregator )
+ADD_LBPM_EXECUTABLE( convertIO )
+ADD_LBPM_EXECUTABLE( DataAggregator )
 #ADD_LBPM_EXECUTABLE( BlobAnalyzeParallel )(
 ADD_LBPM_EXECUTABLE( lbpm_minkowski_scalar )
 ADD_LBPM_EXECUTABLE( TestPoissonSolver )
diff --git a/tests/convertIO.cpp b/tests/convertIO.cpp
index 4eb726b0..c53ffe4f 100644
--- a/tests/convertIO.cpp
+++ b/tests/convertIO.cpp
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <fstream>
 
-#include "common/MPI_Helpers.h"
+#include "common/MPI.h"
 #include "common/Communication.h"
 #include "common/Utilities.h"
 #include "IO/Mesh.h"
@@ -13,7 +13,6 @@
 #include "IO/Writer.h"
 #include "ProfilerApp.h"
 
-
 int main(int argc, char **argv)
 {
   // Initialize MPI
@@ -38,7 +37,7 @@ int main(int argc, char **argv)
     std::string path = IO::getPath( filename );
 
     // Read the timesteps
-    auto timesteps = IO::readTimesteps( filename, "old" );
+    auto timesteps = IO::readTimesteps( filename, "silo" );
 
     // Loop through the timesteps, reading/writing the data
     IO::initialize( "", format, false );
@@ -63,19 +62,20 @@ int main(int argc, char **argv)
             // Read the variables
             for ( auto var : database.variables ) {
                 auto varData = IO::getVariable( path, timestep, database, rank, var.name );
+		printf("reformat %s \n",var.name);
                 IO::reformatVariable( *meshData[i].mesh, *varData );
                 meshData[i].vars.push_back( varData );
             }
 
             i++;
         }
-        MPI_Barrier(comm);
+	comm.barrier();
         PROFILE_STOP("Read");
 
         // Save the mesh data to a new file
         PROFILE_START("Write");
         IO::writeData( timestep, meshData, MPI_COMM_WORLD );
-        MPI_Barrier(comm);
+	comm.barrier();
         PROFILE_STOP("Write");
     }