Merge pull request #1873 from gforney/master

update color_geom verification case and corresponding section in smv ug
firemodels · Apr 16, 2024 · cc56e27 · cc56e27
2 parents 4ef122d + 2ceb3f4
commit cc56e27
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 25 deletions.
diff --git a/Manuals/SMV_Verification_Guide/SMV_Verification_Guide.tex b/Manuals/SMV_Verification_Guide/SMV_Verification_Guide.tex
@@ -1438,6 +1438,21 @@ \section{Obstacles}
 \end{figure}
 
 
+\clearpage
+
+\section{Geometry}
+Figure \ref{figgeomtest} shows four geometry objects colored using a color specified on a SURF line or a color specified on a GEOM line. The object color should match the color given on the label below it.
+
+\begin{figure}[bph]
+\begin{center}
+\begin{tabular}{c}
+ \includegraphics[height=\figheightD]{SCRIPT_FIGURES/color_geom}
+\end{tabular}
+\end{center}
+ \caption{A test verifying objects are colored correctly when colors are specified on either a SURF or a GEOM line.}
+\label{figgeomtest}%
+\end{figure}
+
 \clearpage
 
 \section{Devices}

diff --git a/Source/smokebot_trigger.txt b/Source/smokebot_trigger.txt
@@ -1,4 +1,4 @@
-  master: dummy text to trigger smokebot 
+   master: dummy text to trigger smokebot 
  devel:  dummy text to trigger smokebot
   devel2:  dummy text to trigger smokebot
   test: dummy text to trigger smokebot
diff --git a/Verification/Visualization/color_geom.fds b/Verification/Visualization/color_geom.fds
@@ -1,10 +1,12 @@
 &HEAD CHID='color_geom', TITLE='color' /
 #Mesh
-&MESH XB= 0.0, 83.0, 0.0, 34.0, 0.0, 9.0, IJK= 80, 35, 36 /
+&MESH XB= 0.0, 83.0, 0.0, 54.0, 0.0, 9.0, IJK= 80, 54, 36 /
 
 &TIME T_END=0. /
-&SURF ID='WALL', RGB=255,0,0 /
-&GEOM ID='Wall_1', SURF_ID='WALL',
+&SURF ID='WALL1', RGB=255,0,0 /
+&SURF ID='WALL2', RGB=0,0,255 /
+
+&GEOM ID='Wall_1', SURF_ID='WALL1',
 VERTS=
 9.0,  5.0, 0.0,
 9.0,  5.0, 3.5,
@@ -14,7 +16,7 @@ POLY=1, 2, 3, 4,
 EXTRUDE=10.0
 COLOR='BLACK' /
 
-&GEOM ID='Wall_2', SURF_ID='WALL',
+&GEOM ID='Wall_2', SURF_ID='WALL1',
 VERTS=
 48.0, 5.0, 0.0,
 48.0, 5.0, 3.5,
@@ -24,4 +26,24 @@ POLY=1, 2, 3, 4,
 EXTRUDE=10.0
  /
 
+&GEOM ID='Wall_1', SURF_ID='WALL2',
+VERTS=
+9.0,  25.0, 0.0,
+9.0,  25.0, 3.5,
+39.0, 40.0, 3.5,
+39.0, 40.0, 0.0
+POLY=1, 2, 3, 4,
+EXTRUDE=10.0
+COLOR='GREEN' /
+
+&GEOM ID='Wall_2', SURF_ID='WALL2',
+VERTS=
+48.0, 25.0, 0.0,
+48.0, 25.0, 3.5,
+78.0, 40.0, 3.5,
+78.0, 40.0, 0.0
+POLY=1, 2, 3, 4,
+EXTRUDE=10.0
+ /
+
 &TAIL /
diff --git a/Verification/Visualization/color_geom.ini b/Verification/Visualization/color_geom.ini
@@ -1,4 +1,4 @@
-# NIST Smokeview configuration file, Release Apr 15 2024
+# NIST Smokeview configuration file, Release Apr 16 2024
 
 
  ------------ global ini settings ------------
@@ -105,8 +105,9 @@ SPRINKONCOLOR
 STATICPARTCOLOR
  0.000000 1.000000 0.000000
 SURFCOLORS
