Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion provisioning/install-basics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion provisioning/install-calculix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions provisioning/install-dealii.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions provisioning/install-precice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions provisioning/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down