Relying on the time labeled components for averaging

This commit is contained in:
James E McClure
2015-08-18 21:40:51 -04:00
parent 2750e7b3d9
commit dcc49452a3
2 changed files with 17 additions and 11 deletions

View File

@@ -812,8 +812,9 @@ int main(int argc, char **argv)
// Compute the timestep-timestep map
ID_map_struct map = computeIDMap(GlobalBlobID,GlobalBlobID2);
// Renumber the current timestep's ids
}
Averages.NumberComponents_NWP = nblobs2;
Averages.Label_NWP.swap(GlobalBlobID2);
GlobalBlobID.swap(GlobalBlobID2);
PROFILE_STOP("Identify blobs and maps");
}
@@ -857,7 +858,7 @@ int main(int argc, char **argv)
// Read in the restart file to CPU buffers
WriteCheckpoint(LocalRestartFile, cDen, cDistEven, cDistOdd, N);
PROFILE_STOP("Save Checkpoint");
PROFILE_SAVE("lbpm_colo_simulator",1);
PROFILE_SAVE("lbpm_color_simulator",1);
}
}
PROFILE_STOP("Loop");