From 5bf1582ff7e6b85fe48e06ed071d241deb2381a3 Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Fri, 23 Jun 2023 13:30:54 -0400
Subject: [PATCH 1/5] smokeview source: remove pp_BGEOM keyword

---
 Source/smokeview/options.h |  3 ---
 Source/smokeview/readsmv.c | 10 ----------
 Source/smokeview/startup.c |  8 --------
 3 files changed, 21 deletions(-)

diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
index ecf0acd80c..36a2366eae 100644
--- a/Source/smokeview/options.h
+++ b/Source/smokeview/options.h
@@ -17,13 +17,10 @@
 #define pp_PART_MULTI         // load particle files in parallel
 #define pp_CSV_MULTI          // read in csv files in parallel
 
-#define pp_PART_BOUND         // use .prt.bnd for global part bound file extension
-
 //#define pp_COLOR_HIDE         // add checkbox to hide/unhide scene when editing a colorbar
 
 //#define pp_SMOKE_LIGHT        // turn on smoke lighting
 //#define pp_SMOKE_ADAPT        // turn on volume render smoke adaptive integration
-#define pp_BGEOM                // parse BGEOM smv keywords
 
 //#define pp_TOUR_ADJUST        // adjust tour times
 #define pp_TOUR_DUP             // handle duplicate keyframes
