Skip to content

FDS Build: Add hypre and sundials tag version to a single variable #13703

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

Merged
rmcdermo merged 1 commit into from
Nov 6, 2024
Merged

FDS Build: Add hypre and sundials tag version to a single variable #13703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions Build/Scripts/HYPRE/build_hypre.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
HYPRE_LIB_TAG=v2.32.0

CONFMAKE=$1
CLEAN_HYPRE=$2

Expand Down Expand Up @@ -30,9 +32,9 @@ echo "Checking for hypre repository..."
if [ -d "$FIREMODELS/hypre" ]; then
echo "Hypre repository exists. Building hypre library."
cd $FIREMODELS/hypre
if [[ "$(git tag -l "v2.32.0")" == "v2.32.0" ]]; then
echo "Checking out v2.32.0"
git checkout v2.32.0
if [[ "$(git tag -l $HYPRE_LIB_TAG)" == $HYPRE_LIB_TAG ]]; then
echo "Checking out $HYPRE_LIB_TAG"
git checkout $HYPRE_LIB_TAG
fi
cd $FIREMODELS/hypre/src/cmbuild
export HYPRE_VERSION=$(git describe)
Expand Down
8 changes: 5 additions & 3 deletions Build/Scripts/SUNDIALS/build_sundials.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
SUNDIALS_LIB_TAG=v6.7.0

CONFMAKE=$1
CLEAN_SUNDIALS=$2

Expand Down Expand Up @@ -31,9 +33,9 @@ echo "Checking for sundials repository..."
if [ -d "$FIREMODELS/sundials" ]; then
echo "Sundials repository exists. Building sundials library."
cd $FIREMODELS/sundials
if [[ "$(git tag -l "v6.7.0")" == "v6.7.0" ]]; then
echo "Checking out v6.7.0"
git checkout v6.7.0
if [[ "$(git tag -l $SUNDIALS_LIB_TAG)" == $SUNDIALS_LIB_TAG ]]; then
echo "Checking out $SUNDIALS_LIB_TAG"
git checkout $SUNDIALS_LIB_TAG
fi
mkdir $FIREMODELS/sundials/BUILDDIR
cd $FIREMODELS/sundials/BUILDDIR
Expand Down