Skip to content

smokeview source: use .s3dd files if they exist regardless of time stamp #2610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gforney merged 1 commit into from
May 4, 2026
Merged

smokeview source: use .s3dd files if they exist regardless of time stamp #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions Source/smokeview/IOsmoke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2140,17 +2140,7 @@ FILE_SIZE ReadSmoke3D(int time_frame,int ifile_arg,int load_flag, int first_time

IF_NOT_USEMESH_RETURN0(smoke3di->loaded, smoke3di->blocknumber);
if(smoke3di->type == SOOT_index){
// only use s3dd files if they are newer than the smv file
if(ignore_s3dd_files == 0){
if(s3dd_files_ok == 1 || IsFileNewer(smoke3di->smoke_density_file, smv_filename) == 1){
SMOKE3DFILE = FOPEN(smoke3di->smoke_density_file, "rb");
s3dd_files_ok = 1;
}
else{
// s3dd files are older or they do not exist
ignore_s3dd_files = 1;
}
}
SMOKE3DFILE = FOPEN(smoke3di->smoke_density_file, "rb");
if(SMOKE3DFILE == NULL)SMOKE3DFILE = FOPEN(smoke3di->file, "rb");
}
else{
Expand Down
1 change: 0 additions & 1 deletion Source/smokeview/smokeviewvars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ SVEXTERN int SVDECL(npart5loaded_old, 0), SVDECL(npartloaded_old, 0);
SVEXTERN int SVDECL(select_part, 0), SVDECL(selected_part_index, -1);
SVEXTERN int SVDECL(smoke3d_compression_type, COMPRESSED_UNKNOWN);
SVEXTERN int SVDECL(update_smoke3dmenulabels, 0);
SVEXTERN int SVDECL(ignore_s3dd_files, 0), SVDECL(s3dd_files_ok, 0);

SVEXTERN int SVDECL(global_have_global_bound_file, 0);
SVEXTERN FILE_SIZE SVDECL(global_part_boundsize, 0);
Expand Down
Loading