From 3e4a768235db66e1f69bb21c6267712cd8077c4e Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 12 May 2026 16:13:22 -0400 Subject: [PATCH] bundle: remove for_bundle directory - move it to bot repo --- Build/for_bundle/FDS_Web_Site.url | 2 - Build/for_bundle/Modules/linux/openmpi/211_64 | 45 -- .../for_bundle/Modules/linux/openmpi/211_64ib | 48 -- Build/for_bundle/Modules/linux/openmpi/64 | 43 -- Build/for_bundle/Modules/linux/openmpi/64ib | 46 -- Build/for_bundle/Modules/making_modules.txt | 13 - Build/for_bundle/Modules/osx/openmpi/202_64 | 45 -- Build/for_bundle/Modules/osx/openmpi/211_64 | 45 -- Build/for_bundle/Modules/osx/openmpi/64 | 43 -- Build/for_bundle/Overview.html | 54 -- Build/for_bundle/Overview_linux_osx.html | 46 -- Build/for_bundle/about.txt | 5 - Build/for_bundle/fds_local.bat | 215 ------- Build/for_bundle/fdsinit.bat | 11 - Build/for_bundle/fdspath.bat | 43 -- Build/for_bundle/helpfds.bat | 21 - Build/for_bundle/icon.ico | Bin 67646 -> 0 bytes Build/for_bundle/setup.bat | 534 ------------------ Build/for_bundle/setup_fds_firewall.bat | 15 - Build/for_bundle/temp/.gitignore | 0 Build/for_bundle/uninstall.bat | 7 - Build/for_bundle/uninstall_fds.bat | 35 -- Build/for_bundle/uninstall_fds2.bat | 13 - 23 files changed, 1329 deletions(-) delete mode 100644 Build/for_bundle/FDS_Web_Site.url delete mode 100644 Build/for_bundle/Modules/linux/openmpi/211_64 delete mode 100644 Build/for_bundle/Modules/linux/openmpi/211_64ib delete mode 100644 Build/for_bundle/Modules/linux/openmpi/64 delete mode 100644 Build/for_bundle/Modules/linux/openmpi/64ib delete mode 100644 Build/for_bundle/Modules/making_modules.txt delete mode 100644 Build/for_bundle/Modules/osx/openmpi/202_64 delete mode 100644 Build/for_bundle/Modules/osx/openmpi/211_64 delete mode 100644 Build/for_bundle/Modules/osx/openmpi/64 delete mode 100644 Build/for_bundle/Overview.html delete mode 100644 Build/for_bundle/Overview_linux_osx.html delete mode 100644 Build/for_bundle/about.txt delete mode 100644 Build/for_bundle/fds_local.bat delete mode 100644 Build/for_bundle/fdsinit.bat delete mode 100644 Build/for_bundle/fdspath.bat delete mode 100644 Build/for_bundle/helpfds.bat delete mode 100644 Build/for_bundle/icon.ico delete mode 100644 Build/for_bundle/setup.bat delete mode 100644 Build/for_bundle/setup_fds_firewall.bat delete mode 100644 Build/for_bundle/temp/.gitignore delete mode 100644 Build/for_bundle/uninstall.bat delete mode 100644 Build/for_bundle/uninstall_fds.bat delete mode 100644 Build/for_bundle/uninstall_fds2.bat diff --git a/Build/for_bundle/FDS_Web_Site.url b/Build/for_bundle/FDS_Web_Site.url deleted file mode 100644 index 00391ace6e6..00000000000 --- a/Build/for_bundle/FDS_Web_Site.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://pages.nist.gov/fds-smv/ diff --git a/Build/for_bundle/Modules/linux/openmpi/211_64 b/Build/for_bundle/Modules/linux/openmpi/211_64 deleted file mode 100644 index e178ab2e2bc..00000000000 --- a/Build/for_bundle/Modules/linux/openmpi/211_64 +++ /dev/null @@ -1,45 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - - -# change 'mpihome' to base directory where openmpi is located -# and all variables below will be set correctly - -set mpihome /shared/openmpi211_64 - -# make sure that another openmpi or FDS6 modules are not loaded -# -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/linux/openmpi/211_64ib b/Build/for_bundle/Modules/linux/openmpi/211_64ib deleted file mode 100644 index 435ae8ea84d..00000000000 --- a/Build/for_bundle/Modules/linux/openmpi/211_64ib +++ /dev/null @@ -1,48 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - - -# change 'mpihome' to base directory where openmpi is located -# and all variables below will be set correctly - -set mpihome /shared/openmpi211_64ib - -# make sure that another openmpi or FDS6 modules are not loaded -# -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } - if [ file isdirectory /usr/lib64 ] { - prepend-path LD_LIBRARY_PATH /usr/lib64 - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/linux/openmpi/64 b/Build/for_bundle/Modules/linux/openmpi/64 deleted file mode 100644 index 509ea2dd591..00000000000 --- a/Build/for_bundle/Modules/linux/openmpi/64 +++ /dev/null @@ -1,43 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - -# -# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX, -# and all variables below will be set correctly -# -set mpihome /shared/openmpi_64 - -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/linux/openmpi/64ib b/Build/for_bundle/Modules/linux/openmpi/64ib deleted file mode 100644 index a28d83a5562..00000000000 --- a/Build/for_bundle/Modules/linux/openmpi/64ib +++ /dev/null @@ -1,46 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - -# -# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX, -# and all variables below will be set correctly -# -set mpihome /shared/openmpi_64ib - -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } - if [ file isdirectory /usr/lib64 ] { - prepend-path LD_LIBRARY_PATH /usr/lib64 - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/making_modules.txt b/Build/for_bundle/Modules/making_modules.txt deleted file mode 100644 index be7d62c2e0f..00000000000 --- a/Build/for_bundle/Modules/making_modules.txt +++ /dev/null @@ -1,13 +0,0 @@ - -Suppose you have a script that sets environment variables. -If you want to make a module from this script perform the -following steps - -1. env | sort > file1 -2. run the script that sets environtment variables -3. env | sort > file2 -4. ./env2mod -f file1 file2 -5. clean up module file named modulefile created by env2mod - -The program env2mod is located in the smv repo and may be built -using scripts at smv/Build/env2mod. diff --git a/Build/for_bundle/Modules/osx/openmpi/202_64 b/Build/for_bundle/Modules/osx/openmpi/202_64 deleted file mode 100644 index 5359dec2e9b..00000000000 --- a/Build/for_bundle/Modules/osx/openmpi/202_64 +++ /dev/null @@ -1,45 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - - -# change 'mpihome' to base directory where openmpi is located -# and all variables below will be set correctly - -set mpihome /shared/openmpi202_i17_64 - -# make sure that another openmpi or FDS6 modules are not loaded - -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/osx/openmpi/211_64 b/Build/for_bundle/Modules/osx/openmpi/211_64 deleted file mode 100644 index 3cfb18445ab..00000000000 --- a/Build/for_bundle/Modules/osx/openmpi/211_64 +++ /dev/null @@ -1,45 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - - -# change 'mpihome' to base directory where openmpi is located -# and all variables below will be set correctly - -set mpihome /shared/openmpi211_i17u4_64 - -# make sure that another openmpi or FDS6 modules are not loaded - -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Modules/osx/openmpi/64 b/Build/for_bundle/Modules/osx/openmpi/64 deleted file mode 100644 index 509ea2dd591..00000000000 --- a/Build/for_bundle/Modules/osx/openmpi/64 +++ /dev/null @@ -1,43 +0,0 @@ -#%Module@VER@##################################################################### - -proc ModulesHelp { } { - global helpmsg - puts stderr "\t$helpmsg\n" -} - -#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2 - -# -# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX, -# and all variables below will be set correctly -# -set mpihome /shared/openmpi_64 - -conflict openmpi -conflict FDS6 - -if [ file isdirectory $mpihome/bin ] { - module-whatis "Sets up your openmpi environment to use $mpihome" - set helpmsg "Sets up your openmpi environment to use $mpihome" - - setenv OPAL_PREFIX $mpihome - - setenv CC $mpihome/bin/mpicc - setenv FC $mpihome/bin/mpif77 - setenv F90 $mpihome/bin/mpif90 - setenv F77 $mpihome/bin/mpif77 - - prepend-path PATH $mpihome/bin - prepend-path MANPATH $mpihome/man - prepend-path C_INCLUDE_PATH $mpihome/include - prepend-path CPLUS_INCLUDE_PATH $mpihome/include - if [ file isdirectory $mpihome/lib64 ] { - prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib - } else { - prepend-path LD_LIBRARY_PATH $mpihome/lib - } -} else { - module-whatis "MPI $mpihome is NOT installed" - set helpmsg "MPI $mpihome is NOT installed" -} - diff --git a/Build/for_bundle/Overview.html b/Build/for_bundle/Overview.html deleted file mode 100644 index 513ec91553c..00000000000 --- a/Build/for_bundle/Overview.html +++ /dev/null @@ -1,54 +0,0 @@ - - - -FDS and Smokeview Overview - - -

