Merge pull request #2651 from gforney/master

remove some unused preprocessing directives

Author: gforney

Source/shared/compress.c

@@ -229,253 +229,3 @@ int UnCompressVolSliceFrame(unsigned char *compressed_data_in,
   }
   return countout;
 }
-
-#ifdef pp_COMPRESS
-#ifndef IJKMAP
-#define IJKMAP(i,j,k,nx,nxy) ((i)+(j)*nx+(k)*nxy)
-#endif
-
-/* ------------------ Compress3D ------------------------ */
-
-unsigned char AverageCube(unsigned *buffer, int *ijk_start, int *ijk_end, int *nijk, unsigned char *minmax){
-  unsigned char average=0;
-  unsigned int faverage=0;
-  int i, j, k;
-  int nx = nijk[0], nxy = nijk[0] * nijk[1];
-  int sum;
-
-  nx = nijk[0];
-  nxy = nijk[0]*nijk[1];
-  sum  = (ijk_end[0] + 1 - ijk_start[0]);
-  sum *= (ijk_end[1] + 1 - ijk_start[1]);
-  sum *= (ijk_end[2] + 1 - ijk_start[2]);
-
-  for(k = ijk_start[2]; k <= ijk_end[2]; k++){
-    for(j = ijk_start[1]; j <= ijk_end[1]; j++){
-      for(i = ijk_start[0]; i <= ijk_end[0]; i++){
-        faverage += buffer[IJKMAP(i, j, k, nx, nxy)];
-      }
-    }
-  }
-  if(sum!=0)average = (unsigned char)(faverage/sum);
-  return average;
-}
-
-/* ------------------ Reorder3D ------------------------ */
-
-void Reorder3D(int **fds2smv, int **smv2fds, int *nijk){
-  int i, j, k;
-  int skipi, skipj, skipk, nsize, nx, nxy;
-  int *state, *fds2smvptr = NULL, *smv2fdsptr = NULL;
-  int count = 0;
-  int nskipi, nskipj, nskipk;
-
-  if(nijk[0] * nijk[1] * nijk[2] <= 0)return;
-
-  skipi = nijk[0];
-  skipj = nijk[1];
-  skipk = nijk[2];
-
-  nskipi = 1;
-  for(;;){
-    if(skipi <= 1)break;
-    nskipi++;
-    skipi /= 2;
-  }
-  nskipj = 1;
-  for(;;){
-    if(skipj <= 1)break;
-    nskipj++;
-    skipj /= 2;
-  }
-  nskipk = 1;
-  for(;;){
-    if(skipk <= 1)break;
-    nskipk++;
-    skipk /= 2;
-  }
-
-  nsize = nskipi * nskipj * nskipk;
-  nx = nskipi;
-  nxy = nskipi * nskipj;
-
-  NewMemory(( void ** )&state, nsize);
-
-  NewMemory(( void ** )&fds2smvptr, nsize);
-  *fds2smv = fds2smvptr;
-
-  NewMemory(( void ** )&smv2fdsptr, nsize);
-  *smv2fds = smv2fdsptr;
-
-  for(i = 0; i < nsize; i++){
-    state[i] = 0;
-    fds2smvptr[i] = -1;
-    smv2fdsptr[i] = -1;
-  }
-
-  skipi = nijk[0];
-  skipj = nijk[1];
-  skipk = nijk[2];
-  for(;;){
-    for(k = 0; k < nijk[2]; k += skipk){
-      for(j = 0; j < nijk[1]; j += skipj){
-        for(i = 0; i < nijk[0]; i += skipi){
-          int ijk;
-
-          ijk = IJKMAP(i, j, k, nx, nxy);
-          if(state[ijk] == 0){
-            fds2smvptr[count] = ijk;
-            smv2fdsptr[ijk] = count;
-            count++;
-          }
-          else{
-            state[ijk] = 1;
-          }
-        }
-      }
-    }
-    if(skipi == 1 && skipj == 1 && skipk == 1)break;
-    skipi = skipi/2;
-    if(skipi < 1)skipi = 1;
-    skipj = skipj/2;
-    if(skipj < 1)skipj = 1;
-    skipk = skipk/2;
-    if(skipk < 1)skipk = 1;
-  }
-  for(i = 0; i < nsize; i++){
-    assert(fds2smvptr[i] >= 0);
-    assert(smv2fdsptr[i] >= 0);
-  }
-
-  FREEMEMORY(state);
-}
-
-/* --------------------------  octtreedata ------------------------------- */
-
-typedef struct _octreedata {
-  unsigned char val, valmin, valmax, mask, bottom;
-  struct _octreedata *subtrees[8];
-  int ijkmin[3], ijkmax[3], nsubtrees;
-} octtreedata;
-
-/* ------------------ InitOctTree ------------------------ */
-
-octtreedata *InitOctTree(unsigned char *vals, int *nijk, unsigned char level, int *ijkmin, int *ijkmax){
-  octtreedata *oi;
-  int i,j,k;
-  unsigned char valmin = 255, valmax = 0, val;
-  unsigned int valsum = 0;
-  int nx, ny, nxy, nz, nvals;
-
-  nx = nijk[0];
-  ny = nijk[1];
-  nz = nijk[2];
-  nxy = nx*ny;
-  nvals = nx * ny * nz;
-
-  valmin = vals[IJKMAP(ijkmin[0], ijkmin[1], ijkmin[2], nx, nxy)];
-  valmax = valmin;
-
-  NewMemory((void **)&oi, sizeof(octtreedata));
-
-  memcpy(oi->ijkmin, ijkmin, 3 * sizeof(int));
-  memcpy(oi->ijkmax, ijkmax, 3 * sizeof(int));
-
-  for(k = ijkmin[2]; k <= ijkmax[2]; k++){
-    for(j = ijkmin[1]; 1 <= ijkmax[1]; j++){
-      for(i = ijkmin[0]; i <= ijkmax[0]; i++){
-        val = vals[IJKMAP(i,j,k, nx, nxy)];
-        if(val < valmin)valmin = val;
-        if(val > valmax)valmax = val;
-        valsum += val;
-      }
-    }
-  }
-  if(valmax - valmin <= level){
-    oi->bottom = 1;
-  }
-  else{
-    oi->bottom = 0;
-  }
-  oi->mask = 0;
-  oi->valmin = valmin;
-  oi->valmax = valmax;
-  oi->nsubtrees = 0;
-  oi->val = valsum / nvals;
-  for(i = 0; i < 8; i++){
-    oi->subtrees[i] = NULL;
-  }
-  return oi;
-}
-
-/* ------------------ MakeSubOctTrees ------------------------ */
-
-void MakeSubOctTrees(octtreedata *oi, unsigned char level, unsigned char *vals, int *nijk){
-  int i, j, k;
-  int ijkmin[3], ijkmax[3];
-  unsigned char submask[8] = {1, 2, 4, 8,16,32,64,128};
-
-//  nx = nijk[0];
-//  nxy = nijk[0] * nijk[1];
-
-  if(oi->bottom==1)return;
-  if(ijkmin[0] == ijkmax[0] && ijkmin[1] == ijkmax[1] && ijkmin[2] == ijkmax[2])return;
-
-  int index = 0;
-  for(k = 0; k < 2; k++){
-    if(k == 0){
-      ijkmin[2] = oi->ijkmin[2];
-      ijkmax[2] = (oi->ijkmin[2] + oi->ijkmax[2]) / 2;
-    }
-    else{
-      ijkmin[2] = (oi->ijkmin[2] + oi->ijkmax[2]) /2 +1;
-      ijkmax[2] = oi->ijkmax[2];
-    }
-    for(j = 0; j < 2; j++){
-      if(j == 0){
-        ijkmin[1] = oi->ijkmin[1];
-        ijkmax[1] = (oi->ijkmin[1] + oi->ijkmax[1]) / 2;
-      }
-      else{
-        ijkmin[1] = (oi->ijkmin[1] + oi->ijkmax[1]) / 2 +1;
-        ijkmax[1] = oi->ijkmax[1];
-      }
-      for(i = 0; i < 2; i++){
-        if(i == 0){
-          ijkmin[0] = oi->ijkmin[0];
-          ijkmax[0] = (oi->ijkmin[0] + oi->ijkmax[0]) / 2;
-        }
-        else{
-          ijkmin[0] = (oi->ijkmin[0] + oi->ijkmax[0]) / 2 +1;
-          ijkmax[0] = oi->ijkmax[0];
-        }
-        if(ijkmin[0] == ijkmax[0] && ijkmin[1] == ijkmax[1] && ijkmin[2] == ijkmax[2]){
-          memcpy(oi->ijkmin, ijkmin, 3 * sizeof(int));
-          memcpy(oi->ijkmax, ijkmax, 3 * sizeof(int));
-          oi->subtrees[index] = InitOctTree(vals, nijk, level, ijkmin, ijkmax);
-          oi->mask &= submask[index];
-        }
-        else{
-          oi->subtrees[index] = NULL;
-        }
-        index++;
-      }
-    }
-  }
-}
-
-/* ------------------ OctTreeCompress ------------------------ */
-
-octtreedata *OctTreeCompress(unsigned char *vals, int *nijk, unsigned char level){
-  int ijkmin[3], ijkmax[3];
-
-  ijkmin[0] = 0;
-  ijkmin[1] = 0;
-  ijkmin[2] = 0;
-  ijkmax[0] = nijk[0] - 1;
-  ijkmax[1] = nijk[1] - 1;
-  ijkmax[2] = nijk[2] - 1;
-
-  return InitOctTree(vals, nijk, level, ijkmin, ijkmax);
-}
-#endif

