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

Merge branch 'fix-FTCS' into 'main'

Browse Source 
fix: Typos in FTCS

See merge request naaice/tug!21
This commit is contained in:
Max Lübke 2023-11-30 09:16:15 +01:00
commit 8824dc1fd9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ compile_commands.json
/iwyu/ /iwyu/
.Rhistory .Rhistory
.vscode/ .vscode/
.codechecker/

10
include/tug/Core/FTCS.hpp
View File

@ -88,9 +88,9 @@ static inline T calcHorizontalChangeLeftBoundaryClosed(Grid<T> &grid, int &row,
template <class T> template <class T>
static inline T calcHorizontalChangeLeftBoundary(Grid<T> &grid, Boundary<T> &bc, static inline T calcHorizontalChangeLeftBoundary(Grid<T> &grid, Boundary<T> &bc,
int &row, int &col) { int &row, int &col) {
if (bc.getBoundaryElementType(BC_SIDE_LEFT, col) == BC_TYPE_CONSTANT) { if (bc.getBoundaryElementType(BC_SIDE_LEFT, row) == BC_TYPE_CONSTANT) {
return calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col); return calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col);
} else if (bc.getBoundaryElementType(BC_SIDE_LEFT, col) == BC_TYPE_CLOSED) { } else if (bc.getBoundaryElementType(BC_SIDE_LEFT, row) == BC_TYPE_CLOSED) {
return calcHorizontalChangeLeftBoundaryClosed(grid, row, col); return calcHorizontalChangeLeftBoundaryClosed(grid, row, col);
} else { } else {
throw_invalid_argument("Undefined Boundary Condition Type!"); throw_invalid_argument("Undefined Boundary Condition Type!");
@ -130,9 +130,9 @@ template <class T>
static inline T calcHorizontalChangeRightBoundary(Grid<T> &grid, static inline T calcHorizontalChangeRightBoundary(Grid<T> &grid,
Boundary<T> &bc, int &row, Boundary<T> &bc, int &row,
int &col) { int &col) {
if (bc.getBoundaryElementType(BC_SIDE_RIGHT, col) == BC_TYPE_CONSTANT) { if (bc.getBoundaryElementType(BC_SIDE_RIGHT, row) == BC_TYPE_CONSTANT) {
return calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col); return calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col);
} else if (bc.getBoundaryElementType(BC_SIDE_RIGHT, col) == BC_TYPE_CLOSED) { } else if (bc.getBoundaryElementType(BC_SIDE_RIGHT, row) == BC_TYPE_CLOSED) {
return calcHorizontalChangeRightBoundaryClosed(grid, row, col); return calcHorizontalChangeRightBoundaryClosed(grid, row, col);
} else { } else {
throw_invalid_argument("Undefined Boundary Condition Type!"); throw_invalid_argument("Undefined Boundary Condition Type!");
@ -162,7 +162,7 @@ static inline T calcVerticalChangeTopBoundaryClosed(Grid<T> &grid, int &row,
int &col) { int &col) {
return calcAlphaIntercell(grid.getAlphaY()(row + 1, col), return calcAlphaIntercell(grid.getAlphaY()(row + 1, col),
grid.getConcentrations()(row, col)) * grid.getAlphaY()(row, col)) *
(grid.getConcentrations()(row + 1, col) - (grid.getConcentrations()(row + 1, col) -
grid.getConcentrations()(row, col)); grid.getConcentrations()(row, col));
} }