From 53c3dc51f562cdc028d5a2de3328036b32c0a8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20L=C3=BCbke?= Date: Fri, 30 Aug 2024 10:28:36 +0200 Subject: [PATCH] chore: Update tug library to latest version --- src/run.cpp | 10 +++++++--- src/run.hpp | 3 --- tug | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/run.cpp b/src/run.cpp index 17c399f..2f4c41c 100644 --- a/src/run.cpp +++ b/src/run.cpp @@ -2,6 +2,7 @@ #include "io.hpp" #include "tug/Boundary.hpp" +#include "tug/Core/Matrix.hpp" #include "tug/Grid.hpp" #include @@ -22,15 +23,18 @@ double run_bench(const bench_input &input, const std::string &output_file) { std::vector raw_alpha_x = read_alpha_csv(input.csv_alpha_x); std::vector raw_alpha_y = read_alpha_csv(input.csv_alpha_y); - Eigen::Map alpha_x(raw_alpha_x.data(), input.nrows, input.ncols); - Eigen::Map alpha_y(raw_alpha_y.data(), input.nrows, input.ncols); + tug::RowMajMatMap alpha_x(raw_alpha_x.data(), input.nrows, + input.ncols); + tug::RowMajMatMap alpha_y(raw_alpha_y.data(), input.nrows, + input.ncols); const auto start_t = std::chrono::high_resolution_clock::now(); // create tug grids and boundary conditions for (int i = 0; i < raw_data.size(); i++) { - Eigen::Map mat(raw_data[i].data(), input.nrows, input.ncols); + tug::RowMajMatMap mat(raw_data[i].data(), input.nrows, + input.ncols); tug::Grid grid(input.nrows, input.ncols); grid.setConcentrations(mat); diff --git a/src/run.hpp b/src/run.hpp index d6b6425..56423d6 100644 --- a/src/run.hpp +++ b/src/run.hpp @@ -6,9 +6,6 @@ using TugType = double; -using RowMajorMat = - Eigen::Matrix; - double run_bench(const bench_input &input, const std::string &output_file = ""); static inline std::vector diff --git a/tug b/tug index 4867261..ac693ca 160000 --- a/tug +++ b/tug @@ -1 +1 @@ -Subproject commit 4867261f9d902ea2be161889a968d3bff519f15c +Subproject commit ac693caea9d2b016ae2303db1f467afaf733f717