Merge pull request #1991 from gforney/devel

remove some debug print, turn off autoloading for a test case
firemodels · Aug 15, 2024 · e81f01a · e81f01a
2 parents 95a4735 + c676d90
commit e81f01a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 41 deletions.
diff --git a/Source/smokeview/IOiso.c b/Source/smokeview/IOiso.c
@@ -690,12 +690,6 @@ void ReadIsoOrig(const char *file, int ifile, int flag, int *errorcode){
   UpdateTimes();
   *errorcode = 0;
 
-#ifdef _DEBUG
-  if(flag==UNLOAD){
-    PRINTF("After iso unload: \n");
-    PrintAllMemoryInfo;
-  }
-#endif
   UpdateIsoType();
   if(flag==UNLOAD){
     updatemenu=1;

diff --git a/Verification/Visualization/test1.ini b/Verification/Visualization/test1.ini
@@ -1,4 +1,4 @@
-# NIST Smokeview configuration file, Release Jan 15 2024
+# NIST Smokeview configuration file, Release Aug 15 2024
 
 
  ------------ global ini settings ------------
@@ -18,15 +18,15 @@ BOUNDCOLOR
 COLORBAR
  12 1 -1 5
  0.000299 0.000000 1.000000
- 0.245451 0.294577 0.942934
- 0.290415 0.458755 0.883579
+ 0.245452 0.294577 0.942933
+ 0.290415 0.458754 0.883579
  0.257206 0.607984 0.820800
- 0.000159 0.752952 0.752946
- 0.224347 0.842371 0.564313
+ 0.000162 0.752952 0.752946
+ 0.224346 0.842371 0.564313
  0.194393 0.938675 0.329380
- 0.360483 0.955550 0.000000
+ 0.360484 0.955550 0.000000
  0.662853 0.821588 0.000000
- 0.823603 0.662262 0.000000
+ 0.823603 0.662261 0.000000
  0.925208 0.461607 0.000000
  1.000000 0.000000 0.000000
 COLOR2BAR
@@ -170,10 +170,6 @@ WINDOWHEIGHT
 
 CSV
  0
-FED
- 0
-FEDCOLORBAR
- FED
 LOADINC
  0
 NOPART
@@ -182,16 +178,14 @@ PARTFAST
  1 1 2
 RESEARCHMODE
  0 1 1.000000 4 0 4 0 0
-SHOWFEDAREA
- 1
 SLICEAVERAGE
  0 10.000000 0
 SMOKELOAD
  0 1
 SLICEDATAOUT
  0 
 USER_ROTATE
- -3 0 0.250000 0.250000 0.500000
+ -4 0 0.250000 0.250000 0.500000
 ZIPSTEP
  1
 
@@ -320,6 +314,8 @@ SHOWLABELS
  0
 SHOWMEMLOAD
  0
+SHOWPARTTAG
+ 0
 SHOWOPENVENTS
  0 0
 SHOWOTHERVENTS
@@ -353,7 +349,7 @@ SHOWTRACERSALWAYS
 SHOWTRANSPARENT
  0
 SHOWTRIANGLES
- 1 0 0 0 1 1
+ 1 0 0 0 1 1 1
 SHOWTRANSPARENTVENTS
  1
 SHOWTRIANGLECOUNT
@@ -422,7 +418,7 @@ MOVIEFILETYPE
 MOVIEFILETYPE
  0 10 5000 1 17
 MOVIEPARMS
- -1 10 0
+ 0 10 0
 RENDEROPTION
  993 1 512
 UNITCLASSES
@@ -524,7 +520,7 @@ GSLICEPARMS
  1.000000 0.500000 0.500000
  0.000000 90.000000
 LOADFILESATSTARTUP
- 1
+ 0
 MSCALE
  1.000000 1.000000 1.000000
 PATCHAUTO
@@ -543,6 +539,8 @@ PART5COLOR
 partclassdataVIS
  1
  1
+PARTSKIP
+ 1
 PROPINDEX
  2
  0 0
@@ -557,15 +555,7 @@ SHOOTER
  10 1 100 0 0
  1.000000 1.000000
 SHOWDEVICES
- 8 0 0
- sensor
- human_fixed
- human_altered_with_data
- ellipsoid
- disk
- fire_fighter
- airpack
- helmit
+ 0 0 0
 SHOWDEVICEPLOTS
  0 1 1 0.150000 1.000000 5.000000 0.000000 0.000000 0.000000 1.200000
 SHOWGENPLOTXLABEL
@@ -611,7 +601,7 @@ XYZCLIP
 C_BOUNDARY
  0 1.000000 0 0.000000 temp
 C_PARTICLES
- 0 1.000000 0 0.000000 Uniform
+ 0 0.000000 0 0.000000 Uniform
 C_PARTICLES
  0 -3.768734 0 4.937138 u
 C_PARTICLES
@@ -622,6 +612,8 @@ C_PLOT3D
  0
 C_SLICE
  0 1.000000 0 0.000000 temp
+C_SLICE_HIDE
+ 0 temp
 CACHE_DATA
  1 1 1 1 
 LOADMESH
@@ -655,22 +647,22 @@ V_TARGET
 # -------------------------
 
 # Smokeview Version: Test
-# Smokeview Build: SMV-6.8.0-1870-g1dd3173-devel
-# Smokeview Build Date: Jan 15 2024
-# FDS Version: FDS-6.8.0-1022-g695050c-nightly
-# FDS Build: FDS-6.8.0-1022-g695050c-nightly
+# Smokeview Build: unknown
+# Smokeview Build Date: Aug 15 2024
+# FDS Version: FDS-6.9.1-695-g38e9b7c-nightly
+# FDS Build: FDS-6.9.1-695-g38e9b7c-nightly
 # Platform: WIN64
 
 
 # Graphics Environment
 # --------------------
 
-# OpenGL Version: 4.6.0 - Build 31.0.101.4032
-#   GLSL Version: 4.60 - Build 31.0.101.4032
+# OpenGL Version: 4.6.0 NVIDIA 391.25
+#   GLSL Version: 4.60 NVIDIA
 #         Red bits:8
 #       Green bits:8
 #        Blue bits:8
-#       Alpha bits:8
+#       Alpha bits:0
 #       Depth bits:24
-# max texture size:16384
+# max texture size:32768