- 1 0
- 255 0 0 : WALL
+ 2 0
+ 255 0 0 : WALL1
+ 0 0 255 : WALL2
 TIMEBARCOLOR
  0.600000 0.600000 0.600000
 VENTCOLOR
@@ -194,7 +195,7 @@ SMOKELOAD
 SLICEDATAOUT
  0 
 USER_ROTATE
- -4 0 0.500000 0.204819 0.054217
+ -4 0 0.500000 0.325301 0.054217
 ZIPSTEP
  1
 
@@ -223,7 +224,7 @@ ENABLETEXTURELIGHTING
 EYEVIEW
  0
 FONTSIZE
- 0
+ 1
 FIREPARAMS
 FRAMERATEVALUE
  1000
@@ -296,7 +297,7 @@ SHOWFIRECUTOFF
 SHOWFLOOR
  0
 SHOWFRAME
- 1
+ 0
 SHOWFRAMELABEL
  0
 SHOWFRAMETIMELABEL
@@ -316,7 +317,7 @@ SHOWISO
 SHOWISONORMALS
  0
 SHOWLABELS
- 0
+ 1
 SHOWMEMLOAD
  0
 SHOWOPENVENTS
@@ -412,7 +413,7 @@ INPUT_FILE
 LABELSTARTUPVIEW
  view 1
 RENDERCLIP
- 1 12 12 110 110
+ 1 15 15 41 40
 RENDERFILELABEL
  0
 RENDERFILETYPE
@@ -522,6 +523,22 @@ GSLICEPARMS
  0 0 0 0
  39.000000 17.000000 4.500000
  0.000000 90.000000
+TICKLABEL
+ 20.000000 8.000000 0.692323 0.000000 0.000000 0.000000 0.000000 1.000000 1 1
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ black - GEOM
+TICKLABEL
+ 60.000000 29.000000 0.700000 0.000000 0.000000 0.000000 0.000000 1.000000 1 1
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ blue - SURF
+TICKLABEL
+ 20.000000 29.000000 0.700000 0.000000 0.000000 0.000000 0.000000 1.000000 1 1
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ green - GEOM
+TICKLABEL
+ 60.000000 8.000000 0.692323 0.000000 0.000000 0.000000 0.000000 1.000000 1 1
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ red - SURF
 LOADFILESATSTARTUP
  0
 MSCALE
@@ -602,7 +619,7 @@ CACHE_DATA
 LOADMESH
  0 0
  0 0.000000 0 83.000000
- 0 0.000000 0 34.000000
+ 0 0.000000 0 54.000000
  0 0.000000 0 9.000000
 PATCHDATAOUT
  0 0.000000 0.010000 0.000000 78.000000 0.000000 34.000000 0.000000 9.000000
@@ -615,8 +632,8 @@ V_TARGET
 VIEWPOINT5
  0 -4 2
  0.500000 -2.267462 0.054217 1.000000 2
- 0.000000 0.000000 0.000000 1
- 0.500000 0.204819 0.054217
+ 0.000000 0.000000 90.000000 1
+ 0.500000 0.325301 0.054217
  0.000000 90.000000
  1.000000 0.000000 0.000000 0.000000
  0.000000 1.000000 0.000000 0.000000
@@ -631,22 +648,22 @@ VIEWPOINT5
 # -------------------------
 
 # Smokeview Version: Test
-# Smokeview Build: SMV-6.9.1-25-g1ad139d-dirty-master
-# Smokeview Build Date: Apr 15 2024
-# FDS Version: FDS-6.9.0-0-ga33726c-release
-# FDS Build: FDS-6.9.0-0-ga33726c-release
+# Smokeview Build: SMV-6.9.1-26-g0cddc14-dirty-master
+# Smokeview Build Date: Apr 16 2024
+# FDS Version: FDS-6.9.1-79-g149568c-dirty-master
+# FDS Build: FDS-6.9.1-79-g149568c-dirty-master
 # 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
 
diff --git a/Verification/Visualization/color_geom.ssf b/Verification/Visualization/color_geom.ssf
@@ -1,5 +1,5 @@
 RENDERDIR
- .
+ ..\..\Manuals\SMV_Verification_Guide\SCRIPT_FIGURES
 XSCENECLIP
  0 -0.078000 0 78.078003
 YSCENECLIP