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

Fix indexiation of bc field

Browse Source
This commit is contained in:
Max Lübke 2022-04-27 12:38:40 +02:00
parent 628e3288be
commit 9706d9a4b1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BTCSDiffusion.cpp
View File

@ -149,8 +149,8 @@ void Diffusion::BTCSDiffusion::simulate2D(
#pragma omp parallel for schedule(dynamic) #pragma omp parallel for schedule(dynamic)
for (int i = 0; i < n_rows; i++) { for (int i = 0; i < n_rows; i++) {
DVectorRowMajor input_field = c.row(i); DVectorRowMajor input_field = c.row(i);
simulate_base(input_field, bc.row(i), alpha.row(i), dx, local_dt, n_cols, simulate_base(input_field, bc.row(i + 1), alpha.row(i), dx, local_dt,
t0_c.row(i)); n_cols, t0_c.row(i));
c.row(i) << input_field; c.row(i) << input_field;
} }
@ -162,8 +162,8 @@ void Diffusion::BTCSDiffusion::simulate2D(
#pragma omp parallel for schedule(dynamic) #pragma omp parallel for schedule(dynamic)
for (int i = 0; i < n_cols; i++) { for (int i = 0; i < n_cols; i++) {
DVectorRowMajor input_field = c.col(i); DVectorRowMajor input_field = c.col(i);
simulate_base(input_field, bc.col(i), alpha.col(i), dx, local_dt, n_rows, simulate_base(input_field, bc.col(i + 1), alpha.col(i), dx, local_dt,
t0_c.row(i)); n_rows, t0_c.row(i));
c.col(i) << input_field.transpose(); c.col(i) << input_field.transpose();
} }
} }
@ -183,7 +183,7 @@ auto Diffusion::BTCSDiffusion::calc_t0_c(const DMatrixRowMajor &c,
// first, iterate over first row // first, iterate over first row
for (int j = 0; j < n_cols; j++) { for (int j = 0; j < n_cols; j++) {
boundary_condition tmp_bc = bc(0,j+1); boundary_condition tmp_bc = bc(0, j + 1);
if (tmp_bc.type == Diffusion::BC_CLOSED) if (tmp_bc.type == Diffusion::BC_CLOSED)
continue; continue;
@ -193,7 +193,7 @@ auto Diffusion::BTCSDiffusion::calc_t0_c(const DMatrixRowMajor &c,
y_values[2] = c(1, j); y_values[2] = c(1, j);
t0_c(0, j) = time_step * alpha(0, j) * t0_c(0, j) = time_step * alpha(0, j) *
(2*y_values[0] - 3 * y_values[1] + y_values[2]) / (dx * dx); (2 * y_values[0] - 3 * y_values[1] + y_values[2]) / (dx * dx);
} }
// then iterate over inlet // then iterate over inlet
@ -214,7 +214,7 @@ auto Diffusion::BTCSDiffusion::calc_t0_c(const DMatrixRowMajor &c,
// and finally over last row // and finally over last row
for (int j = 0; j < n_cols; j++) { for (int j = 0; j < n_cols; j++) {
boundary_condition tmp_bc = bc(end+1,j+1); boundary_condition tmp_bc = bc(end + 1, j + 1);
if (tmp_bc.type == Diffusion::BC_CLOSED) if (tmp_bc.type == Diffusion::BC_CLOSED)
continue; continue;
@ -224,7 +224,8 @@ auto Diffusion::BTCSDiffusion::calc_t0_c(const DMatrixRowMajor &c,
y_values[2] = getBCFromFlux(tmp_bc, c(end, j), alpha(end, j)); y_values[2] = getBCFromFlux(tmp_bc, c(end, j), alpha(end, j));
t0_c(end, j) = time_step * alpha(end, j) * t0_c(end, j) = time_step * alpha(end, j) *
(y_values[0] - 3 * y_values[1] + 2*y_values[2]) / (dx * dx); (y_values[0] - 3 * y_values[1] + 2 * y_values[2]) /
(dx * dx);
} }
return t0_c; return t0_c;