Fixing installation of PETSC on Intel compiler

script/install_PETSC.sh

@@ -233,7 +233,7 @@ if [ x"$CXX" != x"icpc" ]; then
   if [ ! -d "$1/MUMPS" ]; then
     rm MUMPS_5.0.1.tar.gz
     rm -rf MUMPS_5.0.1
-    wget http://ppmcore.mpi-cbg.de/upload/MUMPS_5.0.1.tar.gz
+    wget http://openfpm.mpi-cbg.de/upload/MUMPS_5.0.1.tar.gz
     if [ $? -ne 0 ]; then
       echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m"
       exit 1
@@ -269,13 +269,13 @@ if [ x"$CXX" != x"icpc" ]; then
       cp -r lib $1/MUMPS
 
       MUMPS_extra_lib="-L$1/MUMPS/lib -ldmumps -lmumps_common -lpord -pthread "
-      configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include"
+      configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include/"
 
     fi
   else
     echo "MUMPS is already installed"
     MUMPS_extra_lib="-L$1/MUMPS/lib -ldmumps -lmumps_common -lpord -pthread "
-    configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include"
+    configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include/"
   fi
 fi
 
@@ -362,7 +362,7 @@ fi
 tar -xf petsc-lite-3.7.6.tar.gz
 cd petsc-3.7.6
 
-echo "./configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc --with-cxx-dialect=C++11 $petsc_openmp  --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib"  --prefix=$1/PETSC --with-debugging=0"
+echo "./configure CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc --with-cxx-dialect=C++11 $petsc_openmp  --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib"  --prefix=$1/PETSC --with-debugging=0"
 
 function haveProg() {
     [ -x "$(command -v $1)" ]
@@ -370,7 +370,7 @@ function haveProg() {
 
 
 
-$python_command ./configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc  --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib" --prefix=$1/PETSC --with-debugging=0
+$python_command ./configure CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc  --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib" --prefix=$1/PETSC --with-debugging=0
 make all test
 make install
 

script/show_solutions

@@ -30,7 +30,9 @@ function possible_solutions {
  if [ -a input_install ]; then
    eval ${commands[$possible_solutions_ret]} < input_install
  else
-   eval ${commands[$possible_solutions_ret]}
+   if [ x"${commands[$possible_solutions_ret]}" != "continue" -o x"${commands[$possible_solutions_ret]}" != "Accept" ]; then
+     eval ${commands[$possible_solutions_ret]}
+   if
  fi
  possible_solutions_command=${commands[$possible_solutions_ret]}
 }