merge conflic

2024-05-06 17:08:09 +02:00
parent 59bd2f5a73
commit c9a88b1a46
19 changed files with 325 additions and 86 deletions
--- a/particle-track-and-trace/src/advection/EulerAdvectionKernel.h
+++ b/particle-track-and-trace/src/advection/EulerAdvectionKernel.h
@@ -3,6 +3,7 @@

 #include "AdvectionKernel.h"
 #include "UVGrid.h"
+#include <memory>

 /**
 * Implementation of AdvectionKernel.
--- a/particle-track-and-trace/src/advection/RK4AdvectionKernel.h
+++ b/particle-track-and-trace/src/advection/RK4AdvectionKernel.h
@@ -3,6 +3,7 @@

 #include "AdvectionKernel.h"
 #include "UVGrid.h"
+#include <memory>

 /**
 * Implementation of Advection kernel using RK4 integration