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

Use Eigen::Matrix for internal BC representation

Browse Source
This commit is contained in:
Max Luebke 2022-02-14 16:46:49 +01:00
parent 08dba0975b
commit e1a08ea555
4 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/BTCSDiffusion.cpp
View File

@ -14,9 +14,9 @@
#include <iostream> #include <iostream>
const int BTCSDiffusion::BC_CONSTANT = 0; const int BTCSDiffusion::BC_CLOSED = 0;
const int BTCSDiffusion::BC_CLOSED = 1; const int BTCSDiffusion::BC_FLUX = 1;
const int BTCSDiffusion::BC_FLUX = 2; const int BTCSDiffusion::BC_CONSTANT = 2;
BTCSDiffusion::BTCSDiffusion(unsigned int dim) : grid_dim(dim) { BTCSDiffusion::BTCSDiffusion(unsigned int dim) : grid_dim(dim) {
assert(dim <= 3); assert(dim <= 3);
@ -65,13 +65,7 @@ void BTCSDiffusion::updateInternals() {
deltas[i] = (double)domain_size[i] / grid_cells[i]; deltas[i] = (double)domain_size[i] / grid_cells[i];
} }
int cells = 1; bc.resize((grid_dim > 1 ? grid_cells[1] : 1), grid_cells[0]);
for (int i = 0; i < grid_dim; i++) {
cells *= (grid_cells[i] + 2);
}
bc.resize(cells, {BTCSDiffusion::BC_CLOSED, 0});
} }
void BTCSDiffusion::simulate1D(Eigen::Map<DVectorRowMajor> &c, void BTCSDiffusion::simulate1D(Eigen::Map<DVectorRowMajor> &c,
@ -121,9 +115,9 @@ void BTCSDiffusion::simulate1D(Eigen::Map<DVectorRowMajor> &c,
i++, j++) { i++, j++) {
// if current grid cell is considered as constant boundary conditon // if current grid cell is considered as constant boundary conditon
if (bc[j].type == BTCSDiffusion::BC_CONSTANT) { if (bc(1,j).type == BTCSDiffusion::BC_CONSTANT) {
A_matrix.insert(i, i) = 1; A_matrix.insert(i, i) = 1;
b_vector[i] = bc[j].value; b_vector[i] = bc(1,j).value;
continue; continue;
} }
@ -157,9 +151,9 @@ void BTCSDiffusion::simulate2D(Eigen::Map<DMatrixRowMajor> &c,
x_vector.resize(size); x_vector.resize(size);
for (int i = 0; i < c.rows(); i++) { for (int i = 0; i < c.rows(); i++) {
boundary_condition left = bc[i * n_cols]; boundary_condition left = bc(i, 0);
bool left_constant = left.type == BTCSDiffusion::BC_CONSTANT; bool left_constant = left.type == BTCSDiffusion::BC_CONSTANT;
boundary_condition right = bc[((i + 1) * n_cols) - 1]; boundary_condition right = bc(i, n_cols - 1);
bool right_constant = right.type == BTCSDiffusion::BC_CONSTANT; bool right_constant = right.type == BTCSDiffusion::BC_CONSTANT;
fillMatrixFromRow(alpha.row(i), n_cols, i, left_constant, right_constant, fillMatrixFromRow(alpha.row(i), n_cols, i, left_constant, right_constant,
@ -186,13 +180,12 @@ void BTCSDiffusion::simulate2D(Eigen::Map<DMatrixRowMajor> &c,
b_vector.resize(size); b_vector.resize(size);
x_vector.resize(size); x_vector.resize(size);
int bottom_offset = bc.size() - (this->grid_cells[0]);
n_cols = c.cols(); n_cols = c.cols();
for (int i = 0; i < c.rows(); i++) { for (int i = 0; i < c.rows(); i++) {
boundary_condition left = bc[i]; boundary_condition left = bc(0,i);
bool left_constant = left.type == BTCSDiffusion::BC_CONSTANT; bool left_constant = left.type == BTCSDiffusion::BC_CONSTANT;
boundary_condition right = bc[bottom_offset + i]; boundary_condition right = bc(n_cols-1,i);
bool right_constant = right.type == BTCSDiffusion::BC_CONSTANT; bool right_constant = right.type == BTCSDiffusion::BC_CONSTANT;
fillMatrixFromRow(alpha.col(i), n_cols, i, left_constant, right_constant, fillMatrixFromRow(alpha.col(i), n_cols, i, left_constant, right_constant,
@ -233,7 +226,7 @@ void BTCSDiffusion::fillMatrixFromRow(const DVectorRowMajor &alpha, int n_cols,
j++, k++) { j++, k++) {
double sx = (alpha[j - 1] * time_step) / (delta * delta); double sx = (alpha[j - 1] * time_step) / (delta * delta);
if (this->bc[row * (n_cols - 2) + k].type == BTCSDiffusion::BC_CONSTANT) { if (this->bc(row, k).type == BTCSDiffusion::BC_CONSTANT) {
A_matrix.insert(offset + j, offset + j) = 1; A_matrix.insert(offset + j, offset + j) = 1;
continue; continue;
} }
@ -265,7 +258,7 @@ void BTCSDiffusion::fillVectorFromRow2D(Eigen::Map<DMatrixRowMajor> &c,
} }
for (int j = 1; j < offset - 1; j++) { for (int j = 1; j < offset - 1; j++) {
boundary_condition tmp_bc = this->bc[ncol * row + (j - 1)]; boundary_condition tmp_bc = this->bc(row, j-1);
if (tmp_bc.type == BTCSDiffusion::BC_CONSTANT) { if (tmp_bc.type == BTCSDiffusion::BC_CONSTANT) {
b_vector[offset * row + j] = tmp_bc.value; b_vector[offset * row + j] = tmp_bc.value;
@ -297,7 +290,7 @@ void BTCSDiffusion::simulate(std::vector<double> &c,
if (this->grid_dim == 1) { if (this->grid_dim == 1) {
assert(c.size() == grid_cells[0]); assert(c.size() == grid_cells[0]);
Eigen::Map<DVectorRowMajor> 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(1,0), bc(1,bc.cols()-1), alpha, this->deltas[0],
this->grid_cells[0]); this->grid_cells[0]);
} }
if (this->grid_dim == 2) { if (this->grid_dim == 2) {
@ -330,10 +323,10 @@ inline double BTCSDiffusion::getBCFromFlux(boundary_condition bc,
return val; return val;
} }
void BTCSDiffusion::setBoundaryCondition(int index, bctype type, double value) { void BTCSDiffusion::setBoundaryCondition(int i, int j, bctype type, double value) {
bc[index].type = type; bc(i,j).type = type;
bc[index].value = value; bc(i,j).value = value;
} }
inline void BTCSDiffusion::solveLES() { inline void BTCSDiffusion::solveLES() {

5
src/BTCSDiffusion.hpp
View File

@ -129,7 +129,7 @@ public:
* during solving. For flux value refers to a gradient of change for this grid * during solving. For flux value refers to a gradient of change for this grid
* cell. For closed this value has no effect since a gradient of 0 is used. * cell. For closed this value has no effect since a gradient of 0 is used.
*/ */
void setBoundaryCondition(int index, bctype type, double value); void setBoundaryCondition(int row, int column, bctype type, double value);
private: private:
typedef struct boundary_condition { typedef struct boundary_condition {
@ -161,7 +161,8 @@ private:
void solveLES(); void solveLES();
void updateInternals(); void updateInternals();
std::vector<boundary_condition> bc; // std::vector<boundary_condition> bc;
Eigen::Matrix<boundary_condition, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> bc;
Eigen::SparseMatrix<double> A_matrix; Eigen::SparseMatrix<double> A_matrix;
Eigen::VectorXd b_vector; Eigen::VectorXd b_vector;

2
src/main.cpp
View File

@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
diffu.setXDimensions(1, n); diffu.setXDimensions(1, n);
// set the boundary condition for the left ghost cell to dirichlet // set the boundary condition for the left ghost cell to dirichlet
diffu.setBoundaryCondition(0, BTCSDiffusion::BC_CONSTANT, diffu.setBoundaryCondition(1, 0, BTCSDiffusion::BC_CONSTANT,
5. * std::pow(10, -6)); 5. * std::pow(10, -6));
// set timestep for simulation to 1 second // set timestep for simulation to 1 second

10
src/main_2D.cpp
View File

@ -1,5 +1,5 @@
#include "BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET #include "BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET
#include <algorithm> // for copy, max #include <algorithm> // for copy, max
#include <iomanip> #include <iomanip>
#include <iostream> // for std #include <iostream> // for std
#include <vector> // for vector #include <vector> // for vector
@ -14,8 +14,8 @@ int main(int argc, char *argv[]) {
int m = 5; int m = 5;
// create input + diffusion coefficients for each grid cell // create input + diffusion coefficients for each grid cell
std::vector<double> alpha(n*m, 1 * pow(10, -1)); std::vector<double> alpha(n * m, 1 * pow(10, -1));
std::vector<double> field(n*m, 1 * std::pow(10, -6)); std::vector<double> field(n * m, 1 * std::pow(10, -6));
// create instance of diffusion module // create instance of diffusion module
BTCSDiffusion diffu(dim); BTCSDiffusion diffu(dim);
@ -24,7 +24,7 @@ int main(int argc, char *argv[]) {
diffu.setYDimensions(1, m); diffu.setYDimensions(1, m);
// set the boundary condition for the left ghost cell to dirichlet // set the boundary condition for the left ghost cell to dirichlet
diffu.setBoundaryCondition(0, BTCSDiffusion::BC_CONSTANT, diffu.setBoundaryCondition(2, 2, BTCSDiffusion::BC_CONSTANT,
5. * std::pow(10, -6)); 5. * std::pow(10, -6));
// set timestep for simulation to 1 second // set timestep for simulation to 1 second
@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
for (int i = 0; i < m; i++) { for (int i = 0; i < m; i++) {
// iterate through columns // iterate through columns
for (int j = 0; j < n; j++) { for (int j = 0; j < n; j++) {
cout << left << std::setw(20) << field[i*n + j]; cout << left << std::setw(20) << field[i * n + j];
} }
cout << "\n"; cout << "\n";
} }