platform ubuntu update

fixes typo in readme

updates readme

updates Ubuntu 20 platform notes; reorders packages; adds remark for v10 GNU Compilers

Update README.md

Co-authored-by: Timo Heister <timo.heister@gmail.com>
fixes typo

diff --git a/README.md b/README.md
index b0ed3a10d2a4619f05dcdcc41c251f3cf0bb6d3c..d93bdab1e7b267b967cede7bd6448fc3eca77c12 100644 (file)
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Follow the instructions on the screen
   ./candi.sh
 ```
 
-#### Install deal.II on ubuntu 18.04, 20.xx:
+#### Install deal.II on Ubuntu (16.04), 18.04, 20.xx:
 ```bash
   ./candi.sh
 ```
@@ -49,7 +49,8 @@ For a detailed instruction how to install WSL, the new WSL 2 and a recent
 Ubuntu distribution on Windows 10 you can follow the
 [Microsoft Documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 
-Within the ubuntu terminal application clone this repository and run candi
+Within the Ubuntu terminal application, upgrade Ubuntu first, then
+clone this repository and run candi
 
 ```bash
   sudo apt-get update

diff --git a/deal.II-toolchain/platforms/supported/ubuntu19.platform b/deal.II-toolchain/platforms/supported/ubuntu19.platform
deleted file mode 100644 (file)
index 3b8416d..0000000
--- a/deal.II-toolchain/platforms/supported/ubuntu19.platform
+++ /dev/null
@@ -1,18 +0,0 @@
-# ubuntu 19
-#
-# This build script assumes that you have several packages already
-# installed via ubuntu's apt-get using the following commands:
-#
-# > sudo apt-get install build-essential lsb-release wget \
-#   bc python automake autoconf gfortran \
-#   openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \
-#   libblas-dev liblapack-dev libblas3 liblapack3 \
-#   libsuitesparse-dev libtool libboost-all-dev zlib1g-dev
-#
-# Then run candi again.
-##
-
-#
-# Define the additional packages for this platform.
-#PACKAGES="once:cmake ${PACKAGES}"
-

diff --git a/deal.II-toolchain/platforms/supported/ubuntu20.platform b/deal.II-toolchain/platforms/supported/ubuntu20.platform
index 527b827d089a319b499f1ea8d5a3ec288c8b3f9a..b474e83fa118040751fedbed8779e8f170238aab 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu20.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu20.platform
@@ -1,19 +1,32 @@
-# ubuntu 20.04
+# Ubuntu 20.04
 #
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
-# > sudo apt-get install build-essential lsb-release wget \
-#   bc python automake autoconf gfortran \
-#   openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \
-#   libblas-dev liblapack-dev libblas3 liblapack3 \
-#   libsuitesparse-dev libtool libboost-all-dev zlib1g-dev \
-#   libgmp-dev
+# > sudo apt-get install lsb-release git subversion wget bc libgmp-dev \
+#   build-essential autoconf automake cmake libtool gfortran python \
+#   libboost-all-dev zlib1g-dev \
+#   openmpi-bin openmpi-common libopenmpi-dev \
+#   libblas3 libblas-dev liblapack3 liblapack-dev libsuitesparse-dev
 #
 # Then run candi again.
+#
+#
+# To use native compiler optimizations on Intel's 11th-Gen (TigerLake)
+# you may need to use the GNU Compiler collection Version 10 or newer.
+# To priorize v10 over the default v9, do
+#
+#   update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 \
+#   update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 20
+#
+#   update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 10 \
+#   update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 20
+#
+#   update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-9 10 \
+#   update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-10 20
+#
+# with super-user privileges and invoke an operating system update.
 ##
 
-#
 # Define the additional packages for this platform.
 #PACKAGES="once:cmake ${PACKAGES}"
-