diff --git a/install b/install index 88d0da947c9807f008ece653815ae1469c38e078..1fead2720cebbc5a276bf9967762d31bcb463cda 100755 --- a/install +++ b/install @@ -25,7 +25,7 @@ fi ## Check that your home is not empty if [ x"$HOME" == x"" ]; then - echo -e "Your $HOME folder is empty \033[91;5;1m FAILED \033[0m" + echo -e "Your \$HOME folder is empty \033[91;5;1m FAILED \033[0m" exit 1 fi diff --git a/script/install_PETSC.sh b/script/install_PETSC.sh index e1c6f453845abad7f10fe15292af7e3a1b524d6a..12079ff67f90b1f8e8299405ba9316b1d600f8b3 100755 --- a/script/install_PETSC.sh +++ b/script/install_PETSC.sh @@ -19,7 +19,7 @@ source script/solve_python discover_os function test_configure_options() { - cd petsc-3.14.2 + cd petsc-3.14.5 $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_options2 --with-debugging=0 error=$? cd .. @@ -49,14 +49,14 @@ fi #### Download and uncompress petsc -rm petsc-lite-3.14.2.tar.gz -rm -rf petsc-3.14.2 -wget http://ppmcore.mpi-cbg.de/upload/petsc-lite-3.14.2.tar.gz +rm petsc-lite-3.14.5.tar.gz +rm -rf petsc-3.14.5 +wget http://ppmcore.mpi-cbg.de/upload/petsc-lite-3.14.5.tar.gz if [ $? -ne 0 ]; then echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" exit 1 fi -tar -xf petsc-lite-3.14.2.tar.gz +tar -xf petsc-lite-3.14.5.tar.gz #### @@ -143,15 +143,15 @@ if [ $error -eq 0 ]; then fi -rm petsc-lite-3.14.2.tar.gz -rm -rf petsc-3.14.2 -wget http://ppmcore.mpi-cbg.de/upload/petsc-lite-3.14.2.tar.gz +rm petsc-lite-3.14.5.tar.gz +rm -rf petsc-3.14.5 +wget http://ppmcore.mpi-cbg.de/upload/petsc-lite-3.14.5.tar.gz if [ $? -ne 0 ]; then echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" exit 1 fi -tar -xf petsc-lite-3.14.2.tar.gz -cd petsc-3.14.2 +tar -xf petsc-lite-3.14.5.tar.gz +cd petsc-3.14.5 if [ x"$CXX" != x"icpc" ]; then @@ -186,7 +186,7 @@ if [ ! "$(ls -A $1/PETSC)" ]; then rm -rf $1/PETSC else #Mark the installation - echo 5 > $1/PETSC/version + echo 6 > $1/PETSC/version exit 0 fi diff --git a/script/remove_old b/script/remove_old index 4d678f9c4eb9d529aefac9282d4953672ea6b54c..f28d8244d03a456302f38071f8aeecb756179ca9 100755 --- a/script/remove_old +++ b/script/remove_old @@ -143,9 +143,9 @@ function remove_old() if [ -d $1/PETSC ]; then version=$(cat $1/PETSC/version) - if [ x"$version" != x"5" ]; then + if [ x"$version" != x"6" ]; then echo -e "\033[1;34;5m -------------------------------------------------------------------------------------- \033[0m" - echo -e "\033[1;34;5m PETSC has been updated to version 3.14.2, the component will be updated automatically \033[0m" + echo -e "\033[1;34;5m PETSC has been updated to version 3.14.5, the component will be updated automatically \033[0m" echo -e "\033[1;34;5m -------------------------------------------------------------------------------------- \033[0m" sleep 5 rm -rf $1/PETSC