max/tug
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/tug.git synced 2025-12-14 01:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace internal handling of vectors by Eigen library members

Browse Source
This commit is contained in:
Max Luebke 2022-02-08 11:22:18 +01:00
parent 83d11d44e1
commit f4253f2e6a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BTCSDiffusion.cpp
View File

@ -2,6 +2,8 @@
#include <Eigen/SparseLU> #include <Eigen/SparseLU>
#include <Eigen/src/Core/Map.h>
#include <Eigen/src/Core/Matrix.h>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <iomanip> #include <iomanip>
@ -68,7 +70,7 @@ void BTCSDiffusion::updateInternals() {
bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0}); bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0});
} }
void BTCSDiffusion::simulate1D(std::vector<double> &c, boundary_condition left, void BTCSDiffusion::simulate1D(Eigen::Map<Eigen::VectorXd> &c, boundary_condition left,
boundary_condition right, boundary_condition right,
const std::vector<double> &alpha, double dx, const std::vector<double> &alpha, double dx,
int size) { int size) {
@ -151,7 +153,9 @@ void BTCSDiffusion::setTimestep(double time_step) {
void BTCSDiffusion::simulate(std::vector<double> &c, void BTCSDiffusion::simulate(std::vector<double> &c,
const std::vector<double> &alpha) { const std::vector<double> &alpha) {
if (this->grid_dim == 1) { 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<Eigen::VectorXd> 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]); this->grid_cells[0]);
} }
} }

4
src/BTCSDiffusion.hpp
View File

@ -2,6 +2,8 @@
#define BTCSDIFFUSION_H_ #define BTCSDIFFUSION_H_
#include <Eigen/Sparse> #include <Eigen/Sparse>
#include <Eigen/src/Core/Map.h>
#include <Eigen/src/Core/Matrix.h>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@ -135,7 +137,7 @@ private:
} boundary_condition; } boundary_condition;
typedef Eigen::Triplet<double> T; typedef Eigen::Triplet<double> T;
void simulate1D(std::vector<double> &c, boundary_condition left, void simulate1D(Eigen::Map<Eigen::VectorXd> &c, boundary_condition left,
boundary_condition right, const std::vector<double> &alpha, boundary_condition right, const std::vector<double> &alpha,
double dx, int size); double dx, int size);
void simulate2D(std::vector<double> &c); void simulate2D(std::vector<double> &c);