From 6ff0699ad53dce70da4af3709e901e6cb81e2d27 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 6 Jan 2026 09:00:24 -0500 Subject: [PATCH 1/3] scripts: remove -test from the make pictures script --- Verification/scripts/Make_SMV_Pictures.bat | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Verification/scripts/Make_SMV_Pictures.bat b/Verification/scripts/Make_SMV_Pictures.bat index 7627b0bb5a..696347ac15 100644 --- a/Verification/scripts/Make_SMV_Pictures.bat +++ b/Verification/scripts/Make_SMV_Pictures.bat @@ -3,7 +3,6 @@ set curdir=%CD% set git_drive=c: set DEBUG= -set TEST= set SCRIPT_DIR=%CD% set runsmvcases=1 set runwuicases=1 @@ -39,7 +38,7 @@ if %useinstalled% == 1 ( set BACKGROUND=%GITROOT%\smv\Build\background\intel_win\background.exe set SMOKEDIFF=%GITROOT%\smv\Build\smokediff\intel_win\smokediff_win.exe set FDS2FED=%GITROOT%\smv\Build\fds2fed\intel_win\fds2fed_win.exe - set SMOKEVIEW=%GITROOT%\smv\Build\smokeview\intel_win\smokeview_win%TEST%%DEBUG%.exe -bindir %GITROOT%\smv\for_bundle + set SMOKEVIEW=%GITROOT%\smv\Build\smokeview\intel_win\smokeview_win%DEBUG%.exe -bindir %GITROOT%\smv\for_bundle set SMOKEZIP=%GITROOT%\smv\Build\smokezip\intel_win\smokezip_win.exe set WIND2FDS=%GITROOT%\smv\Build\wind2fds\intel_win\wind2fds_win.exe ) @@ -225,10 +224,6 @@ goto eof set runsmvcases=0 set runwuicases=1 ) - if /I "%1" EQU "-test" ( - set valid=1 - set TEST=_test - ) if /I "%1" EQU "-installed" ( set valid=1 set useinstalled=1 @@ -252,7 +247,6 @@ echo. echo -help - display this message echo -debug - run with debug Smokeview echo -installed - use installed Smokeview -echo -test - use test Smokeview echo -wui - run only Wui cases exit /b From b8169f11eec81327d928802647cfcae3095c0021 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 6 Jan 2026 10:09:04 -0500 Subject: [PATCH 2/3] smv ug/smokeview source: document some smokeview script keywords --- Manuals/SMV_User_Guide/SMV_User_Guide.tex | 45 +++++++++++++++++++---- Source/smokeview/IOscript.c | 8 ++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/Manuals/SMV_User_Guide/SMV_User_Guide.tex b/Manuals/SMV_User_Guide/SMV_User_Guide.tex index 07ec382a88..ee787b1fe8 100644 --- a/Manuals/SMV_User_Guide/SMV_User_Guide.tex +++ b/Manuals/SMV_User_Guide/SMV_User_Guide.tex @@ -3843,6 +3843,14 @@ \subsubsection{3D Smoke Files} mesh index is loaded. If the mesh\_index is negative then volume rendered smoke for all meshes is loaded. +%%+++++++++++++++++++++++ +\hitemssf{SMOKEPROP}Set the smoke mass extinction coefficient. +Usage: +\begin{lstlisting} +SMOKEPROP + fval (float) +\end{lstlisting} + \elist \subsubsection{Boundary Files} @@ -3912,6 +3920,15 @@ \subsubsection{General Files} file (char) \end{lstlisting} +%%+++++++++++++++++++++++ +\hitemssf{LOADSMV} +Load an smv file. +Usage: +\begin{lstlisting} +LOADSMV + file (char) +\end{lstlisting} + %%+++++++++++++++++++++++ \hitemssf{UNLOADALL}Unload all data files currently loaded. Usage: @@ -4250,28 +4267,27 @@ \subsection{Showing/Hiding Device} \end{lstlisting} %%+++++++++++++++++++++++ -\hitemssf{SHOWALLDEVS}Shows all devices. +\hitemssf{OUTPUTSMOKESENSORS}Output smoke sensor data to a csv file named casename\_ss.csv. Usage: \begin{lstlisting} - SHOWALLDEVS + OUTPUTSMOKESENSORS \end{lstlisting} %%+++++++++++++++++++++++ -\hitemssf{SHOWDEV}Shows a device with specified device id. +\hitemssf{SHOWALLDEVS}Shows all devices. Usage: \begin{lstlisting} - SHOWDEV - device_id + SHOWALLDEVS \end{lstlisting} %%+++++++++++++++++++++++ -\hitemssf{OUTPUTSMOKESENSORS}Output smoke sensor data to a csv file named casename\_ss.csv. +\hitemssf{SHOWDEV}Shows a device with specified device id. Usage: \begin{lstlisting} - OUTPUTSMOKESENSORS + SHOWDEV + device_id \end{lstlisting} - \elist %%----------------------------------------------------------------------- \subsection{Controlling Colorbars} @@ -4500,6 +4516,14 @@ \subsection{Controlling the Scene} 0/1 min position (float) 0/1 max position (float) \end{lstlisting} +%%+++++++++++++++++++++++ +\hitemssf{SETDEMOMODE}Set demo mode from 0 to 5. +Usage: +\begin{lstlisting} + SETDEMOMODE + mode (int) +\end{lstlisting} + %%+++++++++++++++++++++++ \hitemssf{SETTIMEVAL}Set the time for displaying data to a specified value. Usage: @@ -4823,6 +4847,11 @@ \subsection{Miscellaneous} \noindent where r, g and b are red green and blue color components each ranging from 0 to 255 and delta is an error tolerance. If any color component difference is found to be greater than delta, a warning message is output. +%%+++++++++++++++++++++++ +\hitemssf{UNLOADPLOT2D}Unload 2D plots if they are visible. Usage: +\begin{lstlisting} +UNLOADPLOT2D +\end{lstlisting} \elist diff --git a/Source/smokeview/IOscript.c b/Source/smokeview/IOscript.c index aa47a364ac..c82dda875d 100644 --- a/Source/smokeview/IOscript.c +++ b/Source/smokeview/IOscript.c @@ -271,6 +271,7 @@ void InitKeywords(void){ InitKeyword("LOAD3DSMOKE", SCRIPT_LOAD3DSMOKE, 1); InitKeyword("LOADVOLSMOKE", SCRIPT_LOADVOLSMOKE, 1); InitKeyword("LOADVOLSMOKEFRAME", SCRIPT_LOADVOLSMOKEFRAME, 1); + InitKeyword("SMOKEPROP", SCRIPT_SMOKEPROP, 1); // boundary files InitKeyword("LOADBOUNDARY", SCRIPT_LOADBOUNDARY, 1); @@ -318,10 +319,9 @@ void InitKeywords(void){ // show/hide devices InitKeyword("HIDEALLDEVS", SCRIPT_HIDEALLDEVS, 0); InitKeyword("HIDEDEV", SCRIPT_HIDEDEV, 1); + InitKeyword("OUTPUTSMOKESENSORS", SCRIPT_OUTPUTSMOKESENSORS, 0); InitKeyword("SHOWALLDEVS", SCRIPT_SHOWALLDEVS, 0); InitKeyword("SHOWDEV", SCRIPT_SHOWDEV, 1); - InitKeyword("OUTPUTSMOKESENSORS", SCRIPT_OUTPUTSMOKESENSORS, 0); - InitKeyword("SHOWSMOKESENSORS", SCRIPT_OUTPUTSMOKESENSORS, 0); // colorbar InitKeyword("CBARFLIP", SCRIPT_CBARFLIP, 0); @@ -356,7 +356,6 @@ void InitKeywords(void){ InitKeyword("SETDEMOMODE", SCRIPT_SETDEMOMODE, 1); InitKeyword("SETTIMEVAL", SCRIPT_SETTIMEVAL, 1); InitKeyword("SETVIEWPOINT", SCRIPT_SETVIEWPOINT, 1); - InitKeyword("SMOKEPROP", SCRIPT_SMOKEPROP, 1); InitKeyword("VIEWXMIN", SCRIPT_VIEWXMIN, 0); InitKeyword("VIEWXMAX", SCRIPT_VIEWXMAX, 0); InitKeyword("VIEWYMIN", SCRIPT_VIEWYMIN, 0); @@ -845,7 +844,7 @@ int CompileScript(char *scriptfile){ SETfval; break; - // SHOWALLDEVS +// SHOWALLDEVS case SCRIPT_SHOWALLDEVS: break; @@ -4225,3 +4224,4 @@ int RunScriptCommand(scriptdata *script_command){ GLUTPOSTREDISPLAY; return returnval; } + From 45ec470e00c21dc9b8320de8a9f261df16a12cee Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 6 Jan 2026 10:38:56 -0500 Subject: [PATCH 3/3] smv ug/smv source: change script keyword OUTPUTSMOKESENSORS to SHOWSMOKESENSORS --- Manuals/SMV_User_Guide/SMV_User_Guide.tex | 13 ++++++------- Source/smokeview/IOscript.c | 14 +++++++------- Source/smokeview/IOscript.h | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Manuals/SMV_User_Guide/SMV_User_Guide.tex b/Manuals/SMV_User_Guide/SMV_User_Guide.tex index ee787b1fe8..e97f5c7091 100644 --- a/Manuals/SMV_User_Guide/SMV_User_Guide.tex +++ b/Manuals/SMV_User_Guide/SMV_User_Guide.tex @@ -4266,13 +4266,6 @@ \subsection{Showing/Hiding Device} device_id \end{lstlisting} -%%+++++++++++++++++++++++ -\hitemssf{OUTPUTSMOKESENSORS}Output smoke sensor data to a csv file named casename\_ss.csv. -Usage: -\begin{lstlisting} - OUTPUTSMOKESENSORS -\end{lstlisting} - %%+++++++++++++++++++++++ \hitemssf{SHOWALLDEVS}Shows all devices. Usage: @@ -4288,6 +4281,12 @@ \subsection{Showing/Hiding Device} device_id \end{lstlisting} +%%+++++++++++++++++++++++ +\hitemssf{SHOWSMOKESENSORS}Output smoke sensor data to a csv file named casename\_ss.csv. +Usage: +\begin{lstlisting} + SHOWSMOKESENSORS +\end{lstlisting} \elist %%----------------------------------------------------------------------- \subsection{Controlling Colorbars} diff --git a/Source/smokeview/IOscript.c b/Source/smokeview/IOscript.c index c82dda875d..44c9a9485c 100644 --- a/Source/smokeview/IOscript.c +++ b/Source/smokeview/IOscript.c @@ -319,9 +319,9 @@ void InitKeywords(void){ // show/hide devices InitKeyword("HIDEALLDEVS", SCRIPT_HIDEALLDEVS, 0); InitKeyword("HIDEDEV", SCRIPT_HIDEDEV, 1); - InitKeyword("OUTPUTSMOKESENSORS", SCRIPT_OUTPUTSMOKESENSORS, 0); InitKeyword("SHOWALLDEVS", SCRIPT_SHOWALLDEVS, 0); InitKeyword("SHOWDEV", SCRIPT_SHOWDEV, 1); + InitKeyword("SHOWSMOKESENSORS", SCRIPT_SHOWSMOKESENSORS, 0); // colorbar InitKeyword("CBARFLIP", SCRIPT_CBARFLIP, 0); @@ -794,8 +794,8 @@ int CompileScript(char *scriptfile){ case SCRIPT_CBARNORMAL: break; -// OUTPUTSMOKESENSORS - case SCRIPT_OUTPUTSMOKESENSORS: +// SHOWSMOKESENSORS + case SCRIPT_SHOWSMOKESENSORS: break; // SHOWHVACDUCTVAL @@ -2944,9 +2944,9 @@ void ScriptHideHVACVals(void){ HVACMenu(MENU_HVAC_HIDE_ALL_VALUES); } -/* ------------------ ScriptOutputSmokeSensors ------------------------ */ +/* ------------------ ScriptShowSmokeSensors ------------------------ */ -void ScriptOutputSmokeSensors(void){ +void ScriptShowSmokeSensors(void){ int i,j; FILE *stream_smokesensors; int nsmokesensors; @@ -4042,8 +4042,8 @@ int RunScriptCommand(scriptdata *script_command){ case SCRIPT_HIDEHVACVALS: ScriptHideHVACVals(); break; - case SCRIPT_OUTPUTSMOKESENSORS: - ScriptOutputSmokeSensors(); + case SCRIPT_SHOWSMOKESENSORS: + ScriptShowSmokeSensors(); break; case SCRIPT_SHOWALLDEVS: ShowDevicesMenu(MENU_DEVICES_SHOWALL); diff --git a/Source/smokeview/IOscript.h b/Source/smokeview/IOscript.h index f35733f53d..ff619546aa 100644 --- a/Source/smokeview/IOscript.h +++ b/Source/smokeview/IOscript.h @@ -46,7 +46,7 @@ #define SCRIPT_LOADBOUNDARYM 220 #define SCRIPT_LOADSLICEM 221 #define SCRIPT_LOADVSLICEM 222 -#define SCRIPT_OUTPUTSMOKESENSORS 223 +#define SCRIPT_SHOWSMOKESENSORS 223 #define SCRIPT_RGBTEST 225 #define SCRIPT_XYZVIEW 226 #define SCRIPT_VIEWXMIN 227