preliminary improvements to 3d smoke drawing efficiency

Build/for_bundle/smokeview.ini

@@ -432,10 +432,6 @@ EXTREMECOLORS
  191 191 191 0 0 0
 FIRECOLOR
  255 128 0
-FIREDEPTH
- 0.300000 10.000000 3.000000 0 0
-FDEPTH
- 0.300000 10.000000 3.000000 0 0
 HRRPUVCUTOFF
  200.000000 1200.000000 0 255
 SHOWEXTREMEDATA

Source/shared/options_common.h

@@ -147,6 +147,10 @@
 #define PRINT_TIMER(timer, label) PrintTime(__FILE__, __LINE__, &timer, label, 1)
 #endif
 
+#ifndef PRINT_TIMER_LF
+#define PRINT_TIMER_LF(timer) if(show_timings==1 && timer>0.1)printf("\n")
+#endif
+
 #ifndef PRINT_CUM_TIMER
 #define PRINT_CUM_TIMER(timer, label) PrintTime(__FILE__, __LINE__, &timer, label, 0)
 #endif

Source/shared/readsmoke.c

@@ -20,7 +20,6 @@ void FreeSmoke3D(smv_case *scase, smoke3ddata *smoke3di){
   meshi = scase->meshescoll.meshinfo + smoke3di->blocknumber;
   FREEMEMORY(meshi->is_firenode);
   meshi->is_firenodeptr = NULL;
-  smoke3di->lastiframe = -999;
   float ext;
   char *label;
 

Source/shared/readsmvfile.c

@@ -3704,8 +3704,7 @@ int ParseSMOKE3DProcess(smv_case *scase, bufferstreamdata *stream, char *buffer,
     smoke3di->ntimes_old = 0;
     smoke3di->filetype = filetype;
     smoke3di->is_zlib = 0;
-    smoke3di->is_smoke_density    = 0;
-    smoke3di->soot_density_loaded = 0;
+    smoke3di->soot_loaded = 0;
     smoke3di->seq_id = nn_smoke3d;
     smoke3di->autoload = 0;
     smoke3di->compression_type = COMPRESSED_UNKNOWN;
@@ -3737,7 +3736,6 @@ int ParseSMOKE3DProcess(smv_case *scase, bufferstreamdata *stream, char *buffer,
     smoke3di->is_fire = 0;
     smoke3di->file_size = 0;
     smoke3di->blocknumber = blocknumber;
-    smoke3di->lastiframe = -999;
     smoke3di->ismoke3d_time = 0;
     STRCPY(buffer2, bufferptr);
     STRCAT(buffer2, ".svz");
@@ -3753,6 +3751,7 @@ int ParseSMOKE3DProcess(smv_case *scase, bufferstreamdata *stream, char *buffer,
     }
     else{
       smoke3di->file = smoke3di->reg_file;
+      smoke3di->compression_type = COMPRESSED_RLE;
     }
 #ifdef pp_SMOKE3D_FORCE
     if(strcmp(smoke3di->file, "dummy.xyz") == 0){
@@ -3775,6 +3774,7 @@ int ParseSMOKE3DProcess(smv_case *scase, bufferstreamdata *stream, char *buffer,
       if(ReadLabels(&smoke3di->label, stream, NULL)==LABEL_ERR)return RETURN_TWO;
       if(strcmp(smoke3di->label.longlabel, "SOOT DENSITY") == 0){
         smoke3di->is_smoke = 1;
+        smoke3di->reg_file = smoke3di->smoke_density_file;
       }
       if(strcmp(smoke3di->label.longlabel, "HRRPUV")==0){
         scase->show_hrrcutoff_active = 1;

Source/shared/shared_structures.h

@@ -1423,8 +1423,8 @@ typedef struct _smoke3ddata {
   int is_smoke, is_fire;
   int loaded, request_load, finalize, display, primary_file;
   int is_zlib;
-  int is_smoke_density;
-  int soot_density_loaded;
+
+  int soot_loaded;
   smokestatedata *smokestate;
   int blocknumber;
   int type;
@@ -1450,7 +1450,7 @@ typedef struct _smoke3ddata {
   int fire_alpha, co2_alpha;
   float fire_alphas[256], co2_alphas[256];
   int *timeslist;
-  int ntimes, ntimes_old, ismoke3d_time, lastiframe, ntimes_full;
+  int ntimes, ntimes_old, ismoke3d_time, ntimes_full;
   int nchars_uncompressed;
 
   int ncomp_smoke_total;

Source/shared/threader.c

@@ -130,6 +130,17 @@ void THREADruni(threaderdata *thi, unsigned char *datainfo, int sizedatai){
 #endif
 }
 
+/* ------------------ THREADrunloop ------------------------ */
+
+void THREADrunloop(threaderdata *thi){
+  int i, thread_ids[MAX_THREADS];
+
+  for(i = 0;i < MAX_THREADS;i++){
+    thread_ids[i] = i;
+  }
+  THREADruni(thi, (unsigned char *)thread_ids, sizeof(int));
+}
+
 /* ------------------ THREADrun ------------------------ */
 
 void THREADrun(threaderdata *thi){

Source/shared/threader.h

@@ -33,7 +33,8 @@ typedef struct _threaderdata{
 
 EXTERNCPP void THREADcontrol(threaderdata *thi, int var);
 EXTERNCPP void THREADrun(threaderdata *thi);
-EXTERNCPP void THREADruni(threaderdata *thi, unsigned char *datainfo, int sizedatai);
+EXTERNCPP void THREADrunloop(threaderdata *thi);
+EXTERNCPP void THREADruni(threaderdata * thi, unsigned char *datainfo, int sizedatai);
 EXTERNCPP threaderdata *THREADinit(int *nthreads_arg, int *threading_on_arg, void *(*run_arg)(void *arg));
 
 //*** threader controls