Source/shared/options_common.h

@@ -194,7 +194,7 @@
 #endif
 #endif
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
 #define GETMESH GetMeshTest
 #else
 #define GETMESH GetMesh

Source/smokeview/IOpart.c

@@ -377,9 +377,6 @@ void DrawPart(const partdata *parti, int mode){
                 }
                 prop = datacopy->partclassbase->prop;
                 CopyDepVals(partclassi, datacopy, colorptr, prop, j);
-#ifdef pp_PART_SCALE
-                glScalef(SCALE2SMV(1.0), SCALE2SMV(1.0), SCALE2SMV(1.0));
-#endif
                 partfacedir[0] = global_scase.xbar0 + SCALE2SMV(fds_eyepos[0]) - xpos[j];
                 partfacedir[1] = global_scase.ybar0 + SCALE2SMV(fds_eyepos[1]) - ypos[j];
                 partfacedir[2] = global_scase.zbar0 + SCALE2SMV(fds_eyepos[2]) - zpos[j];

Source/smokeview/IOzone.c

@@ -374,11 +374,6 @@ void GetZoneDataCSV(int nzone_times_local, int nrooms_local, int nfires_local, i
     }
     zonefarea_devs[i]->in_zone_csv=1;
   }
-#ifdef pp_ZONEVENT
-  if(zonevents_devs == NULL)return;
-  if(zoneslab_n_devs == NULL)return;
-  if(zoneslab_T_devs == NULL || zoneslab_F_devs == NULL || zoneslab_YB_devs == NULL||zoneslab_YT_devs == NULL)return;
-#endif
   for(i = 0; i < global_scase.nzhvents+global_scase.nzvvents+global_scase.nzmvents; i++){
     char label[100],vent_type[10];
     int vent_index;

Source/smokeview/options.h

@@ -17,10 +17,7 @@
 //#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_TEST
-//#define pp_COMPRESS         // new compression code
-//#define pp_ZONEVENT         // shouldn't need code surrounded by this directive
-//#define pp_PART_SCALE       // add scale call when drawing particle objects (probably not necessary)
+//#define pp_GETMESH
 
 //*** options: windows
 

Source/smokeview/readsmv.c

@@ -2836,7 +2836,7 @@ int ReadSMV_Configure(){
     }
   }
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
   scenedata *InitSceneInfo(void);
   INIT_PRINT_TIMER(timer_sceneinfo);
   sceneinfo = InitSceneInfo();

