Skip to content

Commit 8fce7c4

Browse files
committed
FDS Build: Add hypre and sundials tag version to a single variable
1 parent 6a04f32 commit 8fce7c4

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Build/Scripts/HYPRE/build_hypre.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
2+
HYPRE_LIB_TAG=v2.32.0
3+
24
CONFMAKE=$1
35
CLEAN_HYPRE=$2
46

@@ -30,9 +32,9 @@ echo "Checking for hypre repository..."
3032
if [ -d "$FIREMODELS/hypre" ]; then
3133
echo "Hypre repository exists. Building hypre library."
3234
cd $FIREMODELS/hypre
33-
if [[ "$(git tag -l "v2.32.0")" == "v2.32.0" ]]; then
34-
echo "Checking out v2.32.0"
35-
git checkout v2.32.0
35+
if [[ "$(git tag -l $HYPRE_LIB_TAG)" == $HYPRE_LIB_TAG ]]; then
36+
echo "Checking out $HYPRE_LIB_TAG"
37+
git checkout $HYPRE_LIB_TAG
3638
fi
3739
cd $FIREMODELS/hypre/src/cmbuild
3840
export HYPRE_VERSION=$(git describe)

Build/Scripts/SUNDIALS/build_sundials.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
2+
SUNDIALS_LIB_TAG=v6.7.0
3+
24
CONFMAKE=$1
35
CLEAN_SUNDIALS=$2
46

@@ -31,9 +33,9 @@ echo "Checking for sundials repository..."
3133
if [ -d "$FIREMODELS/sundials" ]; then
3234
echo "Sundials repository exists. Building sundials library."
3335
cd $FIREMODELS/sundials
34-
if [[ "$(git tag -l "v6.7.0")" == "v6.7.0" ]]; then
35-
echo "Checking out v6.7.0"
36-
git checkout v6.7.0
36+
if [[ "$(git tag -l $SUNDIALS_LIB_TAG)" == $SUNDIALS_LIB_TAG ]]; then
37+
echo "Checking out $SUNDIALS_LIB_TAG"
38+
git checkout $SUNDIALS_LIB_TAG
3739
fi
3840
mkdir $FIREMODELS/sundials/BUILDDIR
3941
cd $FIREMODELS/sundials/BUILDDIR

0 commit comments

Comments
 (0)