Skip to content

Commit

Permalink
Merge pull request #2075 from gforney/frame
Browse files Browse the repository at this point in the history 
minor update (hidden behind pp_FRAME directive)
  • Loading branch information
@gforney
gforney authored Oct 22, 2024
2 parents fec789d + 09573eb commit 39a1060
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
1 change: 0 additions & 1 deletion Source/smokeview/IOboundary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,6 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int load_flag, int *errorcode){
}
#ifdef pp_BOUNDFRAME
return_filesize = patchi->frameinfo->filesize;
meshi->npatch_times = patchi->frameinfo->nframes;
#else
for(n=0;n<tload_step;n++){
if(error==0){
Expand Down
29 changes: 22 additions & 7 deletions Source/smokeview/update.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2032,6 +2032,7 @@ void OutputFrameSteps(void){
char size_label[256], geom_slice_label[256], slice_label[256], part_label[256];
char iso_label[256], smoke_label[256], bound_label[256], geom_bound_label[256];
char time_label[256], time_label2[256], time_label3[256];
char file_count_label[256];

show = 0;
strcpy(geom_slice_label, "");
Expand Down Expand Up @@ -2066,7 +2067,9 @@ void OutputFrameSteps(void){
total_wrapup_time += frameinfo->total_time;
}
if(count > 0){
sprintf(slice_label, " slice(structured): loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(slice_label, " slice(structured): loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2099,7 +2102,9 @@ void OutputFrameSteps(void){
total_wrapup_time += frameinfo->total_time;
}
if(count > 0){
sprintf(geom_slice_label, " slice(geom): loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(geom_slice_label, " slice(geom): loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2128,7 +2133,9 @@ void OutputFrameSteps(void){
total_wrapup_time += smoke3di->frameinfo->total_time;
}
if(count > 0){
sprintf(smoke_label, " 3D smoke: loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(smoke_label, " 3D smoke: loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2160,7 +2167,9 @@ void OutputFrameSteps(void){
total_wrapup_time += patchi->frameinfo->total_time;
}
if(count > 0){
sprintf(bound_label, "boundary(structured): loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(bound_label, "boundary(structured): loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2190,7 +2199,9 @@ void OutputFrameSteps(void){
total_wrapup_time += patchi->frameinfo->total_time;
}
if(count > 0){
sprintf(geom_bound_label, " boundary(geom): loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(geom_bound_label, " boundary(geom): loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2219,7 +2230,9 @@ void OutputFrameSteps(void){
total_wrapup_time += isoi->frameinfo->total_time;
}
if(count > 0){
sprintf(iso_label, " isosurface: loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(iso_label, " isosurface: loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down Expand Up @@ -2248,7 +2261,9 @@ void OutputFrameSteps(void){
total_wrapup_time += parti->frameinfo->total_time;
}
if(count > 0){
sprintf(part_label, " particle: loaded %i frames, %i files, %s", frames_read, count, Bytes2Label(size_label, bytes_read));
strcpy(file_count_label, "file");
if(count > 1)strcpy(file_count_label, "s");
sprintf(part_label, " particle: loaded %i frames, %i %s, %s", frames_read, count, file_count_label, Bytes2Label(size_label, bytes_read));
strcpy(time_label, "");
Float2String(time_label2, total_time, ncolorlabel_digits, force_fixedpoint);
Float2String(time_label3, total_wrapup_time, ncolorlabel_digits, force_fixedpoint);
Expand Down

0 comments on commit 39a1060

Please sign in to comment.