From 9b772ef6bb85433848c911f8f5700f0a40412e31 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 11:05:55 +0100
Subject: [PATCH 1/6] automake is missing on the ubuntu 24.04 image

---
 .github/workflows/ls1_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ls1_test.yml b/.github/workflows/ls1_test.yml
index 44b0c21932..a4efb978a1 100644
--- a/.github/workflows/ls1_test.yml
+++ b/.github/workflows/ls1_test.yml
@@ -57,6 +57,7 @@ jobs:
         sudo apt-get update
         # MPICH 4.0.3 seems to have a bug that triggers a FP exception in our collective communication when doing 0+0.
         sudo apt-get install -y \
+          automake              \
           libcppunit-dev        \
           libopenmpi-dev        \
           libomp-dev            \

From 0a3ab85dc0e25d27c28249a126de6e76f0556400 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 11:14:26 +0100
Subject: [PATCH 2/6] link to AutoPas dependencies

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 88bf3beef2..ac8f414f45 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Prerequisites
 * [FFTW3](http://www.fftw.org)
 * [VTK](http://www.vtk.org)
 * [QuickSched](https://arxiv.org/abs/1601.05384)
-
+* If [AutoPas](https://autopas.github.io/doxygen_documentation/git-master/) is enabled, make sure to have [its requirements](https://github.com/AutoPas/AutoPas/blob/master/docs/userdoc/Building.md) installed.
 
 Installation
 ------------

From 00f74ff0bff95eedacc2b2364f93512f0c2ffaf8 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 11:44:42 +0100
Subject: [PATCH 3/6] bump AutoPas version

---
 cmake/modules/autopas.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/autopas.cmake b/cmake/modules/autopas.cmake
index 99a02230fc..91545150fc 100644
--- a/cmake/modules/autopas.cmake
+++ b/cmake/modules/autopas.cmake
@@ -23,8 +23,8 @@ if (ENABLE_AUTOPAS)
     set(AUTOPAS_USE_VECTORIZATION ${USE_VECTORIZATION} CACHE BOOL "Set via USE_VECTORIZATION" FORCE)
     set(AUTOPAS_VECTOR_INSTRUCTIONS ${VECTOR_INSTRUCTIONS} CACHE STRING "Set via VECTOR_INSTRUCTIONS_OPTIONS" FORCE)
 
-    # Merge of #830 (fixRegionIterators); includes #787 (combined tuning)
-    set(AUTOPAS_TAG faef573 CACHE STRING "AutoPas Git tag or commit id to use")
+    # Last version without 3 Body support. Newer versions have API changes
+    set(AUTOPAS_TAG v2.0.0 CACHE STRING "AutoPas Git tag or commit id to use")
 
     FetchContent_Declare(
             autopasfetch

From fc7f8ed5caf0313a45da8b92a97f270e2e9019f0 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 11:54:09 +0100
Subject: [PATCH 4/6] use system uuid instead of bundled

---
 .github/workflows/ls1_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ls1_test.yml b/.github/workflows/ls1_test.yml
index a4efb978a1..43a70e3adb 100644
--- a/.github/workflows/ls1_test.yml
+++ b/.github/workflows/ls1_test.yml
@@ -57,7 +57,7 @@ jobs:
         sudo apt-get update
         # MPICH 4.0.3 seems to have a bug that triggers a FP exception in our collective communication when doing 0+0.
         sudo apt-get install -y \
-          automake              \
+          uuid                  \
           libcppunit-dev        \
           libopenmpi-dev        \
           libomp-dev            \

From 8bffc769788afa259606ed508ea259a0b86f1710 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 11:56:18 +0100
Subject: [PATCH 5/6] always enable advanced tuning

  If AutoPas is disabled this option does nothing
---
 .github/workflows/ls1_test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ls1_test.yml b/.github/workflows/ls1_test.yml
index 43a70e3adb..7cea49b6aa 100644
--- a/.github/workflows/ls1_test.yml
+++ b/.github/workflows/ls1_test.yml
@@ -87,6 +87,7 @@ jobs:
           cmake -DVECTOR_INSTRUCTIONS=${{ matrix.vector }} \
                 -DCMAKE_BUILD_TYPE=${{ matrix.target }} \
                 -DENABLE_AUTOPAS=${{ matrix.autopas }} \
+                -DAUTOPAS_ENABLE_RULES_BASED_AND_FUZZY_TUNING=ON \
                 -DENABLE_ALLLBL=$alllbl_enabled \
                 -DOPENMP=${{ matrix.openmp }} \
                 -DENABLE_MPI=$mpi_enabled \
@@ -149,6 +150,7 @@ jobs:
           cmake -DVECTOR_INSTRUCTIONS=${{ matrix.vector }} \
                 -DCMAKE_BUILD_TYPE=${{ matrix.target }} \
                 -DENABLE_AUTOPAS=${{ matrix.autopas }} \
+                -DAUTOPAS_ENABLE_RULES_BASED_AND_FUZZY_TUNING=ON \
                 -DENABLE_ALLLBL=$alllbl_enabled \
                 -DOPENMP=${{ matrix.openmp }} \
                 -DENABLE_MPI=$mpi_enabled \

From d92c623b3e0aec205bfebce5ad5547efaf3eb193 Mon Sep 17 00:00:00 2001
From: FG-TUM <f.gratl@tum.de>
Date: Wed, 18 Dec 2024 12:56:09 +0100
Subject: [PATCH 6/6] fix wrong package

---
 .github/workflows/ls1_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ls1_test.yml b/.github/workflows/ls1_test.yml
index 7cea49b6aa..dd3dc86e53 100644
--- a/.github/workflows/ls1_test.yml
+++ b/.github/workflows/ls1_test.yml
@@ -57,7 +57,7 @@ jobs:
         sudo apt-get update
         # MPICH 4.0.3 seems to have a bug that triggers a FP exception in our collective communication when doing 0+0.
         sudo apt-get install -y \
-          uuid                  \
+          uuid-dev              \
           libcppunit-dev        \
           libopenmpi-dev        \
           libomp-dev            \