Bring FireX up to master, refactor vtkhdf output for computational speed, windows GPU build

.github/workflows/linux.yml

@@ -37,7 +37,8 @@ jobs:
           [email protected]
           [email protected]
           [email protected]
-
+        prune: false       
+
     - uses: actions/checkout@v4
 
     - name: Check Current Memory Limit
@@ -97,6 +98,7 @@ jobs:
       with:
         components: |
           mkl
+        prune: false  
 
     - uses: actions/checkout@v4
     - name: build fds debug

Build/Scripts/HYPRE/build_hypre.bat

@@ -84,8 +84,17 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 cd %LIB_REPO%
-git checkout %LIB_REPO%\src\config\HYPRE_config.h.cmake.in
-git checkout %LIB_TAG%
+
+for /f %%i in ('git tag -l %LIB_TAG%') do set FOUND_TAG=%%i
+if "%FOUND_TAG%" == "%LIB_TAG%" (
+    git checkout %LIB_REPO%\src\config\HYPRE_config.h.cmake.in
+    git checkout %LIB_TAG%
+) else (
+    echo Your HYPRE repository is not up to date with the required tag: %LIB_TAG%.
+    echo The FDS build requires HYPRE version %LIB_TAG%. Please update your HYPRE repository.
+    pause
+    exit /b 1
+)
 
 cd %CURDIR%
 
@@ -114,6 +123,7 @@ if "%BUILD_WITH_GPU%" EQU "ON" (
     set cmake_args=-DHYPRE_ENABLE_CUDA="ON"
   )
 )
+
 set BUILDDIR=%LIB_REPO%\build
 cd %BUILDDIR%
 cmake ..\src  ^
@@ -127,6 +137,7 @@ cmake ..\src  ^
 -DCMAKE_INSTALL_LIBDIR="lib" ^
 %cmake_args%
 
+
 echo.
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------

Build/Scripts/HYPRE/build_hypre.sh

@@ -43,6 +43,10 @@ if [ -d "$FIREMODELS/hypre" ]; then
   if [[ "$(git tag -l $HYPRE_LIB_TAG)" == $HYPRE_LIB_TAG ]]; then
     echo "Checking out $HYPRE_LIB_TAG"
     git checkout $HYPRE_LIB_TAG
+  else
+    echo "Your HYPRE repository is not up to date with the required tag: $HYPRE_LIB_TAG."
+    echo "The FDS build requires HYPRE version $HYPRE_LIB_TAG. Please update your HYPRE repository."
+    exit 1
   fi
   cd $FIREMODELS/hypre/build
   export HYPRE_VERSION=$(git describe)

Build/Scripts/SUNDIALS/build_sundials.bat

@@ -74,7 +74,15 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
-git checkout %LIB_TAG%
+for /f %%i in ('git tag -l %LIB_TAG%') do set FOUND_TAG=%%i
+if "%FOUND_TAG%" == "%LIB_TAG%" (
+    git checkout %LIB_TAG%
+) else (
+    echo Your SUNDIALS repository is not up to date with the required tag: %LIB_TAG%.
+    echo The FDS build requires SUNDIALS version %LIB_TAG%. Please update your SUNDIALS repository.
+    pause
+    exit /b 1
+)
 
 echo.
 echo ----------------------------------------------------------

Build/Scripts/SUNDIALS/build_sundials.sh

@@ -44,6 +44,10 @@ if [ -d "$FIREMODELS/sundials" ]; then
   if [[ "$(git tag -l $SUNDIALS_LIB_TAG)" == $SUNDIALS_LIB_TAG ]]; then
     echo "Checking out $SUNDIALS_LIB_TAG"
     git checkout $SUNDIALS_LIB_TAG
+  else
+    echo "Your SUNDIALS repository is not up to date with the required tag: $SUNDIALS_LIB_TAG."
+    echo "The FDS build requires SUNDIALS version $SUNDIALS_LIB_TAG. Please update your SUNDIALS repository."
+    exit 1
   fi 
   mkdir $FIREMODELS/sundials/BUILDDIR
   cd $FIREMODELS/sundials/BUILDDIR

Build/for_bundle/FDS_Web_Site.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://pages.nist.gov/fds-smv/

Build/for_bundle/Modules/linux/openmpi/211_64

@@ -0,0 +1,45 @@
+#%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"
+}
+

Build/for_bundle/Modules/linux/openmpi/211_64ib

@@ -0,0 +1,48 @@
+#%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"
+}
+

Build/for_bundle/Modules/linux/openmpi/64

@@ -0,0 +1,43 @@
+#%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"
+}
+

Build/for_bundle/Modules/linux/openmpi/64ib

@@ -0,0 +1,46 @@
+#%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"
+}
+

Build/for_bundle/Modules/making_modules.txt

@@ -0,0 +1,13 @@
+
+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.  

Build/for_bundle/Modules/osx/openmpi/202_64

@@ -0,0 +1,45 @@
+#%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"
+}
+