Skip to content

Commit

Permalink
Merge pull request #4059 from gforney/development
Browse files Browse the repository at this point in the history
bump smokeview version number to 6.3.9, add preliminary code for creating 360 deg render files

Former-commit-id: a5a328f2d04bd0d0a037557f69c22f8e6727b9c9 [formerly 5f3603e80ef9f88b0dabca57de80891aacf38216]
Former-commit-id: 1fb5b884a2d57fd805945f23b69698aa43e25a18
Former-commit-id: 1149ebd
  • Loading branch information
gforney authored Jul 5, 2016
2 parents 839b5b0 + c02c571 commit 936b55d
Show file tree
Hide file tree
Showing 6 changed files with 1,290 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Manuals/Bibliography/commoncommands.tex
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
\newcommand{\fdsversion}{6.5.1}

% Smokeview Version String
\newcommand{\smvversion}{6.3.8}
\newcommand{\smvversion}{6.3.9}

\newcommand{\nopart}{\expandafter\def\csname Parent-1\endcsname{}} % To fix table of contents in pdf.
\newcommand{\ct}{\tt\small} % eventually will be deprecated due to http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2letterfontcmd
Expand Down
13 changes: 3 additions & 10 deletions Utilities/Scripts/for_bundle/wrapup_fds_install.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,19 @@ echo.
echo *** Testing whether Windows is 64 bit
echo.

set is64bitfile="%TEMP%\is64bit"
systeminfo | findstr /C:"System Type" | findstr /C:"x64" | find /V /C "^"> %is64bitfile%
set /p is64bit=<%is64bitfile%


erase %is64bitfile%
if %is64bit% == 1 (
echo *** Congratulations! Windows is 64 bit
if defined PROGRAMFILES(X86) (
echo *** 64 bit Windows detected
echo *** Wrapup proceeding
echo.
) else (
echo *** Fatal error: Windows is not 64 bit.
echo *** Fatal error: 32 bit Windows detected
echo FDS and Smokeview only run on 64 bit systems
echo Installation wrap up aborted
echo *** Press any key to continue. ***
pause>NUL
goto abort
)


echo *** Removing previous FDS/Smokeview entries from the system and user path.
call "%CD%\set_path.exe" -s -m -b -r "nist\fds" >Nul
call "%CD%\set_path.exe" -u -m -b -r "FDS\FDS5" >Nul
Expand Down
19 changes: 19 additions & 0 deletions Verification/Visualization/render360.fds
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
&HEAD CHID='render360',TITLE='test generation of 360 deg render files' /


&MESH IJK=40,40,40, XB=0.0,10.0,0.0,10.0,0.0,10.0 /

&OBST XB= 0.0,10.0, 0.0,10.0, 0.0, 0.0,RGB=64,64,64 /
&OBST XB= 0.0,10.0, 0.0,10.0,10.0,10.0,RGB=192,192,192 /

&OBST XB= 0.0, 0.0, 0.0,10.0, 0.0,10.0,RGB= 255, 0, 0 /

&OBST XB=10.0,10.0, 0.0,10.0, 0.0,10.0,RGB= 0,255, 0 /

&OBST XB= 0.0,10.0, 0.0, 0.0, 0.0,10.0,RGB= 0,0,255 /

&OBST XB= 0.0,10.0,10.0,10.0, 0.0,10.0,RGB=0,255,255 /

&TIME T_END=0. / Total simulation time

&TAIL /
Loading

0 comments on commit 936b55d

Please sign in to comment.