Merge pull request #2605 from gforney/master

corrections to 3d smoke/fire opacity computations that show up for small scale cases

Author: gforney

Source/smokeview/IOsmoke.c

@@ -711,12 +711,6 @@ void InitAlphas(unsigned char *smokealphanew, unsigned char *firealphanew, float
   if(smoke3d_frame_inc != 1)new_dx *= (float)smoke3d_frame_inc;
   have_fire = HaveFireLoaded();
   have_smoke = HaveSootLoaded();
-  if(have_smoke != NO_SMOKE && have_fire != NO_FIRE && use_soot_multiplier == 1){
-    use_soot_multiplier = 1;
-  }
-  else{
-    use_soot_multiplier = 0;
-  }
   for(i = 1; i < 255; i++){
     float soot_density, soot_opacity;
     int soot_alpha;
@@ -1921,7 +1915,6 @@ void SmokeWrapup(void){
   smoke_render_option = RENDER_SLICE;
   have_fire  = HaveFireLoaded();
   have_smoke = HaveSootLoaded();
-  update_smoke_opacity = 1;
   ForceIdle();
 }
 

Source/smokeview/glui_smoke.cpp

@@ -531,6 +531,7 @@ extern "C" void GLUI3dSmokeSetup(int main_window){
                 "use opacity multiplier when smoke also loaded", &use_soot_multiplier, USE_SOOT_MULTIPLIER, GLUISmoke3dCB);
   SPINNER_soot_multiplier = glui_3dsmoke->add_spinner_to_panel(PANEL_fire_opacity,
                 "opacity multiplier:", GLUI_SPINNER_FLOAT, &soot_multiplier, SOOT_MULTIPLIER, GLUISmoke3dCB);
+  SPINNER_soot_multiplier->set_float_limits(MIN_SOOT_MULTIPLIER, MAX_SOOT_MULTIPLIER);
   if(active_smokesensors == 1){
     PANEL_smokesensor = glui_3dsmoke->add_panel_to_panel(ROLLOUT_opacity, "Visibility");
     RADIO_smokesensors = glui_3dsmoke->add_radiogroup_to_panel(PANEL_smokesensor, &show_smokesensors);

Source/smokeview/readsmv.c

@@ -1354,8 +1354,8 @@ void UpdateMeshCoords(void){
   float dz_scene   = global_scase.zbar - global_scase.zbar0;
   xyzmaxdiff = MAX(MAX(dx_scene,dy_scene),dz_scene);
   // set fire_half depth to max of 1/40 domain size (rounded to 0.1 m) and 0.3
-  fire_halfdepth = (float)((int)(10.0*xyzmaxdiff/40.0+0.5))/10.0;
-  fire_halfdepth = MAX(fire_halfdepth, 0.3);
+  fire_halfdepth = (float)((int)(100.0*xyzmaxdiff/40.0+0.5))/100.0;
+  fire_halfdepth = MAX(fire_halfdepth, 0.05);
   vector_scalelength = MIN(dx_scene, dz_scene);
   if(global_scase.meshescoll.meshinfo[0].jbar > 1) {
     vector_scalelength = MIN(vector_scalelength, dy_scene);
@@ -6122,12 +6122,11 @@ int ReadIni2(const char *inifile, int localfile){
         global_scase.smoke_albedo = CLAMP(global_scase.smoke_albedo, 0.0, 1.0);
         continue;
       }
-      if(MatchINI(buffer, "SMOKEFIREPROP") == 1){
-        int dummy;
-
+      if(MatchINI(buffer, "FIREPROP") == 1){
         if(fgets(buffer, 255, stream) == NULL)break;
-        sscanf(buffer, "%i %i", &dummy, &use_soot_multiplier);
+        sscanf(buffer, "%i %f", &use_soot_multiplier, &soot_multiplier);
         use_soot_multiplier = CLAMP(use_soot_multiplier, 0, 1);
+        soot_multiplier = CLAMP(soot_multiplier, MIN_SOOT_MULTIPLIER, MAX_SOOT_MULTIPLIER);
         update_use_soot_multiplier = 1;
         continue;
       }
@@ -8342,14 +8341,16 @@ void WriteIni(int flag,char *filename){
       mmin[0], mmin[1], mmin[2],
       mmax[0], mmax[1], mmax[2]);
   }
+  fprintf(fileout, "FDEPTH2\n");
+  fprintf(fileout, " %f %f %f %i %i\n", fire_halfdepth, co2_halfdepth, soot_multiplier, use_fire_alpha, force_alpha_opaque);
   fprintf(fileout, "FIRECOLOR\n");
   fprintf(fileout, " %i %i %i\n", fire_color_int255[0], fire_color_int255[1], fire_color_int255[2]);
   if(colorbars.fire_colorbar_index >= 0 && colorbars.fire_colorbar_index < colorbars.ncolorbars){
     fprintf(fileout, "FIRECOLORMAP\n");
     fprintf(fileout, " FIRE %i %s\n", fire_colormap_type, colorbars.colorbarinfo[colorbars.fire_colorbar_index].menu_label);
   }
-  fprintf(fileout, "FDEPTH2\n");
-  fprintf(fileout, " %f %f %f %i %i\n", fire_halfdepth, co2_halfdepth, soot_multiplier, use_fire_alpha, force_alpha_opaque);
+  fprintf(fileout, "FIREPROP\n");
+  fprintf(fileout, " %i %f\n", use_soot_multiplier, soot_multiplier);
   if(colorbars.ncolorbars > colorbars.ndefaultcolorbars){
     colorbardata *cbi;
     unsigned char *rrgb;
@@ -8385,11 +8386,6 @@ void WriteIni(int flag,char *filename){
     fprintf(fileout, "SMOKEALBEDO\n");
     fprintf(fileout, " %f\n", global_scase.smoke_albedo);
   }
-
-  if((have_fire == NO_FIRE && have_smoke == NO_SMOKE)||(have_fire != NO_FIRE && have_smoke != NO_SMOKE)){
-    fprintf(fileout, "SMOKEFIREPROP\n");
-    fprintf(fileout, " %i %i\n", 1 - use_soot_multiplier, use_soot_multiplier);
-  }
   fprintf(fileout, "SMOKEPROP\n");
   fprintf(fileout, " %f\n", glui_mass_extinct);
   glui_mass_extinct_default = glui_mass_extinct;

Source/smokeview/smokeviewvars.h

@@ -434,6 +434,11 @@ SVEXTERN int SVDECL(glui_mesh_intersection_option, 0);
 SVEXTERN int SVDECL(partfast, 1);
 SVEXTERN int SVDECL(use_fire_alpha, 0);
 SVEXTERN float SVDECL(soot_multiplier, 3.0);
+SVEXTERN int SVDECL(update_use_soot_multiplier,0);
+SVEXTERN int SVDECL(use_soot_multiplier, 1);
+#define MIN_SOOT_MULTIPLIER 0.0
+#define MAX_SOOT_MULTIPLIER 100.0
+
 #ifdef pp_OSX
 SVEXTERN int SVDECL(monitor_screen_height, -1);
 #endif
@@ -2095,11 +2100,8 @@ SVEXTERN int smoke_color_int255[4];
 SVEXTERN int co2_color_int255[3];
 #endif
 
-SVEXTERN int SVDECL(update_use_soot_multiplier,0);
-SVEXTERN int SVDECL(use_soot_multiplier, 0);
-
 SVEXTERN int SVDECL(update_smokefire_colors, 0);
-SVEXTERN float SVDECL(fire_halfdepth,0.3);
+SVEXTERN float SVDECL(fire_halfdepth,0.1);
 SVEXTERN float SVDECL(co2_halfdepth, 10.0);
 
 SVEXTERN int SVDECL(co2_colormap_type, CO2_COLORBAR);