Source/smokeview/smokeviewvars.h

@@ -2016,7 +2016,7 @@ SVEXTERN float SVDECL(co2_halfdepth, 10.0);
 
 SVEXTERN int SVDECL(co2_colormap_type, CO2_COLORBAR);
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
 SVEXTERN scenedata SVDECL(*sceneinfo, NULL);
 #endif
 

Source/smokeview/smv_geometry.c

@@ -278,7 +278,7 @@ int InExterior(float *xyz){
   return 1;
 }
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
 #define IJKSCELL(i,j,k) ((k)*nij+(j)*ni+(i))
 
 /* --------------------------  GetCellIndex ----------------------------------- */

Source/smokeview/structures.h

@@ -348,7 +348,7 @@ typedef struct _skyboxdata {
   texturedata face[6];
 } skyboxdata;
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
 /* --------------------------  celldata ----------------------------------- */
 
 typedef struct _celldata {

Source/smokeview/viewports.c

@@ -1448,7 +1448,7 @@ void GetSmokeDir(float *mm){
   eye_position_fds[1] = SMV2FDS_Y(eye_position_smv[1]);
   eye_position_fds[2] = SMV2FDS_Z(eye_position_smv[2]);
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
   for(j = 0; j < global_scase.meshescoll.nmeshes + 1; j++){
 #else
   for(j = 0; j < global_scase.meshescoll.nmeshes; j++){
@@ -1458,7 +1458,7 @@ void GetSmokeDir(float *mm){
     float absangle, cosangle, minangle, mincosangle;
     int iminangle, alphadir, minalphadir;
 
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
     if(j < global_scase.meshescoll.nmeshes){
       meshj = global_scase.meshescoll.meshinfo + j;
       dx = meshj->boxmiddle_smv[0] - eye_position_smv[0];
@@ -1540,7 +1540,7 @@ void GetSmokeDir(float *mm){
         }
       }
     }
-#ifdef pp_GETMESH_TEST
+#ifdef pp_GETMESH
     if(j < global_scase.meshescoll.nmeshes){
       meshj->smokedir = iminangle;
     }