Merge pull request #2314 from gforney/master

scale vectors for 3D cases using MIN(DX,DY,DZ) and for 2D cases using MIN(DX,DZ)

Author: gforney

Source/smokeview/IOslice.c

@@ -109,7 +109,7 @@ slicedata *gslice;
          }
 
 #define SCENE_FRACTION 0.05
-#define SCENE_FACTOR   SCENE_FRACTION*vecfactor*zmaxdiff/(xyzmaxdiff*vel_max)
+#define SCENE_FACTOR   SCENE_FRACTION*vecfactor*vector_scalelength/(xyzmaxdiff*vel_max)
 
 #define ADJUST_VEC_DX(dx)                       \
          if(vec_uniform_length==1){                              \

Source/smokeview/readsmv.c

@@ -1345,13 +1345,14 @@ void UpdateMeshCoords(void){
 
   // compute scaling factor used in NORMALIXE_X, NORMALIZE_Y, NORMALIZE_Z macros
 
-  float dx_scene, dy_scene, dz_scene;
-
-  dx_scene   = global_scase.xbar - global_scase.xbar0;
-  dy_scene   = global_scase.ybar - global_scase.ybar0;
-  dz_scene   = global_scase.zbar - global_scase.zbar0;
-  zmaxdiff   = dz_scene;
+  float dx_scene   = global_scase.xbar - global_scase.xbar0;
+  float dy_scene   = global_scase.ybar - global_scase.ybar0;
+  float dz_scene   = global_scase.zbar - global_scase.zbar0;
   xyzmaxdiff = MAX(MAX(dx_scene,dy_scene),dz_scene);
+  vector_scalelength = MIN(dx_scene, dz_scene);
+  if(global_scase.meshescoll.meshinfo[0].jbar > 1) {
+    vector_scalelength = MIN(vector_scalelength, dy_scene);
+  }
 
   // normalize various coordinates.
 

Source/smokeview/smokeviewvars.h

@@ -1839,7 +1839,8 @@ SVEXTERN int SVDECL(nopaque_triangles,0),SVDECL(ntransparent_triangles,0),SVDECL
 SVEXTERN   char openfilebuffer[1024];
 SVEXTERN   int openfileflag;
 #endif
-SVEXTERN float xyzmaxdiff, zmaxdiff;
+SVEXTERN float xyzmaxdiff;
+SVEXTERN float vector_scalelength;
 SVEXTERN char ext_png[5];
 SVEXTERN char ext_jpg[5];
 

scripts/fds_smv_env.bat

@@ -10,7 +10,7 @@ if exist %userprofile%\.bundle\smv_revision.txt (
 
 :: ---- log entry date ----
 
-set smvlogdate="23-May-2025"
+set smvlogdate="17-June-2025"
 
 :: ---- repo locations ----