diff --git a/install b/install index 71e0f5437b532fea62e9f9ab201b5b0155ee5364..684e68713b22adc612392fa2f9b4f352c2d60e2f 100755 --- a/install +++ b/install @@ -401,17 +401,13 @@ else fi done - echo "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" - if [ x"$inst_lin_alg" == x"y" ]; then CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_EIGEN.sh $i_dir $ncore CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC - echo "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" ./script/install_blitz_algoim.sh $i_dir $ncore - configure_options=" $configure_options --with-blitz=$i_dir/BLITZ --with-algoim=$i_dir/ALGOIM " fi - ### collect PETSC configuration options + ### collect PETSC and ALGOIM configuration options conf_PETSC ./configure $options $configure_options "$configure_blas_option" diff --git a/script/conf_PETSC b/script/conf_PETSC index 4ba0a1489258d84ed2910e3f722f8cc9d6a0f88f..254657a5af8bb87ca13ee256b8863b6067327545 100755 --- a/script/conf_PETSC +++ b/script/conf_PETSC @@ -1,6 +1,6 @@ #! /bin/bash -function conf_PETSC() +function conf_PETSC_ALGOIM() { if [ -d "$i_dir/PETSC" ]; then configure_options="$configure_options --with-petsc=$i_dir/PETSC " @@ -24,5 +24,13 @@ function conf_PETSC() configure_options=" $configure_options --with-eigen=$i_dir/EIGEN " lin_alg_inc="$lin_alg_inc -I$i_dir/EIGEN" fi + if [ -d "$i_dir/ALGOIM" ]; then + configure_options=" $configure_options --with-algoim=$i_dir/ALGOIM " + lin_alg_inc="$lin_alg_inc -I$i_dir/ALGOIM" + fi + if [ -d "$i_dir/BLITZ" ]; then + configure_options=" $configure_options --with-blitz=$i_dir/BLITZ " + lin_alg_inc="$lin_alg_inc -I$i_dir/BLITZ" + fi }