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/main.cpp
+++ b/particle-track-and-trace/src/main.cpp
@@ -21,8 +21,10 @@ using namespace std;
 #define DT 60 * 60 // 60 sec/min * 60 mins

 int main() {
+  cout << "reading data..." << endl;
  shared_ptr<UVGrid> uvGrid = std::make_shared<UVGrid>();
  auto kernelRK4 = make_unique<RK4AdvectionKernel>(uvGrid);
+  cout << "Starting vtk..." << endl;

  auto l = new LGlyphLayer(uvGrid, std::move(kernelRK4));