diff --git a/Source/smokeview/readsmv.c b/Source/smokeview/readsmv.c
index 1cfef32b65..b3cf8e6107 100644
--- a/Source/smokeview/readsmv.c
+++ b/Source/smokeview/readsmv.c
@@ -7001,9 +7001,7 @@ int ReadSMV(bufferstreamdata *stream){
       continue;
     }
     if(MatchSMV(buffer, "GEOM") == 1 ||
-#ifdef pp_BGEOM
        MatchSMV(buffer, "BGEOM") == 1 ||
-#endif
        MatchSMV(buffer, "SGEOM") == 1){
       ngeominfo++;
       continue;
@@ -8064,9 +8062,7 @@ int ReadSMV(bufferstreamdata *stream){
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   */
     if(MatchSMV(buffer, "GEOM") == 1 ||
-#ifdef pp_BGEOM
        MatchSMV(buffer, "BGEOM") == 1 ||
-#endif
        MatchSMV(buffer, "SGEOM") == 1){
       geomdata *geomi;
       char *buff2;
@@ -8084,18 +8080,12 @@ int ReadSMV(bufferstreamdata *stream){
         buff2 = buffer+5;
         sscanf(buff2,"%i",&ngeomobjinfo);
       }
-#ifdef pp_BGEOM
       if(MatchSMV(buffer, "BGEOM") == 1){
         InitGeom(geomi, GEOM_BOUNDARY, NOT_FDSBLOCK, CFACE_NORMALS_NO);
       }
       else if(MatchSMV(buffer, "SGEOM") == 1){
         InitGeom(geomi, GEOM_SLICE, NOT_FDSBLOCK, CFACE_NORMALS_NO);
       }
-#else
-      if(MatchSMV(buffer, "SGEOM") == 1){
-        InitGeom(geomi, GEOM_SLICE, NOT_FDSBLOCK, CFACE_NORMALS_NO);
-      }
-#endif
       else{
         is_geom = 1;
         InitGeom(geomi, GEOM_GEOM, FDSBLOCK, CFACE_NORMALS_NO);
diff --git a/Source/smokeview/startup.c b/Source/smokeview/startup.c
index 3b07e1815e..d98b495a40 100644
--- a/Source/smokeview/startup.c
+++ b/Source/smokeview/startup.c
@@ -224,17 +224,9 @@ int SetupCase(char *filename){
   return_code=-1;
 
   FREEMEMORY(part_globalbound_filename);
-#ifdef pp_PART_BOUND
   NewMemory((void **)&part_globalbound_filename, strlen(fdsprefix)+strlen(".prt.gbnd")+1);
-#else
-  NewMemory((void **)&part_globalbound_filename, strlen(fdsprefix)+strlen(".prt5.gbnd")+1);
-#endif
   STRCPY(part_globalbound_filename, fdsprefix);
-#ifdef pp_PART_BOUND
   STRCAT(part_globalbound_filename, ".prt.gbnd");
-#else
-  STRCAT(part_globalbound_filename, ".prt5.gbnd");
-#endif
   part_globalbound_filename = GetFileName(smokeview_scratchdir, part_globalbound_filename, NOT_FORCE_IN_DIR);
 
   // setup input files names

From 5fc626725fc8cf388d3d7ecbe34c37ed79ad59ae Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Fri, 23 Jun 2023 13:35:35 -0400
Subject: [PATCH 2/5] smokview source: remove pp_SMOKE_ADAPT directive

---
 Source/smokeview/IOvolsmoke.c    | 25 -------------------------
 Source/smokeview/glui_smoke.cpp  |  3 ---
 Source/smokeview/options.h       |  1 -
 Source/smokeview/shaders.c       | 18 ------------------
 Source/smokeview/smokeviewvars.h |  6 ------
 5 files changed, 53 deletions(-)

diff --git a/Source/smokeview/IOvolsmoke.c b/Source/smokeview/IOvolsmoke.c
index 4964e2a9b4..fdf338c7c0 100644
--- a/Source/smokeview/IOvolsmoke.c
+++ b/Source/smokeview/IOvolsmoke.c
@@ -1184,28 +1184,6 @@ void IntegrateSmokeColors(float *integrated_smokecolor, float *xyzvert, float dl
       GetSmokeColor(&smoke_transparency,&smoke_color, &scaled_intensity, &smoke_light_fraction,
                          dlength, xyz, meshi, &inobst, blank_local);
     }
-#ifdef pp_SMOKE_ADAPT
-    if(vol_adaptive==1&&xi>0.5){
-      float diff_color;
-
-#define COLOREPS_MAX 0.04
-#define COLOREPS_MIN 0.0
-      diff_color = MAXDIFF3(smoke_color,last_smoke_color);
-      if(
-         (diff_color>COLOREPS_MAX&&i_dlength>0.125)||
-         (diff_color<COLOREPS_MIN&&i_dlength<4.0)
-        ){
-        float grid_factor;
-
-        grid_factor = 0.5;
-        if(diff_color<COLOREPS_MIN)grid_factor = 2.0;
-        i_dlength *= grid_factor;
-        dlength *= grid_factor;
-        xi = last_xi + i_dlength;
-        continue;
-      }
-    }
-#endif
 #ifdef pp_SMOKE_LIGHT
     last_xi = xi;
 #endif
@@ -2195,9 +2173,6 @@ void DrawSmoke3DGPUVol(void){
   glUniform1f(GPUvol_xyzmaxdiff,xyzmaxdiff);
   glUniform1f(GPUvol_gpu_vol_factor,gpu_vol_factor);
   glUniform1f(GPUvol_fire_opacity_factor,fire_opacity_factor);
-#ifdef pp_SMOKE_ADAPT
-  glUniform1i(GPUvol_vol_adaptive, vol_adaptive);
-#endif
   glUniform1f(GPUvol_mass_extinct,mass_extinct);
   glUniform1i(GPUvol_volbw,volbw);
   glUniform1f(GPUvol_temperature_min, global_temp_min);
diff --git a/Source/smokeview/glui_smoke.cpp b/Source/smokeview/glui_smoke.cpp
index 4d260d4ca4..e35a9d6937 100644
--- a/Source/smokeview/glui_smoke.cpp
+++ b/Source/smokeview/glui_smoke.cpp
@@ -646,9 +646,6 @@ extern "C" void Glui3dSmokeSetup(int main_window){
     SPINNER_fire_opacity_factor->set_float_limits(1.0, 50.0);
     SPINNER_mass_extinct = glui_3dsmoke->add_spinner_to_panel(ROLLOUT_volsmoke_compute, _("Mass extinction coeff (m2/g)"), GLUI_SPINNER_FLOAT, &mass_extinct, MASS_EXTINCTION, Smoke3dCB);
     Smoke3dCB(MASS_EXTINCTION);
-#ifdef pp_SMOKE_ADAPT
-    glui_3dsmoke->add_checkbox_to_panel(ROLLOUT_volsmoke_compute, _("adaptive integration"), &vol_adaptive);
-#endif
     CHECKBOX_combine_meshes = glui_3dsmoke->add_checkbox_to_panel(ROLLOUT_volsmoke_compute, _("Combine meshes"), &combine_meshes, COMBINE_MESHES, Smoke3dCB);
     SPINNER_nongpu_vol_factor = glui_3dsmoke->add_spinner_to_panel(ROLLOUT_volsmoke_compute, _("non-gpu grid multiplier"), GLUI_SPINNER_FLOAT, &nongpu_vol_factor, NONGPU_VOL_FACTOR, Smoke3dCB);
     SPINNER_nongpu_vol_factor->set_float_limits(1.0, 10.0);
diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
index 36a2366eae..2a0278a3f4 100644
--- a/Source/smokeview/options.h
+++ b/Source/smokeview/options.h
@@ -20,7 +20,6 @@
 //#define pp_COLOR_HIDE         // add checkbox to hide/unhide scene when editing a colorbar
 
 //#define pp_SMOKE_LIGHT        // turn on smoke lighting
-//#define pp_SMOKE_ADAPT        // turn on volume render smoke adaptive integration
 
 //#define pp_TOUR_ADJUST        // adjust tour times
 #define pp_TOUR_DUP             // handle duplicate keyframes
diff --git a/Source/smokeview/shaders.c b/Source/smokeview/shaders.c
index ab76805d37..e549f1d2d7 100644
--- a/Source/smokeview/shaders.c
+++ b/Source/smokeview/shaders.c
@@ -276,9 +276,6 @@ int SetVolSmokeShaders(){
 #endif
     "uniform int drawsides[7];"
     "uniform int scatter_type,light_type;"
-#ifdef pp_SMOKE_ADAPT
-    "uniform int vol_adaptive;"
-#endif
 
     "float color2bw(vec3 color){"
     " return 0.299*color.r+0.587*color.g+0.114*color.b;"
@@ -444,18 +441,6 @@ int SetVolSmokeShaders(){
     "      light_factor = alphai*light_intensity*light_fraction*scatter_fraction;"
     "      color_total += alphai*taun*light_factor*light_color/255.0;"
     "    }"
-#endif
-#ifdef pp_SMOKE_ADAPT
-    "    if(vol_adaptive==1&&factor>factor0){"
-    "      if(abs(tempval-last_tempval)>1.0&&dfactor>0.1/float(n_iter)){"
-    "        dfactor/= 2.0;"
-    "        dstep /= 2.0;"
-    "      }"
-    "      if(abs(tempval-last_tempval)<0.5&&dfactor+0.01<dfactor0){"
-    "        dfactor *= 2.0;"
-    "        dstep *= 2.0;"
-    "      }"
-    "    }"
 #endif
     "    factor+=dfactor;"
     "    if(block_val2<0.5)break;"
@@ -516,9 +501,6 @@ int SetVolSmokeShaders(){
   GPUvol_xyzmaxdiff = glGetUniformLocation(p_volsmoke,"xyzmaxdiff");
   GPUvol_gpu_vol_factor = glGetUniformLocation(p_volsmoke,"gpu_vol_factor");
   GPUvol_fire_opacity_factor = glGetUniformLocation(p_volsmoke,"fire_opacity_factor");
-#ifdef pp_SMOKE_ADAPT
-  GPUvol_vol_adaptive = glGetUniformLocation(p_volsmoke, "vol_adaptive");
-#endif
   GPUvol_mass_extinct = glGetUniformLocation(p_volsmoke,"mass_extinct");
   GPUvol_volbw = glGetUniformLocation(p_volsmoke,"volbw");
   GPUvol_temperature_min = glGetUniformLocation(p_volsmoke,"temperature_min");
diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h
index 1564473b88..48b443b45b 100644
--- a/Source/smokeview/smokeviewvars.h
+++ b/Source/smokeview/smokeviewvars.h
@@ -480,9 +480,6 @@ SVEXTERN int SVDECL(nvel_devices, 0);
 
 SVEXTERN int SVDECL(update_slice, 0);
 SVEXTERN int SVDECL(*windrosez_showhide, NULL), SVDECL(nwindrosez_showhide,0), SVDECL(update_windrose_showhide,0);
-#ifdef pp_SMOKE_ADAPT
-SVEXTERN int SVDECL(vol_adaptive, 0);
-#endif
 #ifdef INMAIN
   SVEXTERN float smoke_test_color[4] = {0.0,0.0,0.0,1.0};
   SVEXTERN float smoke_test_target_color[4] = {1.0,0.0,0.0,1.0};
@@ -951,9 +948,6 @@ SVEXTERN int GPUvol_inside, GPUvol_eyepos, GPUvol_xyzmaxdiff, GPUvol_slicetype,G
 SVEXTERN int GPUvol_gpu_vol_factor;
 SVEXTERN int GPUvol_soot_density, GPUvol_fire, GPUvol_blockage;
 SVEXTERN int GPUvol_fire_opacity_factor, GPUvol_volbw, GPUvol_mass_extinct;
-#ifdef pp_SMOKE_ADAPT
-SVEXTERN int GPUvol_vol_adaptive;
-#endif
 SVEXTERN int GPUvol_temperature_min,GPUvol_temperature_cutoff,GPUvol_temperature_max;
 SVEXTERN int GPUvol_boxmin, GPUvol_boxmax, GPUvol_drawsides;
 SVEXTERN int GPUvol_smokecolormap, GPUvol_dcell, GPUvol_havefire;

From 9fd03b058fa2a5729781728854f3e24b784abb8d Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Fri, 23 Jun 2023 13:46:47 -0400
Subject: [PATCH 3/5] smokeview source: remove pp_TOUR_DUP directive

---
 Source/smokeview/IOtour.c       | 13 -------------
 Source/smokeview/glui_tour.cpp  |  9 ---------
 Source/smokeview/options.h      |  1 -
 Source/smokeview/readsmv.c      |  6 ------
 Source/smokeview/smokeheaders.h |  3 ---
 5 files changed, 32 deletions(-)

diff --git a/Source/smokeview/IOtour.c b/Source/smokeview/IOtour.c
index 1565725ba3..1a54ae6396 100644
--- a/Source/smokeview/IOtour.c
+++ b/Source/smokeview/IOtour.c
@@ -518,13 +518,6 @@ void HermiteView(float t, keyframe *kf1, keyframe *kf2, float *view){
   view[2] = HERMVAL(p0[2],p1[2],m0[2],m1[2]);
 }
 
-/* ------------------ UpdateTourKeyframeDups ------------------------ */
-
-#ifdef pp_TOUR_DUP
-void UpdateKeyframeDups(tourdata *touri){
-}
-#endif
-
 /* ------------------ GetKeyFrame ------------------------ */
 
 keyframe *GetKeyFrame(tourdata *touri, float time){
@@ -1220,9 +1213,6 @@ void InitCircularTour(tourdata *touri, int nkeyframes, int option){
   touri->last_frame.prev = thisframe;
   thisframe->next = &(touri->last_frame);
   selected_frame = touri->first_frame.next;
-#ifdef pp_TOUR_DUP
-  UpdateKeyframeDups(touri);
-#endif
 }
 
 
@@ -1384,9 +1374,6 @@ tourdata *AddTour(char *label){
   }
   updatemenu=1;
 
-#ifdef pp_TOUR_DUP
-  UpdateKeyframeDups(tourinfo + ntourinfo-1);
-#endif
   UpdateTourMenuLabels();
   CreateTourPaths();
   UpdateTimes();
diff --git a/Source/smokeview/glui_tour.cpp b/Source/smokeview/glui_tour.cpp
index d3b916b8b8..d647ffaff1 100644
--- a/Source/smokeview/glui_tour.cpp
+++ b/Source/smokeview/glui_tour.cpp
@@ -677,9 +677,6 @@ void TourCB(int var){
         SMV2FDS_XYZ(key_view, key_view);
       }
       newframe = AddFrame(selected_frame, key_time_in, 0.0, key_xyz, key_view);
-#ifdef pp_TOUR_DUP      
-      UpdateKeyframeDups(thistour);
-#endif
       CreateTourPaths();
       NewSelect(newframe);
       SetGluiTourKeyframe();
@@ -691,9 +688,6 @@ void TourCB(int var){
       selected_frame=DeleteFrame(selected_frame);
       if(selected_frame!=NULL){
         selected_frame->selected=1;
-#ifdef pp_TOUR_DUP     
-        UpdateKeyframeDups(thistour);
-#endif
         CreateTourPaths();
       }
       else{
@@ -773,9 +767,6 @@ void TourCB(int var){
   case TOUR_REVERSE:
     if(selectedtour_index>=0&&selectedtour_index<ntourinfo){
       ReverseTour(tourinfo[selectedtour_index].label);
-#ifdef pp_TOUR_DUP
-      UpdateKeyframeDups(tourinfo + selectedtour_index);
-#endif
     }
     break;
   case TOUR_INSERT_NEW:
diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
index 2a0278a3f4..25eeaf035c 100644
--- a/Source/smokeview/options.h
+++ b/Source/smokeview/options.h
@@ -22,7 +22,6 @@
 //#define pp_SMOKE_LIGHT        // turn on smoke lighting
 
 //#define pp_TOUR_ADJUST        // adjust tour times
-#define pp_TOUR_DUP             // handle duplicate keyframes
 //#define pp_BNDF               // merge geometry and structured boundary files in load menus
 
 //#define pp_DPRINT             // turn on debug print (file, line number)
diff --git a/Source/smokeview/readsmv.c b/Source/smokeview/readsmv.c
index b3cf8e6107..174956a2f3 100644
--- a/Source/smokeview/readsmv.c
+++ b/Source/smokeview/readsmv.c
@@ -15334,9 +15334,6 @@ int ReadIni2(char *inifile, int localfile){
               touri = tourinfo + i;
               touri->first_frame.next->prev = &touri->first_frame;
               touri->last_frame.prev->next = &touri->last_frame;
-#ifdef pp_TOUR_DUP
-              UpdateKeyframeDups(touri);
-#endif
             }
             UpdateTourMenuLabels();
             CreateTourPaths();
@@ -15484,9 +15481,6 @@ int ReadIni2(char *inifile, int localfile){
               touri = tourinfo + i;
               touri->first_frame.next->prev = &touri->first_frame;
               touri->last_frame.prev->next = &touri->last_frame;
-#ifdef pp_TOUR_DUP
-              UpdateKeyframeDups(touri);
-#endif
             }
             UpdateTourMenuLabels();
             CreateTourPaths();
diff --git a/Source/smokeview/smokeheaders.h b/Source/smokeview/smokeheaders.h
index c464bf901c..194118a7ca 100644
--- a/Source/smokeview/smokeheaders.h
+++ b/Source/smokeview/smokeheaders.h
@@ -279,9 +279,6 @@ EXTERNCPP void GetKeyXYZ(float t, keyframe *this_key, float *xyz);
 EXTERNCPP void GetTourXYZ(float t, tourdata *this_tour, float *xyz);
 EXTERNCPP void GetKeyView(float t, keyframe *this_key, float *view);
 EXTERNCPP void GetTourView(float t, tourdata *this_tour, float *view);
-#ifdef pp_TOUR_DUP
-EXTERNCPP void UpdateKeyframeDups(tourdata *touri);
-#endif
 EXTERNCPP int GetTourFrame(tourdata *touri, int itime);
 EXTERNCPP int MeshConnect(meshdata *mesh_from, int val, meshdata *mesh_to);
 EXTERNCPP int IsBottomMesh(meshdata *mesh_from);

From 15f0f0c15c49fc9f1334d334813dfe5deb603deb Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Fri, 23 Jun 2023 13:51:39 -0400
Subject: [PATCH 4/5] smokeview source: remove pp_TOUR_ADJUST directive

---
 Source/smokeview/IOtour.c        | 87 --------------------------------
 Source/smokeview/glui_tour.cpp   |  3 --
 Source/smokeview/options.h       |  1 -
 Source/smokeview/readsmv.c       | 12 -----
 Source/smokeview/smokeviewvars.h |  5 --
 Source/smokeview/structures.h    |  3 --
 6 files changed, 111 deletions(-)

diff --git a/Source/smokeview/IOtour.c b/Source/smokeview/IOtour.c
index 1a54ae6396..4b71c4445a 100644
--- a/Source/smokeview/IOtour.c
+++ b/Source/smokeview/IOtour.c
@@ -39,9 +39,6 @@ void FreeTour(tourdata *touri){
   FREEMEMORY(touri->keyframe_times);
   FREEMEMORY(touri->timeslist);
   FREEMEMORY(touri->path_times);
-#ifdef pp_TOUR_ADJUST
-  FREEMEMORY(touri->path_dists);
-#endif
 }
 
 /* ------------------ InitTour ------------------------ */
@@ -65,9 +62,6 @@ void InitTour(tourdata *touri){
   touri->keyframe_list=NULL;
   touri->timeslist=NULL;
   touri->path_times=NULL;
-#ifdef pp_TOUR_ADJUST
-  touri->path_dists = NULL;
-#endif
   touri->global_dist=0.0;
   touri->startup=0;
   touri->isDefault=0;
@@ -538,61 +532,12 @@ keyframe *GetKeyFrame(tourdata *touri, float time){
   return last_key->prev;
 }
 
-/* ------------------ GetTourXYZ0 ------------------------ */
-#ifdef pp_TOUR_ADJUST
-void GetTourXYZ0(float t, tourdata *this_tour, float *xyz){
-  keyframe *this_key;
-
-  this_key = GetKeyFrame(this_tour, t);
-  GetKeyXYZ(t, this_key, xyz);
-}
-
-/* ------------------ GetKeyXYZ ------------------------ */
-
-void GetTourXYZ(float t, tourdata *this_tour, float *xyz){
-  keyframe *this_key;
-  int i;
-  float factor, dt, tdist, tnew;
-
-//  int ISearch(float *list, int nlist, float key, int guess){
-  dt = this_tour->path_times[this_tour->ntimes - 1] - this_tour->path_times[0];
-  factor = 1.0;
-  if(dt>0.0){
-    factor *= this_tour->path_dists[this_tour->ntimes - 1];
-    factor /= this_tour->path_times[this_tour->ntimes - 1];
-  }
-  tdist = t * factor;
-  i = ISearch(this_tour->path_dists, this_tour->ntimes, tdist, 0);
-  if(i==this_tour->ntimes-1){
-    tnew = this_tour->path_times[this_tour->ntimes-1];
-  }
-  else{
-    float t1, t2, d1, d2;
-
-    d1 = this_tour->path_dists[i];
-    d2 = this_tour->path_dists[i+1];
-    t1 = this_tour->path_times[i];
-    t2 = this_tour->path_times[i + 1];
-    // (tdist - d1)/(d2-d1) = (t-t1)/(t2-t1)
-    if(d2-d1>0.0){
-      tnew = t1 + (t2 - t1) * (tdist - d1) / (d2 - d1);
-    }
-    else{
-      tnew = t1;
-    }
-  }
-  if(adjust_tour_time == 0)tnew = t;
-  this_key = GetKeyFrame(this_tour, tnew);
-  GetKeyXYZ(t, this_key, xyz);
-}
-#else
 void GetTourXYZ(float t, tourdata *this_tour, float *xyz){
   keyframe *this_key;
 
   this_key = GetKeyFrame(this_tour, t);
   GetKeyXYZ(t, this_key, xyz);
 }
-#endif
 
 
 /* ------------------ GetKeyXYZ ------------------------ */
@@ -755,11 +700,6 @@ void GetTourProperties(tourdata *touri){
   NewMemory((void **)&(xyzs),       3*tour_ntimes*sizeof(float));
   NewMemory((void **)&(views),      3*tour_ntimes*sizeof(float));
 
-#ifdef pp_TOUR_ADJUST
-  touri->path_dists[0]=0.0;
-  float lastxyz[3], thisxyz[3], tourdist;
-  tourdist = 0.0;
-#endif
   for(j=0;j<tour_ntimes;j++){
     float f1, vtime;
 
@@ -768,21 +708,6 @@ void GetTourProperties(tourdata *touri){
     vtime                = tour_tstart*(1.0-f1) + tour_tstop*f1;
     tour_times[j]        = vtime;
     touri->path_times[j] = vtime;
-#ifdef pp_TOUR_ADJUST
-    float dist;
-    GetTourXYZ0(vtime, touri, thisxyz);
-    if(j == 0){
-      dist = 0.0;
-    }
-    else{
-      float dx, dy, dz;
-
-      DDIST3(thisxyz, lastxyz, dist);
-    }
-    tourdist += dist;
-    touri->path_dists[j] = tourdist;
-    memcpy(lastxyz, thisxyz, 3 * sizeof(float));
-#endif
     {
       if(j==0){
         tour_times[j] = 0.0;
@@ -1158,9 +1083,6 @@ void InitCircularTour(tourdata *touri, int nkeyframes, int option){
   if(option == UPDATE){
     FREEMEMORY(touri->keyframe_times);
     FREEMEMORY(touri->path_times);
-#ifdef pp_TOUR_ADJUST
-    FREEMEMORY(touri->path_dists);
-#endif
   }
   InitTour(touri);
   touri->isDefault=1;
@@ -1170,9 +1092,6 @@ void InitCircularTour(tourdata *touri, int nkeyframes, int option){
   strcpy(touri->label,"Circular");
   NewMemory((void **)&touri->keyframe_times, nkeyframes*sizeof(float));
   NewMemory((void **)&touri->path_times,tour_ntimes*sizeof(float));
-#ifdef pp_TOUR_ADJUST
-  NewMemory((void **)&touri->path_dists, tour_ntimes * sizeof(float));
-#endif
   key_view[0]=tour_circular_view[0];
   key_view[1]=tour_circular_view[1];
   key_view[2]=tour_circular_view[2];
@@ -1309,9 +1228,6 @@ tourdata *AddTour(char *label){
 
   NewMemory((void **)&touri->keyframe_times, nkeyframes*sizeof(float));
   NewMemory((void **)&touri->path_times,tour_ntimes*sizeof(float));
-#ifdef pp_TOUR_ADJUST
-  NewMemory((void **)&touri->path_dists, tour_ntimes * sizeof(float));
-#endif
 
   if(itour==-1){
     VEC3EQCONS(key_view,0.0);
@@ -1443,9 +1359,6 @@ void ReallocTourMemory(void){
       touri = tourinfo + i;
       FREEMEMORY(touri->path_times);
       NewMemory((void **)&touri->path_times,tour_ntimes*sizeof(float));
-#ifdef pp_TOUR_ADJUST
-      NewMemory((void **)&touri->path_dists, tour_ntimes * sizeof(float));
-#endif
       touri->ntimes=tour_ntimes;
     }
     FREEMEMORY(tour_t);
diff --git a/Source/smokeview/glui_tour.cpp b/Source/smokeview/glui_tour.cpp
index d647ffaff1..2733d0fbce 100644
--- a/Source/smokeview/glui_tour.cpp
+++ b/Source/smokeview/glui_tour.cpp
@@ -258,9 +258,6 @@ extern "C" void GluiTourSetup(int main_window){
   glui_tour->add_spinner_to_panel(PANEL_path, _("start time"), GLUI_SPINNER_FLOAT, &tour_tstart, VIEW_times, TourCB);
   glui_tour->add_spinner_to_panel(PANEL_path, _("stop time:"), GLUI_SPINNER_FLOAT, &tour_tstop, VIEW_times, TourCB);
   glui_tour->add_spinner_to_panel(PANEL_path, _("points"),     GLUI_SPINNER_INT,   &tour_ntimes, VIEW_times, TourCB);
-#ifdef pp_TOUR_ADJUST
-  glui_tour->add_checkbox_to_panel(PANEL_path, _("Adjust tour times(experimental)"), &adjust_tour_time);
-#endif
   PANEL_misc = glui_tour->add_panel_to_panel(ROLLOUT_settings, "Misc", true);
   CHECKBOX_showintermediate = glui_tour->add_checkbox_to_panel(PANEL_misc, _("Show intermediate path nodes"), &show_path_knots);
   if(navatar_types > 0){
diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
index 25eeaf035c..ce82ef56bf 100644
--- a/Source/smokeview/options.h
+++ b/Source/smokeview/options.h
@@ -21,7 +21,6 @@
 
 //#define pp_SMOKE_LIGHT        // turn on smoke lighting
 
-//#define pp_TOUR_ADJUST        // adjust tour times
 //#define pp_BNDF               // merge geometry and structured boundary files in load menus
 
 //#define pp_DPRINT             // turn on debug print (file, line number)
diff --git a/Source/smokeview/readsmv.c b/Source/smokeview/readsmv.c
index 174956a2f3..e39597c1d2 100644
--- a/Source/smokeview/readsmv.c
+++ b/Source/smokeview/readsmv.c
@@ -15274,9 +15274,6 @@ int ReadIni2(char *inifile, int localfile){
 
               touri = tourinfo + i;
               touri->path_times = NULL;
-#ifdef pp_TOUR_ADJUST
-              touri->path_dists = NULL;
-#endif
               touri->display = 0;
             }
           }
@@ -15306,9 +15303,6 @@ int ReadIni2(char *inifile, int localfile){
 
               if(NewMemory((void **)&touri->keyframe_times, nkeyframes*sizeof(float)) == 0)return 2;
               if(NewMemory((void **)&touri->path_times, tour_ntimes*sizeof(float)) == 0)return 2;
-#ifdef pp_TOUR_ADJUST
-              if(NewMemory((void **)&touri->path_dists, tour_ntimes * sizeof(float)) == 0)return 2;
-#endif
               thisframe = &touri->first_frame;
               for(j = 0; j < nkeyframes; j++){
                 key_pause_time = 0.0;
@@ -15391,9 +15385,6 @@ int ReadIni2(char *inifile, int localfile){
 
               touri = tourinfo + i;
               touri->path_times = NULL;
-#ifdef pp_TOUR_ADJUST
-              touri->path_dists = NULL;
-#endif             
               touri->display = 0;
             }
           }
@@ -15426,9 +15417,6 @@ int ReadIni2(char *inifile, int localfile){
 
               if(NewMemory((void **)&touri->keyframe_times, nkeyframes*sizeof(float)) == 0)return 2;
               if(NewMemory((void **)&touri->path_times, tour_ntimes*sizeof(float)) == 0)return 2;
-#ifdef pp_TOUR_ADJUST
-              if(NewMemory((void **)&touri->path_dists, tour_ntimes * sizeof(float)) == 0)return 2;
-#endif
               thisframe = &touri->first_frame;
               for(j = 0; j < nkeyframes; j++){
                 key_view[0] = 0.0;
diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h
index 48b443b45b..7331d4b2cb 100644
--- a/Source/smokeview/smokeviewvars.h
+++ b/Source/smokeview/smokeviewvars.h
@@ -389,11 +389,6 @@ SVEXTERN float SVDECL(geomboundary_linewidth, 5.0);
 
 SVEXTERN int SVDECL(smoke3d_only, 0);
 SVEXTERN int SVDECL(update_tour_path,1);
-#ifdef pp_TOUR_ADJUST
-SVEXTERN int SVDECL(adjust_tour_time, 1);
-#else
-SVEXTERN int SVDECL(adjust_tour_time, 0);
-#endif
 SVEXTERN int SVDECL(tour_circular_index, -1);
 SVEXTERN float tour_circular_center[3], tour_circular_radius, tour_circular_view[3], SVDECL(tour_circular_angle0,0.0);
 SVEXTERN float tour_circular_center_default[3], tour_circular_radius_default, tour_circular_view_default[3];
diff --git a/Source/smokeview/structures.h b/Source/smokeview/structures.h
index c0b60ff1a4..34a99064aa 100644
--- a/Source/smokeview/structures.h
+++ b/Source/smokeview/structures.h
@@ -916,9 +916,6 @@ typedef struct _tourdata {
   keyframe first_frame,last_frame, **keyframe_list;
   int glui_avatar_index, display2;
   float *path_times,*keyframe_times;
-#ifdef pp_TOUR_ADJUST
-  float *path_dists;
-#endif
   float xyz_smv[3], view_smv[3];
   float global_dist;
   int *timeslist;

From d31ca767e5188dce2be2819e5e32b81f921f2362 Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Fri, 23 Jun 2023 14:02:34 -0400
Subject: [PATCH 5/5] smokeview source: remove GL_H headers added in earlier
 commit - now in smokeviewvars.h

---
 Source/smokeview/IOplot2d.c      | 5 -----
 Source/smokeview/camera.c        | 4 ----
 Source/smokeview/getdatabounds.c | 5 -----
 Source/smokeview/renderhtml.c    | 4 ----
 Source/smokeview/renderimage.c   | 5 -----
 Source/smokeview/threader.c      | 5 -----
 6 files changed, 28 deletions(-)

diff --git a/Source/smokeview/IOplot2d.c b/Source/smokeview/IOplot2d.c
index f1be66e093..04331656ce 100644
--- a/Source/smokeview/IOplot2d.c
+++ b/Source/smokeview/IOplot2d.c
@@ -4,11 +4,6 @@
 #include <math.h>
 #include <string.h>
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
-
 #include "datadefs.h"
 #include "smokeviewvars.h"
 
diff --git a/Source/smokeview/camera.c b/Source/smokeview/camera.c
index 25394e9a63..8ead01d052 100644
--- a/Source/smokeview/camera.c
+++ b/Source/smokeview/camera.c
@@ -4,10 +4,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
 
 #include "smokeviewvars.h"
 
diff --git a/Source/smokeview/getdatabounds.c b/Source/smokeview/getdatabounds.c
index a168b1ffc7..19291a1cd7 100644
--- a/Source/smokeview/getdatabounds.c
+++ b/Source/smokeview/getdatabounds.c
@@ -4,11 +4,6 @@
 #include <string.h>
 #include <math.h>
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
-
 #include "smokeviewvars.h"
 #include "IOscript.h"
 
diff --git a/Source/smokeview/renderhtml.c b/Source/smokeview/renderhtml.c
index f6e999d72b..e1c6d56d82 100644
--- a/Source/smokeview/renderhtml.c
+++ b/Source/smokeview/renderhtml.c
@@ -5,10 +5,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <math.h>
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
 
 #include "smokeviewvars.h"
 #include "interp.h"
diff --git a/Source/smokeview/renderimage.c b/Source/smokeview/renderimage.c
index 9c0bbd266c..fcfb049480 100644
--- a/Source/smokeview/renderimage.c
+++ b/Source/smokeview/renderimage.c
@@ -6,11 +6,6 @@
 #include <sys/stat.h>
 #include <math.h>
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
-
 #include "smokeviewvars.h"
 
 #include GLUT_H
diff --git a/Source/smokeview/threader.c b/Source/smokeview/threader.c
index 0d231e9a5e..8117e7f1a0 100644
--- a/Source/smokeview/threader.c
+++ b/Source/smokeview/threader.c
@@ -4,11 +4,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-#include GL_H
-
 #include "smokeviewvars.h"
 #include "IOvolsmoke.h"
 #include "smokestream.h"