From 0d9e941ed26da0505848510202c31cbe558c9e32 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 May 2026 16:00:59 -0400 Subject: [PATCH 1/6] smv vv: rename some vv scripts --- Verification/scripts/{FDS_Cases.bat => FDSCases.bat} | 0 Verification/scripts/MakeFDSPictures.bat | 2 +- Verification/scripts/MakeSmvPictures.bat | 2 +- Verification/scripts/RunFDSCases.bat | 2 +- Verification/scripts/RunFDSPictures.bat | 0 Verification/scripts/RunSmvCases.bat | 2 +- Verification/scripts/{SMV_Cases.bat => SMVCases.bat} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename Verification/scripts/{FDS_Cases.bat => FDSCases.bat} (100%) create mode 100644 Verification/scripts/RunFDSPictures.bat rename Verification/scripts/{SMV_Cases.bat => SMVCases.bat} (100%) diff --git a/Verification/scripts/FDS_Cases.bat b/Verification/scripts/FDSCases.bat similarity index 100% rename from Verification/scripts/FDS_Cases.bat rename to Verification/scripts/FDSCases.bat diff --git a/Verification/scripts/MakeFDSPictures.bat b/Verification/scripts/MakeFDSPictures.bat index 3a8597e685..7d32484b93 100644 --- a/Verification/scripts/MakeFDSPictures.bat +++ b/Verification/scripts/MakeFDSPictures.bat @@ -17,5 +17,5 @@ if exist %SMVEXE% goto skip1 ::erase %GITROOT%\smv\Manuals\SMV_Verification_Guide\SCRIPT_FIGURES\*.png cd %CURDIR% -call FDS_Cases %SMVEXE% smv +call FDSCases %SMVEXE% smv cd %CURDIR% diff --git a/Verification/scripts/MakeSmvPictures.bat b/Verification/scripts/MakeSmvPictures.bat index e5d068afee..eccab3a7d5 100644 --- a/Verification/scripts/MakeSmvPictures.bat +++ b/Verification/scripts/MakeSmvPictures.bat @@ -30,6 +30,6 @@ erase %GITROOT%\smv\Manuals\SMV_User_Guide\SCRIPT_FIGURES\*.png erase %GITROOT%\smv\Manuals\SMV_Verification_Guide\SCRIPT_FIGURES\*.png cd %CURDIR% -call SMV_Cases %SMVEXE% smv +call SMVCases %SMVEXE% smv copy %GITROOT%\smv\Manuals\SMV_Verification_Guide\SCRIPT_FIGURES\fds_smv_version.png %GITROOT%\smv\Manuals\SMV_Summary\images cd %CURDIR% diff --git a/Verification/scripts/RunFDSCases.bat b/Verification/scripts/RunFDSCases.bat index ee85625cf7..804d557a2b 100644 --- a/Verification/scripts/RunFDSCases.bat +++ b/Verification/scripts/RunFDSCases.bat @@ -15,7 +15,7 @@ if exist %FDSEXE% goto skip1 call fdsinit > Nul 2>&1 cd %CURDIR% -call FDS_Cases %FDSEXE% fds +call FDSCases %FDSEXE% fds cd %GITROOT%\fds git describe > %CURDIR%\fds_revision.txt diff --git a/Verification/scripts/RunFDSPictures.bat b/Verification/scripts/RunFDSPictures.bat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Verification/scripts/RunSmvCases.bat b/Verification/scripts/RunSmvCases.bat index 4e19632884..d03e7e2062 100644 --- a/Verification/scripts/RunSmvCases.bat +++ b/Verification/scripts/RunSmvCases.bat @@ -15,7 +15,7 @@ if exist %FDSEXE% goto skip1 call fdsinit > Nul 2>&1 cd %CURDIR% -call SMV_Cases %FDSEXE% fds +call SMVCases %FDSEXE% fds cd %GITROOT%\fds git describe > %CURDIR%\fds_revision.txt diff --git a/Verification/scripts/SMV_Cases.bat b/Verification/scripts/SMVCases.bat similarity index 100% rename from Verification/scripts/SMV_Cases.bat rename to Verification/scripts/SMVCases.bat From e7ec0bce296201eca3d2ddae5d5aa0d61d722b5d Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 May 2026 16:22:12 -0400 Subject: [PATCH 2/6] smv vv: add scripts to check where cases finished running --- Verification/scripts/CheckFDSCases.bat | 11 +++++++++++ Verification/scripts/CheckSMVCases.bat | 11 +++++++++++ Verification/scripts/FDSCases.bat | 11 +++++++++++ Verification/scripts/SMVCases.bat | 12 ++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 Verification/scripts/CheckFDSCases.bat create mode 100644 Verification/scripts/CheckSMVCases.bat diff --git a/Verification/scripts/CheckFDSCases.bat b/Verification/scripts/CheckFDSCases.bat new file mode 100644 index 0000000000..08757a33a4 --- /dev/null +++ b/Verification/scripts/CheckFDSCases.bat @@ -0,0 +1,11 @@ +@echo off +setlocal + +set CURDIR=%CD% +cd ..\..\.. +set GITROOT=%CD% + +cd %CURDIR% +call FDSCases check fds + +cd %CURDIR% diff --git a/Verification/scripts/CheckSMVCases.bat b/Verification/scripts/CheckSMVCases.bat new file mode 100644 index 0000000000..ed2aee7461 --- /dev/null +++ b/Verification/scripts/CheckSMVCases.bat @@ -0,0 +1,11 @@ +@echo off +setlocal + +set CURDIR=%CD% +cd ..\..\.. +set GITROOT=%CD% + +cd %CURDIR% +call SMVCases check smv + +cd %CURDIR% diff --git a/Verification/scripts/FDSCases.bat b/Verification/scripts/FDSCases.bat index a2b64ec3bc..c808f4a61b 100644 --- a/Verification/scripts/FDSCases.bat +++ b/Verification/scripts/FDSCases.bat @@ -8,6 +8,9 @@ set verdir=%CD% cd ..\..\smv\Verification set smvverdir=%CD% +cd scripts\bin +set GREP=%CD%\grep.exe +set WC=%CD%\wc.exe cd %verdir% @@ -82,8 +85,16 @@ goto eof set input=%4 cd %verdir%\%casedir% + if %prog% == check goto skip1 + if %option% == fds timeout /t 2 /nobreak & start "%input%" cmd /c "%smvverdir%\scripts\background.bat %prog% %input%.fds" if %option% == smv %prog% -runscript %input% exit /b +:skip1 + %GREP% Elapsed %input%.out | %WC% -l > %input%.wc + set /p finished=<%input%.wc + if %finished% == 0 echo %input% did not finish + exit /b + :eof diff --git a/Verification/scripts/SMVCases.bat b/Verification/scripts/SMVCases.bat index cec1baee24..f235841b7e 100644 --- a/Verification/scripts/SMVCases.bat +++ b/Verification/scripts/SMVCases.bat @@ -6,6 +6,10 @@ setlocal cd .. set verdir=%CD% +cd scripts\bin +set GREP=%CD%\grep.exe +set WC=%CD%\wc.exe +cd %verdir% set run=call :runit %exe% %option% @@ -63,8 +67,16 @@ goto eof set input=%4 cd %verdir%\%casedir% + if %prog% == check goto skip1 + if %option% == fds timeout /t 2 /nobreak & start "%input%" cmd /c "%verdir%\scripts\background.bat %prog% %input%.fds" if %option% == smv %prog% -runscript %input% exit /b +:skip1 + %GREP% Elapsed %input%.out | %WC% -l > %input%.wc + set /p finished=<%input%.wc + if %finished% == 0 echo %input% did not finish + exit /b + :eof \ No newline at end of file From 2d08b485edc9bdb941152d56c867e50ff9c475fd Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 May 2026 21:00:26 -0400 Subject: [PATCH 3/6] smv vv: add some printout to check scripts --- .../scripts/{CheckSMVCases.bat => CheckSmvCases.bat} | 0 Verification/scripts/FDSCases.bat | 8 ++++++-- Verification/scripts/{SMVCases.bat => SmvCases.bat} | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) rename Verification/scripts/{CheckSMVCases.bat => CheckSmvCases.bat} (100%) rename Verification/scripts/{SMVCases.bat => SmvCases.bat} (89%) diff --git a/Verification/scripts/CheckSMVCases.bat b/Verification/scripts/CheckSmvCases.bat similarity index 100% rename from Verification/scripts/CheckSMVCases.bat rename to Verification/scripts/CheckSmvCases.bat diff --git a/Verification/scripts/FDSCases.bat b/Verification/scripts/FDSCases.bat index c808f4a61b..3b243335a9 100644 --- a/Verification/scripts/FDSCases.bat +++ b/Verification/scripts/FDSCases.bat @@ -3,6 +3,8 @@ set exe=%1 set option=%2 setlocal +set allfinished=1 + cd ..\..\..\fds\Verification set verdir=%CD% @@ -75,7 +77,7 @@ set run=call :runit %exe% %option% %run% WUI Bova_1b %run% WUI Bova_4a %run% WUI level_set_fuel_model_1 - +if %exe% == check if %allfinished% == 1 echo all cases finished goto eof :runit @@ -92,9 +94,11 @@ goto eof exit /b :skip1 - %GREP% Elapsed %input%.out | %WC% -l > %input%.wc + set finished=0 + if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc set /p finished=<%input%.wc if %finished% == 0 echo %input% did not finish + if %finished% == 0 set allfinished=0 exit /b :eof diff --git a/Verification/scripts/SMVCases.bat b/Verification/scripts/SmvCases.bat similarity index 89% rename from Verification/scripts/SMVCases.bat rename to Verification/scripts/SmvCases.bat index f235841b7e..9356aec3d8 100644 --- a/Verification/scripts/SMVCases.bat +++ b/Verification/scripts/SmvCases.bat @@ -4,6 +4,7 @@ set exe=%1 set option=%2 setlocal +set allfinished=1 cd .. set verdir=%CD% cd scripts\bin @@ -58,6 +59,8 @@ set run=call :runit %exe% %option% %run% Visualization version %run% Visualization version2 +if %exe% == check if %allfinished% == 1 echo all cases finished + goto eof :runit @@ -74,9 +77,11 @@ goto eof exit /b :skip1 - %GREP% Elapsed %input%.out | %WC% -l > %input%.wc + set finished=0 + if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc set /p finished=<%input%.wc if %finished% == 0 echo %input% did not finish + if %finished% == 0 set allfinished=0 exit /b :eof \ No newline at end of file From 21b89bb30222e22eccdbcbf271e26fb62b83a8f7 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 May 2026 22:19:55 -0400 Subject: [PATCH 4/6] vv: add option to only run cases that have not finished --- Verification/scripts/RunFDSCases.bat | 3 ++- Verification/scripts/RunSmvCases.bat | 3 ++- Verification/scripts/SmvCases.bat | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Verification/scripts/RunFDSCases.bat b/Verification/scripts/RunFDSCases.bat index 804d557a2b..514f7abf21 100644 --- a/Verification/scripts/RunFDSCases.bat +++ b/Verification/scripts/RunFDSCases.bat @@ -1,4 +1,5 @@ @echo off +set runallcases=%1 setlocal set CURDIR=%CD% @@ -15,7 +16,7 @@ if exist %FDSEXE% goto skip1 call fdsinit > Nul 2>&1 cd %CURDIR% -call FDSCases %FDSEXE% fds +call FDSCases %FDSEXE% fds %runallcases% cd %GITROOT%\fds git describe > %CURDIR%\fds_revision.txt diff --git a/Verification/scripts/RunSmvCases.bat b/Verification/scripts/RunSmvCases.bat index d03e7e2062..1cd1d3b821 100644 --- a/Verification/scripts/RunSmvCases.bat +++ b/Verification/scripts/RunSmvCases.bat @@ -1,4 +1,5 @@ @echo off +set runallcases=%1 setlocal set CURDIR=%CD% @@ -15,7 +16,7 @@ if exist %FDSEXE% goto skip1 call fdsinit > Nul 2>&1 cd %CURDIR% -call SMVCases %FDSEXE% fds +call SMVCases %FDSEXE% fds %runallcases% cd %GITROOT%\fds git describe > %CURDIR%\fds_revision.txt diff --git a/Verification/scripts/SmvCases.bat b/Verification/scripts/SmvCases.bat index 9356aec3d8..b15255ccb0 100644 --- a/Verification/scripts/SmvCases.bat +++ b/Verification/scripts/SmvCases.bat @@ -2,6 +2,7 @@ @echo off set exe=%1 set option=%2 +set runallcases=%3 setlocal set allfinished=1 @@ -70,6 +71,12 @@ goto eof set input=%4 cd %verdir%\%casedir% + + set finished=0 + if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc + set /p finished=<%input%.wc + if %finished% == 1 if x%runallcases% == x0 if %option% == fds exit /b + if %prog% == check goto skip1 if %option% == fds timeout /t 2 /nobreak & start "%input%" cmd /c "%verdir%\scripts\background.bat %prog% %input%.fds" @@ -77,9 +84,6 @@ goto eof exit /b :skip1 - set finished=0 - if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc - set /p finished=<%input%.wc if %finished% == 0 echo %input% did not finish if %finished% == 0 set allfinished=0 exit /b From 52b913e8ed317f8220863d1ca86ee2e1d9765c75 Mon Sep 17 00:00:00 2001 From: gforney Date: Wed, 6 May 2026 07:59:04 -0400 Subject: [PATCH 5/6] vv: minor updates to vv case lists --- Verification/scripts/FDSCases.bat | 11 +++++++---- Verification/scripts/SmvCases.bat | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Verification/scripts/FDSCases.bat b/Verification/scripts/FDSCases.bat index 3b243335a9..e5d8f133d8 100644 --- a/Verification/scripts/FDSCases.bat +++ b/Verification/scripts/FDSCases.bat @@ -87,6 +87,12 @@ goto eof set input=%4 cd %verdir%\%casedir% + + set finished=0 + if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc + set /p finished=<%input%.wc + if %finished% == 1 if x%runallcases% == x0 if %option% == fds exit /b + if %prog% == check goto skip1 if %option% == fds timeout /t 2 /nobreak & start "%input%" cmd /c "%smvverdir%\scripts\background.bat %prog% %input%.fds" @@ -94,11 +100,8 @@ goto eof exit /b :skip1 - set finished=0 - if exist %input%.out %GREP% -E only^|success %input%.out | %WC% -l > %input%.wc - set /p finished=<%input%.wc if %finished% == 0 echo %input% did not finish if %finished% == 0 set allfinished=0 exit /b -:eof +:eof \ No newline at end of file diff --git a/Verification/scripts/SmvCases.bat b/Verification/scripts/SmvCases.bat index b15255ccb0..8e3b79ef4b 100644 --- a/Verification/scripts/SmvCases.bat +++ b/Verification/scripts/SmvCases.bat @@ -59,9 +59,7 @@ set run=call :runit %exe% %option% %run% Visualization vcirctest %run% Visualization version %run% Visualization version2 - if %exe% == check if %allfinished% == 1 echo all cases finished - goto eof :runit From 83c2bba1d6469a59a56264b0b9bcfe67a8be791b Mon Sep 17 00:00:00 2001 From: gforney Date: Wed, 6 May 2026 10:30:40 -0400 Subject: [PATCH 6/6] smokeview source: check if boundary file has data before computing bounds --- Source/smokeview/IOgeometry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/smokeview/IOgeometry.c b/Source/smokeview/IOgeometry.c index 0405b7bcc9..902a137b14 100644 --- a/Source/smokeview/IOgeometry.c +++ b/Source/smokeview/IOgeometry.c @@ -2483,7 +2483,7 @@ FILE_SIZE ReadGeomData(patchdata *patchi, slicedata *slicei, int load_flag, int } if(FileExistsOrig(patchi->bound_file)==0){ - float *vals, valmin, valmax; + float *vals, valmin=0.0, valmax=1.0; vals = patchi->geom_vals; if(strcmp(patchi->label.shortlabel, "t_a") == 0){ @@ -2503,11 +2503,13 @@ FILE_SIZE ReadGeomData(patchdata *patchi, slicedata *slicei, int load_flag, int } } else{ - valmin = vals[0]; - valmax = valmin; - for(i = 1;i < nvals;i++){ - valmin = MIN(vals[i], valmin); - valmax = MAX(vals[i], valmax); + if(nvals > 0){ + valmin = vals[0]; + valmax = valmin; + for(i = 1; i < nvals; i++){ + valmin = MIN(vals[i], valmin); + valmax = MAX(vals[i], valmax); + } } } WriteFileBounds(patchi->bound_file, valmin, valmax);