max/TugJulia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented first step of 2D ADI-BTCSDiffusion

Browse Source 
- defined important matrices + vectors as row-major matrices
This commit is contained in:
Max Luebke 2022-02-11 13:43:53 +01:00
parent cda16b7744
commit 05d3cfdc3c
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/BTCSDiffusion.cpp
View File

@ -74,7 +74,7 @@ void BTCSDiffusion::updateInternals() {
bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0}); bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0});
} }
void BTCSDiffusion::simulate1D(Eigen::Map<Eigen::VectorXd> &c, void BTCSDiffusion::simulate1D(Eigen::Map<DVectorRowMajor> &c,
boundary_condition left, boundary_condition left,
boundary_condition right, boundary_condition right,
const std::vector<double> &alpha, double dx, const std::vector<double> &alpha, double dx,
@ -142,8 +142,10 @@ void BTCSDiffusion::simulate1D(Eigen::Map<Eigen::VectorXd> &c,
c = x_vector.segment(!left_is_constant, c.size()); c = x_vector.segment(!left_is_constant, c.size());
} }
void BTCSDiffusion::simulate2D(Eigen::Map<Eigen::MatrixXd> &c, void BTCSDiffusion::simulate2D(Eigen::Map<DMatrixRowMajor> &c,
Eigen::Map<const Eigen::MatrixXd> &alpha) { Eigen::Map<const DMatrixRowMajor> &alpha) {
DMatrixRowMajor tmp_vector = x_vector;
int n_cols = c.cols(); int n_cols = c.cols();
unsigned int size = (this->grid_cells[0] + 2) * (this->grid_cells[1]); unsigned int size = (this->grid_cells[0] + 2) * (this->grid_cells[1]);
@ -167,25 +169,15 @@ void BTCSDiffusion::simulate2D(Eigen::Map<Eigen::MatrixXd> &c,
solveLES(); solveLES();
Eigen::MatrixXd test = x_vector; tmp_vector.transposeInPlace();
tmp_vector.conservativeResize(c.rows(), c.cols() + 2);
std::cout << test << std::endl; Eigen::Map<Eigen::MatrixXd> tmp(tmp_vector.data(), c.rows(), c.cols() + 2);
test.transposeInPlace(); c = tmp_vector.block(0, 1, c.rows(), c.cols());
test.conservativeResize(c.rows(), c.cols() + 2);
std::cout << test << std::endl;
Eigen::Map<Eigen::MatrixXd> tmp(test.data(), c.rows(), c.cols() +2);
std::cout << x_vector << std::endl;
std::cout << tmp << std::endl;
c = tmp.block(0, 1, c.rows(), c.cols());
} }
void BTCSDiffusion::fillMatrixFromRow(const Eigen::VectorXd &alpha, int n_cols, void BTCSDiffusion::fillMatrixFromRow(const DVectorRowMajor &alpha, int n_cols,
int row, bool left_constant, int row, bool left_constant,
bool right_constant, double delta, bool right_constant, double delta,
double time_step) { double time_step) {
@ -198,8 +190,7 @@ void BTCSDiffusion::fillMatrixFromRow(const Eigen::VectorXd &alpha, int n_cols,
if (left_constant) if (left_constant)
A_matrix.insert(offset + 1, offset + 1) = 1; A_matrix.insert(offset + 1, offset + 1) = 1;
A_matrix.insert(offset + (n_cols - 1), offset + (n_cols - 1)) = A_matrix.insert(offset + (n_cols - 1), offset + (n_cols - 1)) = 1;
1;
if (right_constant) if (right_constant)
A_matrix.insert(offset + (n_cols - 2), offset + (n_cols - 2)) = 1; A_matrix.insert(offset + (n_cols - 2), offset + (n_cols - 2)) = 1;
@ -218,7 +209,7 @@ void BTCSDiffusion::fillMatrixFromRow(const Eigen::VectorXd &alpha, int n_cols,
} }
} }
void BTCSDiffusion::fillVectorFromRow2D(Eigen::Map<Eigen::MatrixXd> &c, void BTCSDiffusion::fillVectorFromRow2D(Eigen::Map<DMatrixRowMajor> &c,
const Eigen::VectorXd alpha, int row, const Eigen::VectorXd alpha, int row,
double delta, boundary_condition left, double delta, boundary_condition left,
boundary_condition right) { boundary_condition right) {
@ -270,16 +261,16 @@ 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) {
assert(c.size() == grid_cells[0]); assert(c.size() == grid_cells[0]);
Eigen::Map<Eigen::VectorXd> c_in(c.data(), this->grid_cells[0]); Eigen::Map<DVectorRowMajor> c_in(c.data(), this->grid_cells[0]);
simulate1D(c_in, bc[0], bc[grid_cells[0] + 1], alpha, this->deltas[0], simulate1D(c_in, bc[0], bc[grid_cells[0] + 1], alpha, this->deltas[0],
this->grid_cells[0]); this->grid_cells[0]);
} }
if (this->grid_dim == 2) { if (this->grid_dim == 2) {
assert(c.size() == grid_cells[0] * grid_cells[1]); assert(c.size() == grid_cells[0] * grid_cells[1]);
Eigen::Map<Eigen::MatrixXd> c_in(c.data(), this->grid_cells[1], Eigen::Map<DMatrixRowMajor> c_in(c.data(), this->grid_cells[1],
this->grid_cells[0]); this->grid_cells[0]);
Eigen::Map<const Eigen::MatrixXd> alpha_in( Eigen::Map<const DMatrixRowMajor> alpha_in(
alpha.data(), this->grid_cells[1], this->grid_cells[0]); alpha.data(), this->grid_cells[1], this->grid_cells[0]);
simulate2D(c_in, alpha_in); simulate2D(c_in, alpha_in);

20
src/BTCSDiffusion.hpp
View File

@ -4,6 +4,7 @@
#include <Eigen/Sparse> #include <Eigen/Sparse>
#include <Eigen/src/Core/Map.h> #include <Eigen/src/Core/Map.h>
#include <Eigen/src/Core/Matrix.h> #include <Eigen/src/Core/Matrix.h>
#include <Eigen/src/Core/util/Constants.h>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@ -137,16 +138,21 @@ private:
} boundary_condition; } boundary_condition;
typedef Eigen::Triplet<double> T; typedef Eigen::Triplet<double> T;
void simulate1D(Eigen::Map<Eigen::VectorXd> &c, boundary_condition left, typedef Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>
DMatrixRowMajor;
typedef Eigen::Matrix<double, 1, Eigen::Dynamic, Eigen::RowMajor>
DVectorRowMajor;
void simulate1D(Eigen::Map<DVectorRowMajor> &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(Eigen::Map<Eigen::MatrixXd> &c, void simulate2D(Eigen::Map<DMatrixRowMajor> &c,
Eigen::Map<const Eigen::MatrixXd> &alpha); Eigen::Map<const DMatrixRowMajor> &alpha);
inline void fillMatrixFromRow(const Eigen::VectorXd &alpha, int n_cols, int row, void fillMatrixFromRow(const DVectorRowMajor &alpha, int n_cols, int row,
bool left_constant, bool right_constant, bool left_constant, bool right_constant, double delta,
double delta, double time_step); double time_step);
void fillVectorFromRow2D(Eigen::Map<Eigen::MatrixXd> &c, void fillVectorFromRow2D(Eigen::Map<DMatrixRowMajor> &c,
const Eigen::VectorXd alpha, int row, double delta, const Eigen::VectorXd alpha, int row, double delta,
boundary_condition left, boundary_condition right); boundary_condition left, boundary_condition right);
void simulate3D(std::vector<double> &c); void simulate3D(std::vector<double> &c);