Commit 408a730f authored by incardon's avatar incardon

Eliminating warning

parent b37af1cd
......@@ -163,11 +163,6 @@ if [ ! -d "$i_dir/PETSC" -o ! -d "$i_dir/EIGEN" ]; then
else
inst_lin_alg = n
fi
# if [ ! x"$choose" == x"0" ]; then
# ./script/install_PETSC.sh $i_dir $choose
# configure_options="$configure_options --with-PETSC=$i_dir/PETSC "
# fi
fi
lin_alg_dir=""
......@@ -301,7 +296,7 @@ else
if [ x"$inst_lin_alg" == x"y" ]; then
./script/install_EIGEN.sh $i_dir $ncore
./script/install_PETSC.sh $i_dir $ncore
./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC
fi
### collect PETSC configuration options
......
......@@ -161,9 +161,19 @@ function detect_compiler()
commands[0]="icpc"
commands[1]="g++"
possible_solutions "${commands[@]}"
dgc_compiler=$possible_solutions_command
if [ x"$possible_solutions_command" == x"icpc" ]; then
CXX=icpc
CC=icc
F77=ifort
FC=ifort
dgc_compiler=icpc
else
CXX=g++
CC=gcc
F77=gfortran
FC=gfortran
fi
dgc_ret=1
CXX=$dgc_compiler
fi
}
......
......@@ -2,6 +2,11 @@
# check if the directory $1/PETSC exist
CXX=$3
CC=$4
F77=$5
FC=$6
if [ -d "$1/PETSC" ]; then
echo "PETSC already installed"
exit 0
......@@ -9,9 +14,7 @@ fi
# Detect gcc pr clang
source script/detect_gcc
source script/discover_os
detect_compiler g++
discover_os
##### if we are on osx we use gsed
......
......@@ -5,7 +5,7 @@ function set_mpi()
if [ x"$MPI_valid" == x"yes" ]; then
configure_options="$configure_options CXX=mpic++ "
else
./script/install_MPI.sh $1 $2 CC=$3 CXX=$4 F77=$5 FC=$6
./script/install_MPI.sh $1 $2 $3 $4 $5 $6
MPI_installed=1
export PATH="$1/MPI/bin:$PATH"
configure_options="$configure_options CXX=mpic++ "
......
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