Commit 2d2b58dc authored by Thomas Fetzer's avatar Thomas Fetzer

[installexternal.sh] Fix download path for UG

* Automatically set the UG path in the *.opts files.
* Remove gstat from *.opts file. Is found automatically, if located in external folder.
parent 530369ef
......@@ -337,24 +337,20 @@ installUG()
{
cd $EXTDIR
if [ ! -e ug-3.12.1.tar.gz ]; then
wget http://conan.iwr.uni-heidelberg.de/download/ug-3.12.1.tar.gz
UG_VERSION="3.12.1"
if [ ! -e ug-$UG_VERSION ]; then
git clone -b v$UG_VERSION https://gitlab.dune-project.org/staging/dune-uggrid.git ug-$UG_VERSION
fi
if test "$DOWNLOAD_ONLY" == "y"; then
return
fi
UG_VERSION="3.12.1"
if test "$CLEANUP" == "y"; then
rm -rf ug-$UG_VERSION
return
fi
if ! test -e "ug-$UG_VERSION"; then
tar zxvf ug-$UG_VERSION.tar.gz
fi
# Apply patch for the parallel use of UG
cd $TOPDIR/dune-grid
DUNE_GRID_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
......@@ -388,6 +384,7 @@ installUG()
make
make install
sed -i "s#-DUG_DIR=.*#-DUG_DIR=$EXTDIR/ug-$UG_VERSION \\\\#g" $TOPDIR/dumux/*.opts
cd $TOPDIR
}
......
......@@ -19,12 +19,10 @@ GXX_OPTS=" \
# configure flags
CMAKE_FLAGS="\
-DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
-DUG_DIR=ug_installation_path \
"
# optional configure flags
# for the CO2 and CO2ni tests enable the experimental grid extension
# and make sure the module dune-alugrid is present
# -DDUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS=TRUE \
# for using gstat
# -DGSTAT_ROOT=gstat_installation_path \
......@@ -22,12 +22,10 @@ GXX_OPTS=" \
# configure flags
CMAKE_FLAGS=" \
-DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
-DUG_DIR=ug_installation_path \
"
# optional configure flags
# for the CO2 and CO2ni tests enable the experimental grid extension
# and make sure the module dune-alugrid is present
# -DDUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS=TRUE \
# for using gstat
# -DGSTAT_ROOT=gstat_installation_path \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment