Commit c8135cc4 authored by Mark Olesen's avatar Mark Olesen

CONFIG: update download links for adios + kahip

parent adfe2833
...@@ -485,8 +485,8 @@ that clang compiler for building the newer llvm/clang version. ...@@ -485,8 +485,8 @@ that clang compiler for building the newer llvm/clang version.
<!-- parallel --> <!-- parallel -->
[page adios]: https://www.olcf.ornl.gov/center-projects/adios/ [page adios]: https://www.olcf.ornl.gov/center-projects/adios/
[repo adios]: https://github.com/ornladios/ADIOS [repo adios]: https://github.com/ornladios/ADIOS
[link adios]: https://github.com/ornladios/ADIOS/archive/v1.13.0.tar.gz [link adios]: https://github.com/ornladios/ADIOS/archive/v1.13.1.tar.gz
[altlink adios]: http://users.nccs.gov/%7Epnorbert/adios-1.13.0.tar.gz [altlink adios]: http://users.nccs.gov/~pnorbert/adios-1.13.1.tar.gz
[page zfp]: http://computation.llnl.gov/projects/floating-point-compression/zfp-versions [page zfp]: http://computation.llnl.gov/projects/floating-point-compression/zfp-versions
[page scotch]: https://www.labri.fr/perso/pelegrin/scotch/ [page scotch]: https://www.labri.fr/perso/pelegrin/scotch/
...@@ -495,7 +495,7 @@ that clang compiler for building the newer llvm/clang version. ...@@ -495,7 +495,7 @@ that clang compiler for building the newer llvm/clang version.
[link scotch]: https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz [link scotch]: https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
[page kahip]: http://algo2.iti.kit.edu/documents/kahip/ [page kahip]: http://algo2.iti.kit.edu/documents/kahip/
[link kahip]: http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz [link kahip]: http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.10.tar.gz
[page metis]: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview [page metis]: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
[link metis]: http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz [link metis]: http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
......
...@@ -97,6 +97,18 @@ fi ...@@ -97,6 +97,18 @@ fi
ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE
ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE
# Some hacked in value, for binding in ADIOS1 as well (for the reader)
# Don't know if this is still needed
if [ -n "$ADIOS1_ARCH_PATH" ]
then
ADIOS1_ARCH_PATH=$installBASE/ADIOS-1.13.0
fi
if [ -d "$ADIOS1_ARCH_PATH" ]
then
export ADIOS1_ROOT="$ADIOS1_ARCH_PATH"
fi
: ${FOAM_MPI:=dummy} : ${FOAM_MPI:=dummy}
echo echo
...@@ -139,16 +151,13 @@ else ...@@ -139,16 +151,13 @@ else
CXX=mpicxx CXX=mpicxx
fi fi
# HACK
export ADIOS1_ROOT=/local/home/mark/openfoam/ThirdParty-plus/platforms/linux64Gcc/ADIOS-1.12.0
cmake=$(findCMake) cmake=$(findCMake)
# Install into lib64/ # Install into lib64/
cd $buildDIR && $cmake \ cd $buildDIR && $cmake \
-DCMAKE_INSTALL_PREFIX=$ADIOS2_ARCH_PATH \ -DCMAKE_INSTALL_PREFIX=$ADIOS2_ARCH_PATH \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_FORTRAN=FALSE \ -DADIOS2_USE_Fortran=FALSE \
-DADIOS1_USE_STATIC_LIBS=TRUE \ -DADIOS1_USE_STATIC_LIBS=TRUE \
${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \ ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
$ADIOS2_SOURCE_DIR \ $ADIOS2_SOURCE_DIR \
......
...@@ -98,7 +98,7 @@ do ...@@ -98,7 +98,7 @@ do
targetType="$1" targetType="$1"
;; ;;
kahip-[1-9]* | kahip-git) kahip-[1-9]* | kahip-git | KaHIP_* | KaHIP-[1-9]*)
kahipPACKAGE="${1%%/}" kahipPACKAGE="${1%%/}"
unset KAHIP_ARCH_PATH # Avoid inconsistency unset KAHIP_ARCH_PATH # Avoid inconsistency
;; ;;
......
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