Skip to content

remove pp_SPEEDUP directive #2652

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 3 commits into from
Aug 3, 2026
Merged

remove pp_SPEEDUP directive #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
624cc3c
smokeview source: remove pp_SPEEDUP directive
gforney Aug 3, 2026
ad79bda
smokeview source: remove #define pp_SPEEDUP
gforney Aug 3, 2026
9ced64c
smokeview source: remove another pp_SPEEDUP
gforney Aug 3, 2026
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
32 changes: 0 additions & 32 deletions Source/smokeview/IOsmoke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,12 +703,6 @@ void UpdateSmokeAlphas(void){
for(j=0; j<NDISTS; j++){
float maxval;

#ifndef pp_SPEEDUP
assert(
(smoke3di->soot_loaded == 1 && smoke3di->maxvals!=NULL) ||
(smoke3di->soot_loaded == 0 && smoke3di->maxvals==NULL)
);
#endif
maxval = smoke3di->maxval;
if(smoke3di->soot_loaded == 1 && smoke3di->maxvals!=NULL)maxval = smoke3di->maxvals[smoke3di->ismoke3d_time];
InitAlphas(smoke3di->alphas_smokedir[j], smoke3di->alphas_firedir[j], smoke3di->extinct, smoke3di->soot_loaded, maxval, glui_mass_extinct, smoke_mesh->dxyz_fds[0], dists[j]);
Expand Down Expand Up @@ -1298,12 +1292,10 @@ void DrawSmokeFrame(void){
xyz = smokemesh->boxmiddle_smv;
Output3Text(foregroundcolor, xyz[0], xyz[1], xyz[2], alabel);
#endif
#ifdef pp_SPEEDUP
if(vis_smokemesh == 1||vis_only_smokemesh==1){
DrawBoxMinMax(smokemesh->boxmin_smv, smokemesh->boxmax_smv, foregroundcolor);
}
if(vis_only_smokemesh == 0){
#endif
#ifdef pp_GPU
if(usegpu_local == 1){
DrawSmoke3DGPU(smoke3di);
Expand All @@ -1316,9 +1308,7 @@ void DrawSmokeFrame(void){
nsmoke_triangles += DrawSmoke3D(smoke3di);
#endif
}
#ifdef pp_SPEEDUP
}
#endif
STOP_TIMER(smoke3d_timer);
if((show_trirates==1 && smoke3d_timer>0.0) || (show_timings==1 && smoke3d_timer>0.1)){
float tri_fps = -1.0;
Expand Down Expand Up @@ -2695,20 +2685,11 @@ void MergeSmoke3D(smoke3ddata *smoke3dset){

/* ------------------ UncompressSmoke3DAll ------------------------ */

#ifdef pp_SPEEDUP
void *UncompressSmoke3DAll(void *arg){
#else
void UncompressSmoke3DAll(void){
#endif
int i, nthreads, thread_num;
#ifdef pp_SPEEDUP

thread_num = *(int *)arg;
nthreads = uncompresssmoke3d_threads->n_threads;
#else
thread_num = 0;
nthreads = 1;
#endif

for(i = thread_num; i < global_scase.smoke3dcoll.nsmoke3dinfo; i+=nthreads){
smoke3ddata *smoke3di;
Expand All @@ -2721,27 +2702,16 @@ void UncompressSmoke3DAll(void){
if(IsSmokeComponentPresent(smoke3di) == 0)continue;
UncompressSmoke3D(smoke3di);
}
#ifdef pp_SPEEDUP
THREAD_EXIT(uncompresssmoke3d_threads);
#endif
}

/* ------------------ MergeSmoke3DAll ------------------------ */

#ifdef pp_SPEEDUP
void *MergeSmoke3DAll(void *arg){
#else
void MergeSmoke3DAll(void){
#endif
int i, nthreads, thread_num;
#ifdef pp_SPEEDUP

thread_num = *(int *)arg;
nthreads = mergesmoke3d_threads->n_threads;
#else
thread_num = 0;
nthreads = 1;
#endif

for(i = thread_num; i < global_scase.smoke3dcoll.nsmoke3dinfo; i+=nthreads){
smoke3ddata *smoke3di;
Expand All @@ -2754,9 +2724,7 @@ void MergeSmoke3DAll(void){
if(IsSmokeComponentPresent(smoke3di) == 0)continue;
MergeSmoke3D(smoke3di);
}
#ifdef pp_SPEEDUP
THREAD_EXIT(mergesmoke3d_threads);
#endif
}

/* ------------------ UpdateSmoke3dMenuLabels ------------------------ */
Expand Down
5 changes: 2 additions & 3 deletions Source/smokeview/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
//#define pp_TERRAIN_HIDE // hide terrain when hiding internal blockages
//#define pp_OPACITY_DEBUG // output hrrpuv opacity in center of each mesh
//#define pp_GLUT_DEBUG // add debug print for glut debugging
#define pp_SPEEDUP // speed up smokeview
//#define pp_READ_KEYBOARD // read keyboard in the command shell so the visualization can be paused
//#define pp_GETMESH
//#define pp_READ_KEYBOARD // read keyboard in the command shell so the visualization can be paused
//#define pp_GETMESH // fast algorithm for finding a mesh

//*** options: windows

Expand Down
4 changes: 0 additions & 4 deletions Source/smokeview/readsmv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2866,12 +2866,8 @@ int ReadSMV_Configure(){
ThreadRun(readkeyboard_threads);
}
#endif
#ifdef pp_SPEEDUP
ThreadInit(&makeiblank_threads, n_makeiblank_threads, use_makeiblank_threads, serial_override, MakeIBlank);
ThreadRun(makeiblank_threads);
#else
MakeIBlank();
#endif
PRINT_TIMER(timer_readsmv, "MakeIBlank");

SetCVentDirs();
Expand Down
9 changes: 0 additions & 9 deletions Source/smokeview/smokeheaders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,8 @@ EXTERNCPP int IsSmokeLoaded(smv_case *scase);
EXTERNCPP void MakeIBlankSmoke3D(void);
EXTERNCPP void MakeTimesMap(float *times, unsigned char **times_map_ptr, int n);
EXTERNCPP void MergeSmoke3D(smoke3ddata *smoke3dset);
#ifdef pp_SPEEDUP
EXTERNCPP void *MergeSmoke3DAll(void *arg);
EXTERNCPP void *UncompressSmoke3DAll(void *arg);
#else
EXTERNCPP void UncompressSmoke3DAll(void);
EXTERNCPP void MergeSmoke3DAll(void);
#endif
EXTERNCPP FILE_SIZE ReadSmoke3D(int iframe, int ifile, int flag, int first_time, int *errorcode);
EXTERNCPP void ReadSmoke3DAllMeshes(int iframe, int smoketype, int *errorcode);
EXTERNCPP void SmokeWrapup(void);
Expand Down Expand Up @@ -797,11 +792,7 @@ EXTERNCPP int InExterior(float *xyz);
EXTERNCPP void InitClip(void);
EXTERNCPP void InitTetraClipInfo(clipdata *ci,float *v1, float *v2, float *v3, float *v4);
EXTERNCPP void MatMultMat(float *m1, float *m2, float *m3);
#ifdef pp_SPEEDUP
EXTERNCPP void *MakeIBlank(void *arg);
#else
EXTERNCPP int MakeIBlank(void);
#endif
EXTERNCPP int MakeIBlankCarve(void);
EXTERNCPP void MergeClipPlanes(clipdata *ci, clipdata *cj);
EXTERNCPP int MeshInFrustum(meshdata *meshi);
Expand Down
4 changes: 0 additions & 4 deletions Source/smokeview/smokeviewvars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,9 @@ SVEXTERN threaderdata SVDECL(*sliceparms_threads, NULL);
SVEXTERN int SVDECL(n_meshnabors_threads, 1), SVDECL(use_meshnabors_threads, 1);
SVEXTERN threaderdata SVDECL(*meshnabors_threads, NULL);

#ifdef pp_SPEEDUP
//***MakeIBlank
SVEXTERN int SVDECL(n_makeiblank_threads, 1), SVDECL(use_makeiblank_threads, 1);
SVEXTERN threaderdata SVDECL(*makeiblank_threads, NULL);
#endif

//***checkfiles
SVEXTERN int SVDECL(n_checkfiles_threads, 1), SVDECL(use_checkfiles_threads, 1);
Expand Down Expand Up @@ -405,9 +403,7 @@ SVEXTERN int nplot3dloaded, nsmoke3dloaded, nisoloaded, nsliceloaded, nvsliceloa
SVEXTERN int npartloaded, npatchloaded, npart5loaded, npartloaded;
SVEXTERN int nplot3dvis, nsmoke3dvis, nisovis, nslicevis, nvslicevis;
SVEXTERN int npatchvis, npart5vis, npartvis;
#ifdef pp_SPEEDUP
SVEXTERN int SVDECL(vis_smokemesh, 0), SVDECL(vis_only_smokemesh, 0);
#endif

SVEXTERN int SVDECL(nplot3dloaded_old,0), SVDECL(nsmoke3dloaded_old,0), SVDECL(nisoloaded_old,0);
SVEXTERN int SVDECL(nsliceloaded_old,0), SVDECL(nvsliceloaded_old,0), SVDECL(npatchloaded_old,0);
Expand Down
22 changes: 0 additions & 22 deletions Source/smokeview/smv_geometry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,20 +1275,12 @@ void SetHiddenBlockages(meshdata *meshi){

/* ------------------ MakeIBlank ------------------------ */

#ifdef pp_SPEEDUP
void *MakeIBlank(void *arg){
#else
int MakeIBlank(void){
#endif
int ig;

#ifdef pp_SPEEDUP
if(global_scase.use_iblank==0){
THREAD_EXIT(makeiblank_threads);
}
#else
if(global_scase.use_iblank==0)return 0;
#endif
for(ig=0; ig<global_scase.meshescoll.nmeshes; ig++){
meshdata *meshi;
int nx, ny, nxy, ibarjbar;
Expand All @@ -1305,7 +1297,6 @@ int MakeIBlank(void){
kbar = meshi->kbar;
ijksize=(ibar+1)*(jbar+1)*(kbar+1);

#ifdef pp_SPEEDUP
if(
NewMemory((void **)&c_iblank_node_html, ijksize*sizeof(char))==0 ||
NewMemory((void **)&iblank_node, ijksize*sizeof(char))==0 ||
Expand All @@ -1316,15 +1307,6 @@ int MakeIBlank(void){
NewMemory((void **)&c_iblank_z, ijksize*sizeof(char))==0){
THREAD_EXIT(makeiblank_threads);
}
#else
if(NewMemory(( void ** )&c_iblank_node_html, ijksize * sizeof(char)) == 0)return 1;
if(NewMemory(( void ** )&iblank_node, ijksize * sizeof(char)) == 0)return 1;
if(NewMemory(( void ** )&iblank_cell, ibar * jbar * kbar * sizeof(char)) == 0)return 1;
if(NewMemory(( void ** )&fblank_cell, ibar * jbar * kbar * sizeof(float)) == 0)return 1;
if(NewMemory(( void ** )&c_iblank_x, ijksize * sizeof(char)) == 0)return 1;
if(NewMemory(( void ** )&c_iblank_y, ijksize * sizeof(char)) == 0)return 1;
if(NewMemory(( void ** )&c_iblank_z, ijksize * sizeof(char)) == 0)return 1;
#endif

meshi->c_iblank_node_html_temp = c_iblank_node_html;
meshi->c_iblank_node0_temp = iblank_node;
Expand Down Expand Up @@ -1508,11 +1490,7 @@ int MakeIBlank(void){
}

update_make_iblank = 1;
#ifdef pp_SPEEDUP
THREAD_EXIT(makeiblank_threads);
#else
return 0;
#endif
}

/* ------------------ InitClip ------------------------ */
Expand Down
12 changes: 0 additions & 12 deletions Source/smokeview/update.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ void UpdateFrameNumber(int changetime){
}
}
if(show3dsmoke==1 && global_scase.smoke3dcoll.nsmoke3dinfo > 0){
#ifdef pp_SPEEDUP
INIT_PRINT_TIMER(update_smoke_time);
ThreadInit(&uncompresssmoke3d_threads, n_uncompresssmoke3d_threads, use_uncompresssmoke3d_threads, serial_override, UncompressSmoke3DAll);
ThreadRunLoop(uncompresssmoke3d_threads);
Expand All @@ -107,15 +106,6 @@ void UpdateFrameNumber(int changetime){
ThreadRunLoop(mergesmoke3d_threads);
ThreadJoin(&mergesmoke3d_threads);
PRINT_TIMER(merge_smoke_time, "MergeSmoke3D");
#else
INIT_PRINT_TIMER(update_smoke_time);
UncompressSmoke3DAll();
PRINT_TIMER(update_smoke_time, "UncompressSmoke3D");

INIT_PRINT_TIMER(merge_smoke_time);
MergeSmoke3DAll();
PRINT_TIMER(merge_smoke_time, "MergeSmoke3D");
#endif
PrintMemoryInfo;
}
if(showpatch==1){
Expand Down Expand Up @@ -2542,9 +2532,7 @@ void UpdateDisplay(void){
update_make_iblank = 0;
update_setvents = 1;
update_setcvents = 1;
#ifdef pp_SPEEDUP
printf("blanking data structures updated\n");
#endif
}
if(update_setvents==1){
SetVentDirs();
Expand Down
Loading