FDS and Smokeview Overview

-

-

- -FDS is a computer program that solves equations that describe the evolution of fire. It is a Fortran program -that reads input parameters from a text file, computes a numerical solution to the governing equations, and -writes user-specified output data to files. Smokeview is a companion program that creates visualizations of -FDS generated data. - -

FDS Documentation

- - - -

Smokeview Documentation

- - -

Updates

- - -

User Support

-The FDS-Smokeview discussion group exists so that users may discuss fire phenomena related to FDS/Smokeview scenarios. -Similar to the discussion group, is the Issue Tracker which was set up to report problems and to request enhancements. -When reporting a problem to the Issue Tracker, it is important to simplify your case as much as possible and still exhibit the problem. -The Discussion group and Issue tracker are available at - - - - -
- - - diff --git a/Build/for_bundle/Overview_linux_osx.html b/Build/for_bundle/Overview_linux_osx.html deleted file mode 100644 index 920ddfe385d..00000000000 --- a/Build/for_bundle/Overview_linux_osx.html +++ /dev/null @@ -1,46 +0,0 @@ - - - -FDS and Smokeview Overview - - -

FDS and Smokeview Overview

-

-

- -FDS is a computer program that solves equations that describe the evolution of fire. It is a Fortran program -that reads input parameters from a text file, computes a numerical solution to the governing equations, and -writes user-specified output data to files. Smokeview is a companion program that reads FDS output files -and produces animations on the computer screen. - -

