Skip to content

Commit 01f492c

Browse files
cxp484cxp484
committed
FireX FDS: Merge with firemodels/master
2 parents 3278fe9 + 64ed720 commit 01f492c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2736
-1217
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
[email protected]
3838
[email protected]
3939
[email protected]
40-
40+
prune: false
41+
4142
- uses: actions/checkout@v4
4243

4344
- name: Check Current Memory Limit
@@ -97,6 +98,7 @@ jobs:
9798
with:
9899
components: |
99100
mkl
101+
prune: false
100102

101103
- uses: actions/checkout@v4
102104
- name: build fds debug

‎Build/Scripts/HYPRE/build_hypre.bat‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,17 @@ echo ----------------------------------------------------------
8484
echo ----------------------------------------------------------
8585
echo.
8686
cd %LIB_REPO%
87-
git checkout %LIB_REPO%\src\config\HYPRE_config.h.cmake.in
88-
git checkout %LIB_TAG%
87+
88+
for /f %%i in ('git tag -l %LIB_TAG%') do set FOUND_TAG=%%i
89+
if "%FOUND_TAG%" == "%LIB_TAG%" (
90+
git checkout %LIB_REPO%\src\config\HYPRE_config.h.cmake.in
91+
git checkout %LIB_TAG%
92+
) else (
93+
echo Your HYPRE repository is not up to date with the required tag: %LIB_TAG%.
94+
echo The FDS build requires HYPRE version %LIB_TAG%. Please update your HYPRE repository.
95+
pause
96+
exit /b 1
97+
)
8998

9099
cd %CURDIR%
91100

@@ -108,12 +117,15 @@ echo ----------------------------------------------------------
108117
echo ----------------------------------------------------------
109118
echo.
110119

120+
<<<<<<< HEAD
111121
set cmake_args=
112122
if "%BUILD_WITH_GPU%" EQU "ON" (
113123
if "%GPU_ARCH%" EQU "cuda" (
114124
set cmake_args=-DHYPRE_ENABLE_CUDA="ON"
115125
)
116126
)
127+
=======
128+
>>>>>>> firemodels/master
117129
set BUILDDIR=%LIB_REPO%\build
118130
cd %BUILDDIR%
119131
cmake ..\src ^
@@ -124,8 +136,13 @@ cmake ..\src ^
124136
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ^
125137
-DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^
126138
-DHYPRE_FMANGLE=4 ^
139+
<<<<<<< HEAD
127140
-DCMAKE_INSTALL_LIBDIR="lib" ^
128141
%cmake_args%
142+
=======
143+
-DCMAKE_INSTALL_LIBDIR="lib"
144+
>>>>>>> firemodels/master
145+
129146

130147
echo.
131148
echo ----------------------------------------------------------

‎Build/Scripts/HYPRE/build_hypre.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ if [ -d "$FIREMODELS/hypre" ]; then
4343
if [[ "$(git tag -l $HYPRE_LIB_TAG)" == $HYPRE_LIB_TAG ]]; then
4444
echo "Checking out $HYPRE_LIB_TAG"
4545
git checkout $HYPRE_LIB_TAG
46+
else
47+
echo "Your HYPRE repository is not up to date with the required tag: $HYPRE_LIB_TAG."
48+
echo "The FDS build requires HYPRE version $HYPRE_LIB_TAG. Please update your HYPRE repository."
49+
exit 1
4650
fi
4751
cd $FIREMODELS/hypre/build
4852
export HYPRE_VERSION=$(git describe)

‎Build/Scripts/SUNDIALS/build_sundials.bat‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,15 @@ echo ----------------------------------------------------------
7474
echo ----------------------------------------------------------
7575
echo.
7676

77-
git checkout %LIB_TAG%
77+
for /f %%i in ('git tag -l %LIB_TAG%') do set FOUND_TAG=%%i
78+
if "%FOUND_TAG%" == "%LIB_TAG%" (
79+
git checkout %LIB_TAG%
80+
) else (
81+
echo Your SUNDIALS repository is not up to date with the required tag: %LIB_TAG%.
82+
echo The FDS build requires SUNDIALS version %LIB_TAG%. Please update your SUNDIALS repository.
83+
pause
84+
exit /b 1
85+
)
7886

7987
echo.
8088
echo ----------------------------------------------------------

‎Build/Scripts/SUNDIALS/build_sundials.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ if [ -d "$FIREMODELS/sundials" ]; then
4444
if [[ "$(git tag -l $SUNDIALS_LIB_TAG)" == $SUNDIALS_LIB_TAG ]]; then
4545
echo "Checking out $SUNDIALS_LIB_TAG"
4646
git checkout $SUNDIALS_LIB_TAG
47+
else
48+
echo "Your SUNDIALS repository is not up to date with the required tag: $SUNDIALS_LIB_TAG."
49+
echo "The FDS build requires SUNDIALS version $SUNDIALS_LIB_TAG. Please update your SUNDIALS repository."
50+
exit 1
4751
fi
4852
mkdir $FIREMODELS/sundials/BUILDDIR
4953
cd $FIREMODELS/sundials/BUILDDIR

