diff --git a/examples/1D-Array/main_tapioca.cpp b/examples/1D-Array/main_tapioca.cpp index 8081994cfaaaf94b5527ef388bcb9c4eeb0beb08..8c23b00b971f32b1ec406f0f19fea2fd38a624a9 100644 --- a/examples/1D-Array/main_tapioca.cpp +++ b/examples/1D-Array/main_tapioca.cpp @@ -32,7 +32,7 @@ int main (int argc, char * argv[]) MPI_File file_handle; MPI_Status status; char output[100]; - Tapioca tp, tp2; + Tapioca tp; int64_t chunkCount[1], chunkOffset[1]; int chunkSize[1]; @@ -138,7 +138,7 @@ int main (int argc, char * argv[]) /*****************/ /* INIT TAPIOCA */ /*****************/ - tp2.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 1, hdr, ARRAY_OF_STRUCTURES, sub_comm); + tp.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 1, hdr, ARRAY_OF_STRUCTURES, sub_comm); /*****************/ start_time = MPI_Wtime(); @@ -151,7 +151,7 @@ int main (int argc, char * argv[]) offset = scan_size * particle_size; - tp2.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); MPI_File_close (&file_handle); diff --git a/examples/HACC-IO/miniHACC-AoS.cpp b/examples/HACC-IO/miniHACC-AoS.cpp index 3c674b0645973c3620467c6665391eace4f6eda3..1df7b5bca53ff59fbb80d63f71bed46d82821f1a 100644 --- a/examples/HACC-IO/miniHACC-AoS.cpp +++ b/examples/HACC-IO/miniHACC-AoS.cpp @@ -24,7 +24,6 @@ int main (int argc, char * argv[]) MPI_Status status; char output[100]; Tapioca tp; - Tapioca tp2; int64_t chunkCount[9], chunkOffset[9]; int chunkSize[9]; @@ -202,7 +201,7 @@ int main (int argc, char * argv[]) /*****************/ /* INIT TAPIOCA */ /*****************/ - tp2.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 9, hdr, ARRAY_OF_STRUCTURES, sub_comm); + tp.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 9, hdr, ARRAY_OF_STRUCTURES, sub_comm); /*****************/ start_time = MPI_Wtime(); @@ -215,31 +214,31 @@ int main (int argc, char * argv[]) offset = scan_size * particle_size; - tp2.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, yy_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, yy_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, zz_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, zz_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, vx_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vx_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, vy_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vy_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, vz_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vz_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, phi_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, phi_r, num_particles, MPI_FLOAT, &status); offset += num_particles * sizeof(float); - tp2.Read (file_handle, offset, pid_r, num_particles, MPI_LONG_LONG, &status); + tp.Read (file_handle, offset, pid_r, num_particles, MPI_LONG_LONG, &status); offset += num_particles * sizeof(int64_t); - tp2.Read (file_handle, offset, mask_r, num_particles, MPI_UNSIGNED_SHORT, &status); + tp.Read (file_handle, offset, mask_r, num_particles, MPI_UNSIGNED_SHORT, &status); MPI_File_close (&file_handle); diff --git a/examples/HACC-IO/miniHACC-SoA.cpp b/examples/HACC-IO/miniHACC-SoA.cpp index 8c33550878ca9d84bac87706b0b89acbef8b6fc2..980c53ed74581394585cee173d2da6fec53ffbc6 100644 --- a/examples/HACC-IO/miniHACC-SoA.cpp +++ b/examples/HACC-IO/miniHACC-SoA.cpp @@ -24,7 +24,6 @@ int main (int argc, char * argv[]) MPI_Status status; char output[100]; Tapioca tp; - Tapioca tp2; int64_t chunkCount[9], chunkOffset[9]; int chunkSize[9]; @@ -202,7 +201,7 @@ int main (int argc, char * argv[]) /*****************/ /* INIT TAPIOCA */ /*****************/ - tp2.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 9, hdr, ARRAY_OF_STRUCTURES, sub_comm); + tp.ReadInitialize (output, chunkCount, chunkSize, chunkOffset, 9, hdr, ARRAY_OF_STRUCTURES, sub_comm); /*****************/ start_time = MPI_Wtime(); @@ -215,31 +214,31 @@ int main (int argc, char * argv[]) offset = scan_size * sizeof(float); - tp2.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, xx_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, yy_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, yy_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, zz_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, zz_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, vx_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vx_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, vy_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vy_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, vz_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, vz_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(float); - tp2.Read (file_handle, offset, phi_r, num_particles, MPI_FLOAT, &status); + tp.Read (file_handle, offset, phi_r, num_particles, MPI_FLOAT, &status); offset += (sub_particles - scan_size) * sizeof(float) + scan_size * sizeof(int64_t); - tp2.Read (file_handle, offset, pid_r, num_particles, MPI_LONG_LONG, &status); + tp.Read (file_handle, offset, pid_r, num_particles, MPI_LONG_LONG, &status); offset += (sub_particles - scan_size) * sizeof(int64_t) + scan_size * sizeof(uint16_t); - tp2.Read (file_handle, offset, mask_r, num_particles, MPI_UNSIGNED_SHORT, &status); + tp.Read (file_handle, offset, mask_r, num_particles, MPI_UNSIGNED_SHORT, &status); MPI_File_close (&file_handle); diff --git a/examples/HACC-IO/run_check_bgq.sh b/examples/HACC-IO/run_check_bgq.sh index 3ceba5b9a5d1152ddcfaff56b50492b3b72ffb0d..90fcb6c5b54533650dbf9973c12b175f9c638223 100755 --- a/examples/HACC-IO/run_check_bgq.sh +++ b/examples/HACC-IO/run_check_bgq.sh @@ -1,6 +1,6 @@ #!/bin/bash -NODES=1024 +NODES=64 PPN=16 NPROCS=$((NODES*PPN)) TARGET="/projects/visualization/ftessier/debug" @@ -31,7 +31,7 @@ function updateSettings() SETTINGS="$SETTINGS BGLOCKLESSMPIO_F_TYPE=0x47504653" } -for run in 0 1 2 +for run in 0 do rm $TARGET/* updateSettings diff --git a/tapioca.cpp b/tapioca.cpp index 72f03798176d0642e709efdaed443ba636d07296..dfc4430072fe82d9b923361f34015c1b28392c4c 100644 --- a/tapioca.cpp +++ b/tapioca.cpp @@ -2,8 +2,6 @@ Tapioca::Tapioca () { - this->SetDefaultValues (); - this->ParseEnvVariables (); } diff --git a/tp_read.cpp b/tp_read.cpp index d0a14bb0248071f17ea986a24ce93c7e656ba9d8..1ca0d17563d1919e87e25e844426dea997ea53fa 100644 --- a/tp_read.cpp +++ b/tp_read.cpp @@ -8,7 +8,10 @@ void Tapioca::ReadInitialize (char *filename, int64_t *chunkCount, int *chunkSiz double startInitTime, endInitTime, startElectTime, endElectTime; startInitTime = MPI_Wtime(); #endif - + + this->SetDefaultValues (); + this->ParseEnvVariables (); + this->filename_ = filename; this->nChunks_ = nChunks; this->chunksIndexMatching.resize (this->nChunks_); diff --git a/tp_write.cpp b/tp_write.cpp index 6d9fb4a01d07c62df64db20fed701a5dcc5b9c0b..f47d81aabcd6848de06883f934cc626c4ea00596 100644 --- a/tp_write.cpp +++ b/tp_write.cpp @@ -8,6 +8,9 @@ void Tapioca::WriteInitialize (char *filename, int64_t *chunkCount, int *chunkSi double startInitTime, endInitTime, startElectTime, endElectTime; startInitTime = MPI_Wtime(); #endif + + this->SetDefaultValues (); + this->ParseEnvVariables (); this->filename_ = filename; this->nChunks_ = nChunks;