From 624cc3ca06c1d771050b44a9d2f43a57e0d951bc Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 3 Aug 2026 18:58:21 -0400 Subject: [PATCH 1/3] smokeview source: remove pp_SPEEDUP directive --- Source/smokeview/IOsmoke.c | 26 -------------------------- Source/smokeview/readsmv.c | 4 ---- Source/smokeview/smokeheaders.h | 9 --------- Source/smokeview/smokeviewvars.h | 4 ---- Source/smokeview/smv_geometry.c | 22 ---------------------- Source/smokeview/update.c | 12 ------------ 6 files changed, 77 deletions(-) diff --git a/Source/smokeview/IOsmoke.c b/Source/smokeview/IOsmoke.c index bf7657d9b..fb492340c 100644 --- a/Source/smokeview/IOsmoke.c +++ b/Source/smokeview/IOsmoke.c @@ -1298,12 +1298,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); @@ -1316,9 +1314,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; @@ -2695,20 +2691,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; @@ -2721,27 +2708,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; @@ -2754,9 +2730,7 @@ void MergeSmoke3DAll(void){ if(IsSmokeComponentPresent(smoke3di) == 0)continue; MergeSmoke3D(smoke3di); } -#ifdef pp_SPEEDUP THREAD_EXIT(mergesmoke3d_threads); -#endif } /* ------------------ UpdateSmoke3dMenuLabels ------------------------ */ diff --git a/Source/smokeview/readsmv.c b/Source/smokeview/readsmv.c index 37d1d5b02..61b51214b 100644 --- a/Source/smokeview/readsmv.c +++ b/Source/smokeview/readsmv.c @@ -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(); diff --git a/Source/smokeview/smokeheaders.h b/Source/smokeview/smokeheaders.h index d2ca2c5e9..ec9eb1987 100644 --- a/Source/smokeview/smokeheaders.h +++ b/Source/smokeview/smokeheaders.h @@ -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); @@ -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); diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h index 97b1bba56..7e5dafb41 100644 --- a/Source/smokeview/smokeviewvars.h +++ b/Source/smokeview/smokeviewvars.h @@ -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); @@ -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); diff --git a/Source/smokeview/smv_geometry.c b/Source/smokeview/smv_geometry.c index 3f0e6a880..684e2127e 100644 --- a/Source/smokeview/smv_geometry.c +++ b/Source/smokeview/smv_geometry.c @@ -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; igkbar; 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 || @@ -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; @@ -1508,11 +1490,7 @@ int MakeIBlank(void){ } update_make_iblank = 1; -#ifdef pp_SPEEDUP THREAD_EXIT(makeiblank_threads); -#else - return 0; -#endif } /* ------------------ InitClip ------------------------ */ diff --git a/Source/smokeview/update.c b/Source/smokeview/update.c index 14a78fce5..c33cf8239 100644 --- a/Source/smokeview/update.c +++ b/Source/smokeview/update.c @@ -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); @@ -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){ @@ -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(); From ad79bdab412012d8b4d121503c1781ecbb7bae71 Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 3 Aug 2026 18:59:28 -0400 Subject: [PATCH 2/3] smokeview source: remove #define pp_SPEEDUP --- Source/smokeview/options.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h index 3e05e00b9..5e77e8217 100644 --- a/Source/smokeview/options.h +++ b/Source/smokeview/options.h @@ -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 From 9ced64caebec1d3a9efab70923a2a15dc299e3f8 Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 3 Aug 2026 19:09:47 -0400 Subject: [PATCH 3/3] smokeview source: remove another pp_SPEEDUP --- Source/smokeview/IOsmoke.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/smokeview/IOsmoke.c b/Source/smokeview/IOsmoke.c index fb492340c..54af488e1 100644 --- a/Source/smokeview/IOsmoke.c +++ b/Source/smokeview/IOsmoke.c @@ -703,12 +703,6 @@ void UpdateSmokeAlphas(void){ for(j=0; jsoot_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]);