Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move windows sundials and hypre build scripts to directories under Build\Sscripts to be consistent with linux build script locations #13627

Merged
merged 2 commits into from
Oct 25, 2024
Merged

move windows sundials and hypre build scripts to directories under Build\Sscripts to be consistent with linux build script locations #13627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67e0e61
scripts: move sundials and hypre windows build bath files to Build/Sc…
Oct 25, 2024
38fbd94
scripts: modify windows build sundials and hypre batch files so that …
gforney Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Utilities/Scripts/build_hypre.bat → Build/Scripts/HYPRE/build_hypre.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ if %abort% == 1 exit /b

set CURDIR=%CD%

set LIBS=..\..\..\libs
set FIREMODELS=..\..\..\..
cd %FIREMODELS%
set FIREMODELS=%CD%
cd %CURDIR%

set LIBS=%FIREMODELS%\libs
if not exist %LIBS% mkdir %LIBS%
if not exist %LIBS% echo failed to create LIBS directory
if not exist %LIBS% exit
Expand All @@ -30,11 +35,11 @@ echo setting up Intel compilers
echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo.
call ..\..\Build\Scripts\setup_intel_compilers.bat
call %FIREMODELS%\fds\Build\Scripts\setup_intel_compilers.bat

cd %CURDIR%

set HYPRE=..\..\..\hypre
set HYPRE=%FIREMODELS%\hypre

:: clone hypre repo (at same level as fds, smv etc repos) if it doesn't exist
if exist %HYPRE% goto endif1
Expand All @@ -45,7 +50,7 @@ echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo.

cd ..\..\..
cd %FIREMODELS%
git clone https://github.com/hypre-space/hypre.git
cd hypre
echo ----------------------------------------------------------
Expand All @@ -64,7 +69,7 @@ echo ----------------------------------------------------------
echo.
echo change HYPRE_FMANGLE line to #define HYPRE_FMANGLE 4
echo after saving file, press enter
notepad %CURDIR%\%HYPRE%\src\config\HYPRE_config.h.cmake.in
notepad %HYPRE%\src\config\HYPRE_config.h.cmake.in

pause
cd %CURDIR%
Expand All @@ -77,7 +82,7 @@ echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo.

cd %CURDIR%\%HYPRE%
cd %HYPRE%
set HYPRE=%CD%
git clean -dxf

Expand Down
Empty file added Build/Scripts/SUNDIALS/.gitignore
View file
Open in desktop
Empty file.
12 changes: 8 additions & 4 deletions Utilities/Scripts/build_sundials.bat → Build/Scripts/SUNDIALS/build_sundials.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@ call :is_file_installed gcc || set abort=1
if %abort% == 1 exit /b

set CURDIR=%CD%
set FIREMODELS=..\..\..\..
cd %FIREMODELS%
set FIREMODELS=%CD%
cd %CURDIR%

echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo setting up Intel compilers
echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo.
call ..\..\Build\Scripts\setup_intel_compilers.bat
call %FIREMODELS%\fds\Build\Scripts\setup_intel_compilers.bat

cd %CURDIR%

set LIBS=..\..\..\libs
set LIBS=%FIREMODELS%\libs
if not exist %LIBS% mkdir %LIBS%
if not exist %LIBS% echo failed to create LIBS directory
if not exist %LIBS% exit
Expand All @@ -35,7 +39,7 @@ set INSTALLDIR=%LIBS%\%INSTALLDIR%
cd %CURDIR%


set SUNDIALS=..\..\..\sundials
set SUNDIALS=%FIREMODELS%\sundials

:: clone sundials repo (at same level as fds, smv etc repos) if it doesn't exist
if exist %SUNDIALS% goto endif1
Expand All @@ -46,7 +50,7 @@ echo ----------------------------------------------------------
echo ----------------------------------------------------------
echo.

cd ..\..\..
cd %FIREMODELS%
git clone https://github.com/LLNL/sundials.git
cd sundials
echo ----------------------------------------------------------
Expand Down