From f4253f2e6ab3fe37f14bd76dde206ae75bb3f874 Mon Sep 17 00:00:00 2001 From: Max Luebke Date: Tue, 8 Feb 2022 11:22:18 +0100 Subject: [PATCH] Replace internal handling of vectors by Eigen library members --- src/BTCSDiffusion.cpp | 8 ++++++-- src/BTCSDiffusion.hpp | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/BTCSDiffusion.cpp b/src/BTCSDiffusion.cpp index 92855dc..870479c 100644 --- a/src/BTCSDiffusion.cpp +++ b/src/BTCSDiffusion.cpp @@ -2,6 +2,8 @@ #include +#include +#include #include #include #include @@ -68,7 +70,7 @@ void BTCSDiffusion::updateInternals() { bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0}); } -void BTCSDiffusion::simulate1D(std::vector &c, boundary_condition left, +void BTCSDiffusion::simulate1D(Eigen::Map &c, boundary_condition left, boundary_condition right, const std::vector &alpha, double dx, int size) { @@ -151,7 +153,9 @@ void BTCSDiffusion::setTimestep(double time_step) { void BTCSDiffusion::simulate(std::vector &c, const std::vector &alpha) { if (this->grid_dim == 1) { - simulate1D(c, bc[0], bc[grid_cells[0] + 1], alpha, this->deltas[0], + assert(c.size() == grid_cells[0]); + Eigen::Map c_in(c.data(), this->grid_cells[0]); + simulate1D(c_in, bc[0], bc[grid_cells[0] + 1], alpha, this->deltas[0], this->grid_cells[0]); } } diff --git a/src/BTCSDiffusion.hpp b/src/BTCSDiffusion.hpp index ea3473d..d44a407 100644 --- a/src/BTCSDiffusion.hpp +++ b/src/BTCSDiffusion.hpp @@ -2,6 +2,8 @@ #define BTCSDIFFUSION_H_ #include +#include +#include #include #include #include @@ -135,7 +137,7 @@ private: } boundary_condition; typedef Eigen::Triplet T; - void simulate1D(std::vector &c, boundary_condition left, + void simulate1D(Eigen::Map &c, boundary_condition left, boundary_condition right, const std::vector &alpha, double dx, int size); void simulate2D(std::vector &c);