smokeview source: change pp_GPUTHROTTLE to pp_GPU (will always thrott…

…le gpu if pp_GPU is set
firemodels · Oct 29, 2024 · 0a153e5 · 0a153e5
1 parent a7b6d49
commit 0a153e5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/Source/smokeview/IOvolsmoke.c b/Source/smokeview/IOvolsmoke.c
@@ -2272,8 +2272,8 @@ void UpdateVolsmokeSupertexture(supermeshdata *smesh){
     ni = meshi->ibar+1;
     nj = meshi->jbar+1;
     nk = meshi->kbar+1;
-#ifdef pp_GPUTHROTTLE
-  GPUnframes+=3*ni*nj*nk;
+#ifdef pp_GPU
+    GPUnframes += 3*ni*nj*nk;
 #endif
     glTexSubImage3D(GL_TEXTURE_3D,0,s_offset[0],s_offset[1],s_offset[2],ni,nj,nk,GL_RED, GL_FLOAT, smokedataptr);
   }
@@ -2295,8 +2295,8 @@ void UpdateVolsmokeSupertexture(supermeshdata *smesh){
     ni = meshi->ibar+1;
     nj = meshi->jbar+1;
     nk = meshi->kbar+1;
-#ifdef pp_GPUTHROTTLE
-    GPUnframes+=3*ni*nj*nk;
+#ifdef pp_GPU
+    GPUnframes += 3*ni*nj*nk;
 #endif
 
     glTexSubImage3D(GL_TEXTURE_3D,0,s_offset[0],s_offset[1],s_offset[2],ni,nj,nk,GL_RED, GL_FLOAT, firedataptr);
@@ -2319,8 +2319,8 @@ void UpdateVolsmokeSupertexture(supermeshdata *smesh){
     ni = meshi->ibar;
     nj = meshi->jbar;
     nk = meshi->kbar;
-#ifdef pp_GPUTHROTTLE
-    GPUnframes+=3*ni*nj*nk;
+#ifdef pp_GPU
+    GPUnframes += 3*ni*nj*nk;
 #endif
 
     if(meshi->f_iblank_cell != NULL){
@@ -2346,8 +2346,8 @@ void UpdateVolsmokeTexture(meshdata *meshi){
   ni = meshi->ibar+1;
   nj = meshi->jbar+1;
   nk = meshi->kbar+1;
-#ifdef pp_GPUTHROTTLE
-  GPUnframes+=3*ni*nj*nk;
+#ifdef pp_GPU
+  GPUnframes += 3*ni*nj*nk;
 #endif
   glActiveTexture(GL_TEXTURE0);
   glTexSubImage3D(GL_TEXTURE_3D,0,ijk_offset[0],ijk_offset[1],ijk_offset[2],ni,nj,nk,GL_RED, GL_FLOAT, smokedata_local);
@@ -2381,7 +2381,7 @@ void DrawSmoke3DGPUVol(void){
   float dcell;
 
 //  SVEXTERN int GPUload[30],GPUtime[30],SVDECL(nGPUframes,0),SVDECL(iGPUframes,0);
-#ifdef pp_GPUTHROTTLE
+#ifdef pp_GPU
   START_TIMER(thisGPUtime);
   if(thisGPUtime>lastGPUtime+0.25){
 #ifdef _DEBUG

diff --git a/Source/smokeview/callbacks.c b/Source/smokeview/callbacks.c
@@ -1463,7 +1463,7 @@ void MouseDragCB(int xm, int ym){
 #endif
 
   in_external=0;
-#ifdef pp_GPUTHROTTLE
+#ifdef pp_GPU
   if(usegpu==1&&showvolrender==1&&show_volsmoke_moving==1){
     if(ThrottleGpu()==1)return;
   }

diff --git a/Source/smokeview/glui_motion.cpp b/Source/smokeview/glui_motion.cpp
@@ -2011,7 +2011,7 @@ extern "C" void GLUISceneMotionCB(int var){
     return;
   }
 
-#ifdef pp_GPUTHROTTLE
+#ifdef pp_GPU
   if(usegpu==1&&showvolrender==1&&show_volsmoke_moving==1&&
      (var==EYE_ROTATE||var==EYE_ROTATE_90||var==ROTATE_2AXIS||var==TRANSLATE_XY||var==GLUI_Z)
     ){

diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
@@ -11,9 +11,6 @@
 #define pp_FAST             // set fast startup by default
 #define pp_GPU              // support the GPU
 #define pp_THREAD           // turn on multi-threading
-#ifdef pp_GPU
-#define pp_GPUTHROTTLE      // pp_GPU directive must also be set
-#endif
 //#define pp_FDS            // create a 1 mesh input file
 
 #ifdef pp_FRAME          // turn on each frame type if pp_FRAME is set

diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h
@@ -872,7 +872,7 @@ SVEXTERN int SVDECL(ngeominfoptrs,0);
 
 SVEXTERN char startup_lang_code[3];
 
-#ifdef pp_GPUTHROTTLE
+#ifdef pp_GPU
   SVEXTERN float SVDECL(thisGPUtime,0.0), SVDECL(lastGPUtime,0.0);
   SVEXTERN float SVDECL(thisMOTIONtime,0.0), SVDECL(lastMOTIONtime,0.0);
   SVEXTERN int SVDECL(GPUnframes,0),SVDECL(MOTIONnframes,0);