‎Build/Scripts/havemkl.bat‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Build/for_bundle/FDS_Web_Site.url‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[InternetShortcut]
2+
URL=https://pages.nist.gov/fds-smv/

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#%Module@VER@#####################################################################
2+
3+
proc ModulesHelp { } {
4+
global helpmsg
5+
puts stderr "\t$helpmsg\n"
6+
}
7+
8+
#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2
9+
10+
11+
# change 'mpihome' to base directory where openmpi is located
12+
# and all variables below will be set correctly
13+
14+
set mpihome /shared/openmpi211_64
15+
16+
# make sure that another openmpi or FDS6 modules are not loaded
17+
#
18+
conflict openmpi
19+
conflict FDS6
20+
21+
if [ file isdirectory $mpihome/bin ] {
22+
module-whatis "Sets up your openmpi environment to use $mpihome"
23+
set helpmsg "Sets up your openmpi environment to use $mpihome"
24+
25+
setenv OPAL_PREFIX $mpihome
26+
27+
setenv CC $mpihome/bin/mpicc
28+
setenv FC $mpihome/bin/mpif77
29+
setenv F90 $mpihome/bin/mpif90
30+
setenv F77 $mpihome/bin/mpif77
31+
32+
prepend-path PATH $mpihome/bin
33+
prepend-path MANPATH $mpihome/man
34+
prepend-path C_INCLUDE_PATH $mpihome/include
35+
prepend-path CPLUS_INCLUDE_PATH $mpihome/include
36+
if [ file isdirectory $mpihome/lib64 ] {
37+
prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
38+
} else {
39+
prepend-path LD_LIBRARY_PATH $mpihome/lib
40+
}
41+
} else {
42+
module-whatis "MPI $mpihome is NOT installed"
43+
set helpmsg "MPI $mpihome is NOT installed"
44+
}
45+

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#%Module@VER@#####################################################################
2+
3+
proc ModulesHelp { } {
4+
global helpmsg
5+
puts stderr "\t$helpmsg\n"
6+
}
7+
8+
#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2
9+
10+
11+
# change 'mpihome' to base directory where openmpi is located
12+
# and all variables below will be set correctly
13+
14+
set mpihome /shared/openmpi211_64ib
15+
16+
# make sure that another openmpi or FDS6 modules are not loaded
17+
#
18+
conflict openmpi
19+
conflict FDS6
20+
21+
if [ file isdirectory $mpihome/bin ] {
22+
module-whatis "Sets up your openmpi environment to use $mpihome"
23+
set helpmsg "Sets up your openmpi environment to use $mpihome"
24+
25+
setenv OPAL_PREFIX $mpihome
26+
27+
setenv CC $mpihome/bin/mpicc
28+
setenv FC $mpihome/bin/mpif77
29+
setenv F90 $mpihome/bin/mpif90
30+
setenv F77 $mpihome/bin/mpif77
31+
32+
prepend-path PATH $mpihome/bin
33+
prepend-path MANPATH $mpihome/man
34+
prepend-path C_INCLUDE_PATH $mpihome/include
35+
prepend-path CPLUS_INCLUDE_PATH $mpihome/include
36+
if [ file isdirectory $mpihome/lib64 ] {
37+
prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
38+
} else {
39+
prepend-path LD_LIBRARY_PATH $mpihome/lib
40+
}
41+
if [ file isdirectory /usr/lib64 ] {
42+
prepend-path LD_LIBRARY_PATH /usr/lib64
43+
}
44+
} else {
45+
module-whatis "MPI $mpihome is NOT installed"
46+
set helpmsg "MPI $mpihome is NOT installed"
47+
}
48+

‎Build/for_bundle/Modules/linux/openmpi/64‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#%Module@VER@#####################################################################
2+
3+
proc ModulesHelp { } {
4+
global helpmsg
5+
puts stderr "\t$helpmsg\n"
6+
}
7+
8+
#module add library/gmp6.0.0a library/mpfr3.1.2 library/mpc1.0.3 compilers/gcc4.9.2
9+
10+
#
11+
# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX,
12+
# and all variables below will be set correctly
13+
#
14+
set mpihome /shared/openmpi_64
15+
16+
conflict openmpi
17+
conflict FDS6
18+
19+
if [ file isdirectory $mpihome/bin ] {
20+
module-whatis "Sets up your openmpi environment to use $mpihome"
21+
set helpmsg "Sets up your openmpi environment to use $mpihome"
22+
23+
setenv OPAL_PREFIX $mpihome
24+
25+
setenv CC $mpihome/bin/mpicc
26+
setenv FC $mpihome/bin/mpif77
27+
setenv F90 $mpihome/bin/mpif90
28+
setenv F77 $mpihome/bin/mpif77
29+
30+
prepend-path PATH $mpihome/bin
31+
prepend-path MANPATH $mpihome/man
32+
prepend-path C_INCLUDE_PATH $mpihome/include
33+
prepend-path CPLUS_INCLUDE_PATH $mpihome/include
34+
if [ file isdirectory $mpihome/lib64 ] {
35+
prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
36+
} else {
37+
prepend-path LD_LIBRARY_PATH $mpihome/lib
38+
}
39+
} else {
40+
module-whatis "MPI $mpihome is NOT installed"
41+
set helpmsg "MPI $mpihome is NOT installed"
42+
}
43+

0 commit comments

Comments
 (0)