diff --git a/README.md b/README.md index fb78dd0..81b60aa 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## What does this do? -Vagrant pulls an Ubuntu 20.04 "base box" and asks e.g. VirtualBox to start a virtual machine. +Vagrant pulls an Ubuntu 22.04 "base box" and asks e.g. VirtualBox to start a virtual machine. It then installs basic tools (such as a desktop environment), a preCICE release, several solvers and adapters, as well as example and tutorial files. diff --git a/Vagrantfile b/Vagrantfile index 275e6cd..a88cbda 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,7 @@ Vagrant.configure("2") do |config| # The generic/ images support virtualbox as well as libvirt and hyperv. # This allows us to create performance oriented images for Linux (libvirt) and Windows (hyperv). - config.vm.box = "generic/ubuntu2004" + config.vm.box = "generic/ubuntu2204" # We don't want the box to automatically update every time it starts. # We can instead handle updates internally, without destroying the machine. diff --git a/provisioning/install-basics.sh b/provisioning/install-basics.sh index 281d54c..c7005dc 100644 --- a/provisioning/install-basics.sh +++ b/provisioning/install-basics.sh @@ -18,7 +18,7 @@ sudo apt-get install -y thunar xfce4-terminal terminator bash-completion tree ev # echo "autologin-user=vagrant" | sudo tee --append /usr/share/lightdm/lightdm.conf.d/60-xubuntu.conf # Install the VirtualBox guest additions -sudo apt-get install -y virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11 +sudo apt-get install -y virtualbox-dkms virtualbox-guest-utils virtualbox-guest-x11 # Create Desktop mkdir -p ~/Desktop diff --git a/provisioning/install-calculix.sh b/provisioning/install-calculix.sh index 27a6204..51b6a1e 100644 --- a/provisioning/install-calculix.sh +++ b/provisioning/install-calculix.sh @@ -16,7 +16,7 @@ fi ( cd calculix-adapter git pull - make -j "$(nproc)" + make -j "$(nproc)" ADDITIONAL_FFLAGS="-fallow-argument-mismatch" # Since GCC 10 ) # Add the CalculiX adapter to PATH diff --git a/provisioning/install-dealii.sh b/provisioning/install-dealii.sh index c0efc13..f57a521 100644 --- a/provisioning/install-dealii.sh +++ b/provisioning/install-dealii.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -ex -# Install deal.II from the deal.II 9.3.0 backports PPA -sudo add-apt-repository ppa:ginggs/deal.ii-9.3.0-backports +# Install deal.II from the Ubuntu repositories. +# If the intended version is not available, see also the backports repository on the deal.II website. sudo apt-get update sudo apt-get install -y libdeal.ii-dev diff --git a/provisioning/install-precice.sh b/provisioning/install-precice.sh index af4c0ed..9648a00 100644 --- a/provisioning/install-precice.sh +++ b/provisioning/install-precice.sh @@ -5,10 +5,10 @@ set -ex sudo apt-get install -y cmake libeigen3-dev libxml2-dev libboost-all-dev petsc-dev python3-dev python3-numpy # Get preCICE from GitHub: -# - Always get the latest master, no need for versioning +# - Always get the latest main, no need for versioning # - Build in Debug mode, so that users can report bugs if [ ! -d "precice/" ]; then - git clone --depth=1 --branch master https://github.com/precice/precice.git + git clone --depth=1 --branch main https://github.com/precice/precice.git fi ( cd precice diff --git a/provisioning/post-install.sh b/provisioning/post-install.sh index 8bed9e7..dfce394 100644 --- a/provisioning/post-install.sh +++ b/provisioning/post-install.sh @@ -2,10 +2,11 @@ set -ex # Setup swak4Foam -( - cd "${HOME}/OpenFOAM/vagrant-v2112/platforms/linux64GccDPInt32Opt/" - tar -xzvf swak4Foam.tar.gz -) +# Disabled for now, as we don't have precompiled binaries for Ubuntu 22.04 yet. +# ( +# cd "${HOME}/OpenFOAM/vagrant-v2112/platforms/linux64GccDPInt32Opt/" +# tar -xzvf swak4Foam.tar.gz +# ) # Create a link to the default shared folder ln -sf /vagrant/ ~/Desktop/shared