Fixing MPI installation for mirror

install

@@ -338,7 +338,7 @@ else
                 echo "Error the installation of MPI failed"
                 exit 1
             fi
-            ./script/install_MPI.sh $i_dir $ncore $gpu_support $CC $CXX $F77 $FC
+            ./script/install_MPI.sh $i_dir $ncore $gpu_support $CC $CXX $F77 $FC "$openmpi_working_options"
             MPI_installed=1
             export PATH="$i_dir/MPI/bin:$PATH"
             configure_options="$configure_options CXX=mpic++ "

script/install_MPI.sh

@@ -25,10 +25,10 @@ fi
 
 if [ x"$3" == x"1" ]; then
    echo "Installing MPI with GPU support"
-   ./configure --with-cuda --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7
+   ./configure --with-cuda --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
 else
    echo "Installing MPI without GPU support"
-   ./configure --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7
+   ./configure --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
 fi
 make -j $2
 make install

script/pre_req

@@ -198,12 +198,12 @@ if haveProg mpirun; then
 		commands[2]="Continue with the detected one"
   		possible_solutions_no_execute "${commands[@]}"
 
+		# Remove old MPI
+		rm -rf $i_dir/MPI
+
 		if [ x"$possible_solutions_ret" == x"0" ]; then
 			get_openmpi_compilation_options
 			test_working_mpi_options
-			./script/install_MPI.sh $i_dir $ncore $gpu_support $CC $CXX $F77 $FC '"$openmpi_working_options"'
-		elif [ x"$possible_solutions_ret" == x"1" ]; then
-			./script/install_MPI.sh $i_dir $ncore $gpu_support $CC $CXX $F77 $FC 
 		fi
 	else
 		echo "OpenMPI is CUDA aware"

script/set_mpi

@@ -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 $3 $4 $5 $6 $7
+        ./script/install_MPI.sh $1 $2 $3 $4 $5 $6 $7 "$openmpi_working_options"
         MPI_installed=1
         export PATH="$1/MPI/bin:$PATH"
         configure_options="$configure_options CXX=mpic++ "