Documentation

- - - -

Updates

- - -

User Support

-The FDS-Smokeview discussion group exists so that users may discuss fire phenomena related to FDS/Smokeview scenarios. -Similar to the discussion group, is the Issue Tracker which was set up to report problems and to request enhancements. -When reporting a problem to the ISsue Tracker, it is important to simplify your case as much as possible and still exhibit the problem. -The Discussion group and Issue tracker are available at - - - - -
- - - diff --git a/Build/for_bundle/about.txt b/Build/for_bundle/about.txt deleted file mode 100644 index 1f3d3adf62e..00000000000 --- a/Build/for_bundle/about.txt +++ /dev/null @@ -1,5 +0,0 @@ -The Fire Dynamics Simulator (FDS), is a computational -fluid dynamics (CFD) model of fire-driven fluid flow. - -Smokeview is a separate visualization program that is used to display the -results of an FDS simulation. \ No newline at end of file diff --git a/Build/for_bundle/fds_local.bat b/Build/for_bundle/fds_local.bat deleted file mode 100644 index 8ca235cbbc9..00000000000 --- a/Build/for_bundle/fds_local.bat +++ /dev/null @@ -1,215 +0,0 @@ -@echo off - -if NOT "x%1%" == "x" goto skip_usage - call :usage - exit /b -:skip_usage - -set n_mpi=1 -set n_openmp=1 -set show_only=0 -set stop_script=0 -set use_openmp=0 -set force_openmp=0 -set have_casename=0 -set show_version=0 -set MPIEXEC_PORT_RANGE= -set MPICH_PORT_RANGE= -set debug= -set oversubscribed= -set casedir= -set use_default_casedir= -set "fabric=" - - -call :getopts %* -if "%stop_script%" == "1" exit /b -call :set_openmp_defaults - -if "x%IN_CMDFDS%" == "x1" goto skip_fdsinit - echo setting up environment for fds - call fdsinit -:skip_fdsinit - -if "x%IN_CMDFDS%" == "x1" goto skip_NO_IN_CMDFDS - echo ***Error: environment not setup for using fds - echo type: fdsinit or use the CMDfds command shell - exit /b -:skip_NO_IN_CMDFDS - -if "%show_version%" == "0" goto skip_showversion - mpiexec -localonly -n 1 fds -goto eof -:skip_showversion - -if "%have_casename%" == "1" goto skip_casename_test - echo ***error: an input file is missing - call :usage - echo . - if "%show_only%" == "1" goto skip_casename_test - exit /b -:skip_casename_test - -set ECHO= -if "%show_only%" == "1" set ECHO=echo - -if "%show_only%" == "1" goto skip1 -if "x%use_default_casedir%" == "x" goto skip3 - set casedir=%casename:~0,-4% -:skip3 -if "x%casedir%" == "x" goto skip2 -if NOT exist %casedir% mkdir %casedir% - echo @echo off > %casedir%.bat - echo smokeview %casedir% >> %casedir%.bat - copy %casename% %casedir% - cd %casedir% -:skip2 -:skip1 - -:: placeholder names for openmp and non-openmp versions of fds - -set fds_openmp=fds_openmp -set fds_non_openmp=fds - -set fds=%fds_openmp% -set "openmp_env=-env OMP_NUM_THREADS %n_openmp%" - -:: use non-openmp fds if number of threads is 1 and openmp is not being forced - -if NOT "%n_openmp%" == "1" goto skip1 -if "%force_openmp%" == "1" goto skip1 - set fds=%fds_non_openmp% - set openmp_env= -:skip1 - -TITLE %casename% -%ECHO% mpiexec -localonly -n %n_mpi% %openmp_env% %debug% %oversubscribed% %fabric% %fds% %casename% - -:eof -exit /b - -:------------------------------------------------------------------------- -:----------------------subroutines---------------------------------------- -:------------------------------------------------------------------------- - -:------------------------------------------------------------------------- -:getopts -:------------------------------------------------------------------------- - if (%1)==() exit /b - - set casename=%1 - set case1=%casename:~0,1% - if "%case1%" == "-" goto skip_casename - - set have_casename=1 - if EXIST %casename% goto skip_casename_notexist - if "%show_only%" == "1" goto skip_casename_notexist - echo ***error: The input file %casename% does not exist - set stop_script=1 - - :skip_casename_notexist - exit /b - - :skip_casename - set valid=0 - set arg=%1 - if /I "%1" EQU "-p" ( - set valid=1 - set n_mpi=%2 - shift - ) - if /I "%1" EQU "-c" ( - set valid=1 - set show_only=1 - ) - if /I "%1" EQU "-v" ( - set valid=1 - set show_version=1 - ) - if /I "%1" EQU "-d" ( - set valid=1 - set "debug=-env I_MPI_DEBUG=5" - ) - if /I "%1" EQU "-F" ( - set valid=1 - set "fabric=-env I_MPI_FABRICS=%2" - shift - ) - if /I "%1" EQU "-h" ( - set valid=1 - set stop_script=1 - call :usage - exit /b - ) - if "%1" EQU "-o" ( - set valid=1 - set n_openmp=%2 - set use_openmp=1 - shift - ) - if "%1" EQU "-f" ( - set valid=1 - set force_openmp=1 - ) - if "%1" EQU "-y" ( - set valid=1 - set casedir=%2 - shift - ) - if "%1" EQU "-Y" ( - set valid=1 - set use_default_casedir=1 - ) - if "%1" EQU "-O" ( - set valid=1 - set "oversubscribed=-env I_MPI_WAIT_MODE=1" - ) - shift - if %valid% == 0 ( - echo. - echo ***Error: the input argument %arg% is invalid - echo. - echo Usage: - call :usage - set stop_script=1 - exit /b - ) -if not (%1)==() goto getopts -exit /b - -:------------------------------------------------------------------------- -:set_openmp_defaults -:------------------------------------------------------------------------- -:: if number of openmp threads are not specified then -:: set number of openmp threads to 1 if number of mpi processes > 1 -:: set number of openmp threads to %OMP_NUM_THREADS% if number of mpi processes = 1 - -if "%use_openmp%" == "1" exit /b -if "%n_mpi%" == "1" set n_openmp=%OMP_NUM_THREADS% -if "%n_mpi%" == "1" exit /b -set n_openmp=1 -exit /b - -:------------------------------------------------------------------------- -:usage -:------------------------------------------------------------------------- -echo. -echo Usage: -echo fds_local [options] casename.fds -echo. -echo options: -echo -c - show command line generated by this script (fds is not run) -echo -d - add -env I_MPI_DEBUG=5 to the mpiexec line for debugging -echo -f - force the openmp version of fds to be used even if the number of threads is 1 -echo -F fabric - set I_MPI_FABRICS fabric variable -echo -h - display this message -echo -p xx - number of MPI processes [default: 1] -echo -o yy - number of OpenMP threads per process [default: %OMP_NUM_THREADS% ] -echo fds_local uses the non-OpenMP version of fds if the number of OpenMP threads -echo specified per process is 1 unless the -f option is also specified -echo -O - add -env I_MPI_WAIT=1 to the mpiexec line for use when your case is oversubscribed -echo -v - show fds version information -echo -y dir - run casename.fds in directory dir -echo -Y - run casename.fds in directory casename - -exit /b diff --git a/Build/for_bundle/fdsinit.bat b/Build/for_bundle/fdsinit.bat deleted file mode 100644 index 989e1bdef2d..00000000000 --- a/Build/for_bundle/fdsinit.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -set I_MPI_ROOT=%~dp0\mpi -set PATH=%I_MPI_ROOT%;%PATH% -set IN_CMDFDS=1 -set MPIEXEC_PORT_RANGE= -set MPICH_PORT_RANGE= - -title FDS -echo. -echo type helpfds for help on running fds - diff --git a/Build/for_bundle/fdspath.bat b/Build/for_bundle/fdspath.bat deleted file mode 100644 index 6ce819cb297..00000000000 --- a/Build/for_bundle/fdspath.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo off -set CURDIR=%CD% - -if "x%FDS_SAVE_PATH%" == "x" goto set_fds_path -:: restore original path - -echo restoring original path -set PATH=%FDS_SAVE_PATH% -echo. -echo PATH=%PATH% -set FDS_SAVE_PATH= -echo. -echo original path restored - -goto eof - -:set_fds_path - -:: set path containing fds, smokeview, intel mpi and windows entries - -SET I_MPI_ROOT=%~dp0\mpi -SET FDS_PATH=%~dp0 -SET SMV_PATH=%~dp0\..\..\SMV6 - -cd %I_MPI_ROOT% -SET I_MPI_ROOT=%CD% - -cd %FDS_PATH% -SET FDS_PATH=%CD% - -cd %SMV_PATH% -SET SMV_PATH=%CD% - -SET FDS_SAVE_PATH=%PATH% -echo setting path to contain only fds, smokeview, intel mpi and windows entries -echo type fdspath again to restore original path -SET PATH=%SMV_PATH%;%FDS_PATH%;%I_MPI_ROOT%;%WINDIR%;%WINDIR%\system32 -echo. -echo PATH=%PATH% - -:eof - -cd %CURDIR% diff --git a/Build/for_bundle/helpfds.bat b/Build/for_bundle/helpfds.bat deleted file mode 100644 index c66f025b89e..00000000000 --- a/Build/for_bundle/helpfds.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -fds -v -echo Current number of OpenMP threads per MPI process: -echo OMP_NUM_THREADS=%OMP_NUM_THREADS% -echo. -echo To run fds, open the command shell CMDfds located on the desktop. -echo. -echo To run fds for cases using this computer only: -echo fds_local -p xx -o yy casename.fds -echo. -echo For more options type: fds_local -h -echo. -echo To run fds for cases using multiple computers: -echo mpiexec -n xx -hostfile hostfile.txt -wdir WDIR -env OMP_NUM_THREADS yy fds casename.fds -echo. -echo xx -- number of MPI processes requested -echo yy -- number of OpenMP threads requested per MPI process -echo hostfile.txt -- list of available computers -echo WDIR -- Network address of the working directory -echo. - diff --git a/Build/for_bundle/icon.ico b/Build/for_bundle/icon.ico deleted file mode 100644 index d8dfc51c751ddfcaa3d5493af2b60b2a0b19cbaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67646 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 diff --git a/Build/for_bundle/setup.bat b/Build/for_bundle/setup.bat deleted file mode 100644 index 1efd368e6e7..00000000000 --- a/Build/for_bundle/setup.bat +++ /dev/null @@ -1,534 +0,0 @@ -@echo off -set script_dir=%~dp0 - -title FDS and Smokeview Installer for %username% with home directory %userprofile% - -:: before we do anything make sure this is a 64 bit PC - -if defined PROGRAMFILES(X86) ( - echo. -) else ( - echo. - echo *** Fatal error: 32 bit Windows detected. - echo FDS and Smokeview can only run on 64 bit systems. - echo Installation aborted. - echo *** Press any key to continue. *** - pause>NUL - goto abort -) - -:: form extraction directory - -set /p basename= Nul - -set "LOGFILE=%INSTALLDIR%\fds_install.log" -echo FDS/Smokeview installation log > "%LOGFILE%" - -echo. >> "%LOGFILE%" -echo *** Copying fds files >> "%LOGFILE%" -xcopy /E /I /H /Q firemodels\FDS6 "%FDS6%" >> "%LOGFILE%" - -echo. >> "%LOGFILE%" -echo *** Copying smokeview files >> "%LOGFILE%" -xcopy /E /I /H /Q firemodels\SMV6 "%SMV6%" >> "%LOGFILE%" - -set "filepath=%FDS6%\bin\fds.exe%" -call :is_file_copied fds.exe - -set "filepath=%SMV6%\smokeview.exe" -call :is_file_copied smokeview.exe - -set "filepath=%FDS6%\bin\mpi\mpiexec.exe" -call :is_file_copied mpiexec.exe - -echo copy complete - -echo *** Removing previous FDS/Smokeview entries from the system and user path. -echo. >> "%LOGFILE%" -echo *** Removing previous FDS/Smokeview entries from the system and user path. >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "nist\fds" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "FDS\FDS5" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "FDS\FDS5" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "FDS\FDS6" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "FDS\FDS6" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "firemodels\FDS6" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "firemodels\SMV6" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "firemodels\FDS6" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "firemodels\SMV6" >> "%LOGFILE%" - -:: ------------ create aliases ---------------- - -set numcoresfile="%TEMP%\numcoresfile" - -:: ------------ setting up path ------------ - -echo *** Setting up PATH variable. - -echo. >> "%LOGFILE%" -echo *** Setting up PATH variable >> "%LOGFILE%" -if NOT "%option_install%" == "1" goto skip_systempath - call "%UNINSTALLDIR%\set_path.exe" -s -m -f "%FDS6%\bin" >> "%LOGFILE%" - call "%UNINSTALLDIR%\set_path.exe" -s -m -f "%SMV6%" >> "%LOGFILE%" - goto after_setpath -:skip_systempath - -call "%UNINSTALLDIR%\set_path.exe" -u -m -f "%FDS6%\bin" >> "%LOGFILE%" -call "%UNINSTALLDIR%\set_path.exe" -u -m -f "%SMV6%" >> "%LOGFILE%" - -:after_setpath - -:: ------------- file association ------------- -echo *** Associating the .smv file extension with smokeview.exe - -echo. >> "%LOGFILE%" -echo *** Associating the .smv file extension with smokeview.exe >> "%LOGFILE%" -ftype smvDoc="%SMV6%\smokeview.exe" "%%1" >> "%LOGFILE%" -assoc .smv=smvDoc >> "%LOGFILE%" - -if exist "%Programdata%\Microsoft\Windows\Start Menu\Programs" set "FDSSTART=%Programdata%\Microsoft\Windows\Start Menu\Programs\FDS6" -if exist "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs" set "FDSSTART=%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\FDS6" -:: ------------- start menu shortcuts --------------- -echo *** Adding document shortcuts to %FDSSTART% . -if exist "%FDSSTART%" rmdir /q /s "%FDSSTART%" - -mkdir "%FDSSTART%" - -echo. >> "%LOGFILE%" -echo *** Setting up shortcuts/urls >> "%LOGFILE%" -call :copy_url "%DOCDIR%\FDS_on_the_Web\Official_Web_Site.url" "%FDSSTART%\FDS Home Page.url" - -call :setup_shortcut "%FDSSTART%\FDS Config Management Plan.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_Config_Management_Plan.pdf" -call :setup_shortcut "%FDSSTART%\FDS User Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_User_Guide.pdf" -call :setup_shortcut "%FDSSTART%\FDS Technical Reference Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_Technical_Reference_Guide.pdf" -call :setup_shortcut "%FDSSTART%\FDS Validation Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_Validation_Guide.pdf" -call :setup_shortcut "%FDSSTART%\FDS Verification Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_Verification_Guide.pdf" -call :setup_shortcut "%FDSSTART%\FDS Release Notes.lnk" "%DOCDIR%\Guides_and_Release_Notes\FDS_Release_Notes.htm" -call :setup_shortcut "%FDSSTART%\Smokeview User Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\SMV_User_Guide.pdf" -call :setup_shortcut "%FDSSTART%\Smokeview Technical Reference Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\SMV_Technical_Reference_Guide.pdf" -call :setup_shortcut "%FDSSTART%\Smokeview Verification Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\SMV_Verification_Guide.pdf" -call :setup_shortcut "%FDSSTART%\Smokeview release notes.lnk" "%DOCDIR%\Guides_and_Release_Notes\Smokeview_release_notes.html" -call :setup_shortcut "%FDSSTART%\Uninstall.lnk" "%UNINSTALLDIR%\uninstall.bat" - -set "DESKTOPDIR=%userprofile%\Desktop" -set "DESKTOPDIR11=%OneDrive%\Desktop" - - call :setup_cmdfds "%FDSSTART%\CMDfds.lnk" -if exist "%DESKTOPDIR%" call :setup_cmdfds "%DESKTOPDIR%\CMDfds.lnk" -if exist "%DESKTOPDIR11%" call :setup_cmdfds "%DESKTOPDIR11%\CMDfds.lnk" -set cmdexist=0 -if exist "%DESKTOPDIR%\CMDfds.lnk" set cmdexist=1 -if exist "%DESKTOPDIR11%\CMDfds.lnk" set cmdexist=1 -if "%cmdexist%" == "0" echo ***error: CMDfds failed to be copied to the desktop - -:: ----------- setting up openmp threads environment variable - -::WMIC CPU Get NumberofLogicalProcessors | more /E +1 > %numcoresfile% -set ncores=1 -if "x%NUMBER_OF_PROCESSORS%" == "x" goto endif1 - echo %NUMBER_OF_PROCESSORS% > %numcoresfile% -:endif1 - -set /p ncores=<%numcoresfile% - -if %ncores% GEQ 8 ( - set nthreads=4 -) else ( - if %ncores% GEQ 4 ( - set nthreads=2 - ) else ( - set nthreads=1 - ) -) - -echo. >> "%LOGFILE%" -echo *** Setting up the OMP_NUM_THREADS variable >> "%LOGFILE%" -setx -m OMP_NUM_THREADS %nthreads% >> "%LOGFILE%" - -:: ----------- setting up firewall for mpi version of FDS - -:: remove smpd and hydra - -echo. >> "%LOGFILE%" -echo *** Removing smpd >> "%LOGFILE%" -smpd -remove 1>> Nul 2>&1 -echo. >> "%LOGFILE%" -echo *** Removing hydra >> "%LOGFILE%" -hydra_service -remove 1>> Nul 2>&1 - -echo. >> "%LOGFILE%" -echo *** Setting up firewall exceptions. >> "%LOGFILE%" -echo *** Setting up firewall exceptions. -set "firewall_setup=%FDS6%\setup_fds_firewall.bat" -call "%firewall_setup%" "%FDS6%\bin\mpi" - -:: ----------- setting up uninstall file - -echo. >> "%LOGFILE%" -echo *** Setting up the Uninstall script. >> "%LOGFILE%" -echo *** Setting up the Uninstall script. - -:: remove smokeview path and directory - -echo if "%%cfastinstalled%%" == "1" goto skip2 >> "%UNINSTALLDIR%\uninstall_base.bat" -echo echo Removing "%SMV6%" from the System Path >> "%UNINSTALLDIR%\uninstall_base.bat" -echo call "%UNINSTALLDIR%\set_path.exe" -s -b -r %SMV6% >> "%UNINSTALLDIR%\uninstall_base.bat" -echo rmdir /s /q "%SMV6%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo :skip2 >> "%UNINSTALLDIR%\uninstall_base.bat" - -echo echo Removing CMDfds desktop shortcut >> "%UNINSTALLDIR%\uninstall_base.bat" -echo if exist "%DESKTOPDIR%\CMDfds.lnk" erase "%DESKTOPDIR%\CMDfds.lnk" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo if exist "%DESKTOPDIR11%\CMDfds.lnk" erase "%DESKTOPDIR11%\CMDfds.lnk" >> "%UNINSTALLDIR%\uninstall_base.bat" - -:: remove FDS path and directory - -echo echo Removing "%FDS6%\bin" from the System Path >> "%UNINSTALLDIR%\uninstall_base.bat" -echo call "%UNINSTALLDIR%\set_path.exe" -s -b -r "%FDS6%\bin" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo echo. >> "%UNINSTALLDIR%\uninstall_base.bat" -echo echo Removing "%FDS6%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo rmdir /s /q "%FDS6%" >> "%UNINSTALLDIR%\uninstall_base.bat" - -:: if cfast exists then only remove fds -:: if cfast does not exist then remove everything - -echo if exist "%CFAST%" goto skip_remove >> "%UNINSTALLDIR%\uninstall_base.bat" -echo echo Removing "%SMV6%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo rmdir /s /q "%SMV6%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo echo Removing "%INSTALLDIR%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo rmdir "%INSTALLDIR%" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo :skip_remove >> "%UNINSTALLDIR%\uninstall_base.bat" - -echo echo *** Uninstall complete >> "%UNINSTALLDIR%\uninstall_base.bat" - -type "%UNINSTALLDIR%\uninstall_base2.bat" >> "%UNINSTALLDIR%\uninstall_base.bat" -echo pause>Nul >> "%UNINSTALLDIR%\uninstall_base.bat" -erase "%UNINSTALLDIR%\uninstall_base2.bat" - -echo "%UNINSTALLDIR%\uninstall.vbs" >> "%UNINSTALLDIR%\uninstall.bat" -echo echo Uninstall complete >> "%UNINSTALLDIR%\uninstall.bat" -echo pause >> "%UNINSTALLDIR%\uninstall.bat" - -set "ELEVATE_APP=%UNINSTALLDIR%\uninstall_base.bat" -set ELEVATE_PARMS= -echo Set objShell = CreateObject("Shell.Application") > "%UNINSTALLDIR%\uninstall.vbs" -echo Set objWshShell = WScript.CreateObject("WScript.Shell") >> "%UNINSTALLDIR%\uninstall.vbs" -echo Set objWshProcessEnv = objWshShell.Environment("PROCESS") >> "%UNINSTALLDIR%\uninstall.vbs" -echo objShell.ShellExecute "%ELEVATE_APP%", "%ELEVATE_PARMS%", "", "runas" >> "%UNINSTALLDIR%\uninstall.vbs" -echo WScript.Sleep 10000 >> "%UNINSTALLDIR%\uninstall.vbs" - -echo. >> "%LOGFILE%" -echo *** Cleanup >> "%LOGFILE%" -erase "%firewall_setup%" >> "%LOGFILE%" -erase "%FDS6%\shortcut.exe" >> "%LOGFILE%" - -echo. -echo To run fds for cases using this computer only, open the -echo command shell CMDfds (located on the desktop) and type: -echo. -echo fds_local casename.fds -echo. -echo where casename is the name of your case. For more information type: helpfds. -echo. -echo *** Press any key, then reboot to complete the installation. *** -pause>NUL -goto eof - -:------------------------------------------------------------------------- -:----------------------subroutines---------------------------------------- -:------------------------------------------------------------------------- - -:: ------------------------------------------------------------- -:is_file_copied -:: ------------------------------------------------------------- - - set file=%1 - if not exist "%filepath%" echo. - if not exist "%filepath%" echo ***error: %file% failed to copy to %filepath% - exit /b 0 - -:------------------------------------------------------------------------- -:setup_cmdfds -:------------------------------------------------------------------------- -set outfile=%1 - -"%FDS6%\shortcut.exe" /F:%outfile% /T:"%COMSPEC%" /P:"/k fdsinit" /W:"%userprofile%" /A:C > Nul -if exist %outfile% echo The shortcut %outfile% was created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created -exit /b - -:------------------------------------------------------------------------- -:setup_shortcut -:------------------------------------------------------------------------- -set infile=%2 -set outfile=%1 - -"%FDS6%\shortcut.exe" /F:%outfile% /T:%infile% /A:C > Nul -if exist %outfile% echo The shortcut %outfile% was created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created - -exit /b - -:------------------------------------------------------------------------- -:copy_url -:------------------------------------------------------------------------- -set infile=%1 -set outfile=%2 - -copy %infile% %outfile% -if exist %outfile% echo The url %outfile% was created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The url %outfile% failed to be created >> "%LOGFILE% -if NOT exist %outfile% echo ***error: The url %outfile% failed to be created - -exit /b - -:------------------------------------------------------------------------- -:get_yesnoextract -:------------------------------------------------------------------------- -set answer=%1 -set answervar=%2 -set repeatvar=%3 - -set answer=%answer:~0,1% -if "%answer%" == "Y" set answer=y -if "%answer%" == "N" set answer=n -if "%answer%" == "Q" set answer=q -if "%answer%" == "E" set answer=e -set %answervar%=%answer% -set repeat=1 -if "%answer%" == "y" set repeat=0 -if "%answer%" == "n" set repeat=0 -if "%answer%" == "q" set repeat=2 -if "%answer%" == "e" set repeat=3 -set %repeatvar%=%repeat% -exit /b - -:------------------------------------------------------------------------- -:get_yesno -:------------------------------------------------------------------------- -set answer=%1 -set answervar=%2 -set repeatvar=%3 - -set answer=%answer:~0,1% -if "%answer%" == "Y" set answer=y -if "%answer%" == "N" set answer=n -set %answervar%=%answer% -set repeat=1 -if "%answer%" == "y" set repeat=0 -if "%answer%" == "n" set repeat=0 -set %repeatvar%=%repeat% -exit /b - -:------------------------------------------------------------------------- -:count_programs -:------------------------------------------------------------------------- -call :count fds -call :count smokeview -call :count mpiexec -call :count hydra_service -exit /b - -:------------------------------------------------------------------------- -:stop_programs -:------------------------------------------------------------------------- -:: remove old installation - -if NOT "%hydra_service_count%" == "0" ( - echo *** Stopping hydra_service - taskkill /F /IM hydra_service.exe >Nul 2>Nul -) - -if NOT "%smokeview_count%" == "0" ( - echo *** Stopping smokeview - taskkill /F /IM smokeview.exe >Nul 2>Nul -) - -if NOT "%fds_count%" == "0" ( - echo *** Stopping fds - taskkill /F /IM fds.exe >Nul 2>Nul -) - -if NOT "%mpiexec_count%" == "0" ( - echo *** Stopping mpiexec - taskkill /F /IM mpiexec.exe >Nul 2>Nul -) -exit /b - -:------------------------------------------------------------------------- -:count -:------------------------------------------------------------------------- -set progbase=%1 -set prog=%progbase%.exe -set countvar=%progbase%_count -set stringvar=%progbase%_string - -tasklist | find /c "%prog%" > count.txt -set /p count%= Nul -xcopy /E /I /H /Q firemodels\FDS6 "%FDS6%" > Nul -xcopy /E /I /H /Q firemodels\SMV6 "%SMV6%" > Nul - -echo Copy complete -echo Press any key to finish -pause > Nul -goto eof - -:abort -echo FDS and Smokeview installation aborted. -echo Press any key to finish -pause > Nul - -:eof -exit \ No newline at end of file diff --git a/Build/for_bundle/setup_fds_firewall.bat b/Build/for_bundle/setup_fds_firewall.bat deleted file mode 100644 index 6d9b3a7780f..00000000000 --- a/Build/for_bundle/setup_fds_firewall.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -set bindir=%1 -:: This script deletes previous Intel MPI firewall exceptions and creates two -:: new rules opening ports specified by the environment variable PORT_VAL. - -set PORT_VAL=8670-8690 -netsh advfirewall firewall delete rule name="Intel MPI Port for FDS" > Nul -netsh advfirewall firewall add rule dir=in action=allow name="Intel MPI Port for FDS" profile=domain,private protocol=tcp localport=%PORT_VAL% > Nul -netsh advfirewall firewall add rule dir=in action=allow name="Intel MPI Port for FDS" profile=domain,private protocol=udp localport=%PORT_VAL% > Nul - -:: setx -m MPIEXEC_PORT_RANGE 8670:8690 > Nul -:: setx -m MPICH_PORT_RANGE 8670:8690 > Nul - -%bindir%\hydra_service -install > Nul - diff --git a/Build/for_bundle/temp/.gitignore b/Build/for_bundle/temp/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Build/for_bundle/uninstall.bat b/Build/for_bundle/uninstall.bat deleted file mode 100644 index 5141616ce8e..00000000000 --- a/Build/for_bundle/uninstall.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -echo. -echo *** Uninstalling FDS and Smokeview -echo. -echo Press any key to proceed or CTRL C to abort -pause>NUL diff --git a/Build/for_bundle/uninstall_fds.bat b/Build/for_bundle/uninstall_fds.bat deleted file mode 100644 index bffaa95eef0..00000000000 --- a/Build/for_bundle/uninstall_fds.bat +++ /dev/null @@ -1,35 +0,0 @@ -@echo off - -NET SESSION >nul 2>&1 -IF %ERRORLEVEL% NEQ 0 ( - echo *** Error: This script is running as %username%. It must run as Administrator. - echo Run again, after right clicking on this script and selecting "Run as Adminstrator" - echo FDS/Smokeview uninstaller aborted. - pause - exit -) - -call :is_cfast_installed -if %cfastinstalled% == 1 goto skip1 - echo *** Removing the association between .smv and Smokeview - assoc .smv= - ftype smvDoc= -:skip1 - -echo *** Removing FDS from the Start menu. -rmdir /q /s "%ALLUSERSPROFILE%\Start Menu\Programs\FDS6" - -echo *** Stopping smokeview -taskkill /F /IM smokeview.exe >Nul 2>Nul - -echo *** Stopping fds -taskkill /F /IM fds.exe >Nul 2>Nul - -echo *** Stopping mpiexec -taskkill /F /IM mpiexec.exe >Nul 2>Nul - -echo *** Removing hydra_service -taskkill /F /IM hydra_service.exe >Nul 2>Nul - -echo *** Removing smpd -smpd -remove >Nul 2>Nul diff --git a/Build/for_bundle/uninstall_fds2.bat b/Build/for_bundle/uninstall_fds2.bat deleted file mode 100644 index 6a6b4b86b62..00000000000 --- a/Build/for_bundle/uninstall_fds2.bat +++ /dev/null @@ -1,13 +0,0 @@ -goto eof - -:is_cfast_installed -cfast 1> %temp%\file_exist.txt 2>&1 -type %temp%\file_exist.txt | find /i /c "not recognized" > %temp%\file_exist_count.txt -set /p nothave=<%temp%\file_exist_count.txt -set cfastinstalled=1 -if %nothave% == 1 ( - set cfastinstalled=0 -) -exit /b 0 - -:eof