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

added basic structure to allow for separate boundary condition types at each boundary cell later on

Browse Source
This commit is contained in:
philippun 2023-07-24 17:56:38 +02:00
parent 69ca773afa
commit 22d7ce45f7
2 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/tug/Boundary.hpp
View File

@ -4,6 +4,7 @@
#include <Eigen/Core>
#include "Grid.hpp"
using namespace std;
using namespace Eigen;
enum BC_TYPE {
@ -18,6 +19,45 @@ enum BC_SIDE {
BC_SIDE_BOTTOM
};
/*******************************************
class WallElement {
public:
WallElement() {
this->type = BC_TYPE_CLOSED;
this->value = 0;
}
WallElement(double value) {
this->type = BC_TYPE_CONSTANT;
this->value = value;
}
BC_TYPE getType() {
return this->type;
}
double getValue() {
return this->value;
}
private:
BC_TYPE type;
double value;
};
class BoundaryWall {
public:
BoundaryWall(int length) {
// create array with length many wall elements
}
private:
BC_SIDE side;
int length;
vector<WallElement> wall;
};
***********************/
class Boundary {
public:
@ -55,6 +95,10 @@ class Boundary {
private:
Grid grid;
// need a way to save the bc type and value for each single 'boundary cell'
// perhaps an array for each side with structs containing the bc type as well as a value
// or another object that contains one boundary side
BC_TYPE type;
VectorXd left, right, top, bottom;
};

65
src/FTCS.cpp
View File

@ -30,11 +30,6 @@ double calcHorizontalChange(Grid grid, int row, int col) {
}
double calcHorizontalChangeClosed() {
return 0;
}
double calcVerticalChange(Grid grid, int row, int col) {
double result =
@ -52,11 +47,7 @@ double calcVerticalChange(Grid grid, int row, int col) {
}
double calcVerticalChangeClosed() {
return 0;
}
double calcHorizontalChangeLeftBoundary(Grid grid, Boundary bc, int row, int col) {
double calcHorizontalChangeLeftBoundaryConstant(Grid grid, Boundary bc, int row, int col) {
double result =
calcAlphaIntercell(grid.getAlphaX()(row,col+1), grid.getAlphaX()(row,col))
@ -72,7 +63,12 @@ double calcHorizontalChangeLeftBoundary(Grid grid, Boundary bc, int row, int col
}
double calcHorizontalChangeRightBoundary(Grid grid, Boundary bc, int row, int col) {
double calcHorizontalChangeLeftBoundaryClosed() {
return 0;
}
double calcHorizontalChangeRightBoundaryConstant(Grid grid, Boundary bc, int row, int col) {
double result =
2 * grid.getAlphaX()(row,col) * bc.getBoundaryConditionValue(BC_SIDE_RIGHT)(row)
@ -88,7 +84,12 @@ double calcHorizontalChangeRightBoundary(Grid grid, Boundary bc, int row, int co
}
double calcVerticalChangeTopBoundary(Grid grid, Boundary bc, int row, int col) {
double calcHorizontalChangeRightBoundaryClosed() {
return 0;
}
double calcVerticalChangeTopBoundaryConstant(Grid grid, Boundary bc, int row, int col) {
double result =
calcAlphaIntercell(grid.getAlphaY()(row+1, col), grid.getAlphaY()(row, col))
@ -104,7 +105,12 @@ double calcVerticalChangeTopBoundary(Grid grid, Boundary bc, int row, int col) {
}
double calcVerticalChangeBottomBoundary(Grid grid, Boundary bc, int row, int col) {
double calcVerticalChangeTopBoundaryClosed() {
return 0;
}
double calcVerticalChangeBottomBoundaryConstant(Grid grid, Boundary bc, int row, int col) {
double result =
2 * grid.getAlphaY()(row, col) * bc.getBoundaryConditionValue(BC_SIDE_BOTTOM)(col)
@ -120,6 +126,11 @@ double calcVerticalChangeBottomBoundary(Grid grid, Boundary bc, int row, int col
}
double calcVerticalChangeBottomBoundaryClosed() {
return 0;
}
MatrixXd FTCS_1D(Grid grid, Boundary bc, double timestep) {
int colMax = grid.getCol();
double deltaCol = grid.getDeltaCol();
@ -144,7 +155,7 @@ MatrixXd FTCS_1D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row, col) = grid.getConcentrations()(row,col)
+ timestep / (deltaCol*deltaCol)
* (
calcHorizontalChangeLeftBoundary(grid, bc, row, col)
calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col)
)
;
@ -154,7 +165,7 @@ MatrixXd FTCS_1D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep / (deltaCol*deltaCol)
* (
calcHorizontalChangeRightBoundary(grid, bc, row, col)
calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col)
)
;
@ -196,7 +207,7 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row, col) = grid.getConcentrations()(row,col)
+ timestep / (deltaCol*deltaCol)
* (
calcHorizontalChangeLeftBoundary(grid, bc, row, col)
calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col)
)
+ timestep / (deltaRow*deltaRow)
* (
@ -211,7 +222,7 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep / (deltaCol*deltaCol)
* (
calcHorizontalChangeRightBoundary(grid, bc, row, col)
calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col)
)
+ timestep / (deltaRow*deltaRow)
* (
@ -227,7 +238,7 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row, col) = grid.getConcentrations()(row, col)
+ timestep / (deltaRow*deltaRow)
* (
calcVerticalChangeTopBoundary(grid, bc, row, col)
calcVerticalChangeTopBoundaryConstant(grid, bc, row, col)
)
+ timestep / (deltaCol*deltaCol)
* (
@ -242,7 +253,7 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row, col) = grid.getConcentrations()(row, col)
+ timestep / (deltaRow*deltaRow)
* (
calcVerticalChangeBottomBoundary(grid, bc, row, col)
calcVerticalChangeBottomBoundaryConstant(grid, bc, row, col)
)
+ timestep / (deltaCol*deltaCol)
* (
@ -257,11 +268,11 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep/(deltaCol*deltaCol)
* (
calcHorizontalChangeLeftBoundary(grid, bc, row, col)
calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col)
)
+ timestep/(deltaRow*deltaRow)
* (
calcVerticalChangeTopBoundary(grid, bc, row, col)
calcVerticalChangeTopBoundaryConstant(grid, bc, row, col)
)
;
@ -271,11 +282,11 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep/(deltaCol*deltaCol)
* (
calcHorizontalChangeRightBoundary(grid, bc, row, col)
calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col)
)
+ timestep/(deltaRow*deltaRow)
* (
calcVerticalChangeTopBoundary(grid, bc, row, col)
calcVerticalChangeTopBoundaryConstant(grid, bc, row, col)
)
;
@ -285,11 +296,11 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep/(deltaCol*deltaCol)
* (
calcHorizontalChangeLeftBoundary(grid, bc, row, col)
calcHorizontalChangeLeftBoundaryConstant(grid, bc, row, col)
)
+ timestep/(deltaRow*deltaRow)
* (
calcVerticalChangeBottomBoundary(grid, bc, row, col)
calcVerticalChangeBottomBoundaryConstant(grid, bc, row, col)
)
;
@ -299,11 +310,11 @@ MatrixXd FTCS_2D(Grid grid, Boundary bc, double timestep) {
concentrations_t1(row,col) = grid.getConcentrations()(row,col)
+ timestep/(deltaCol*deltaCol)
* (
calcHorizontalChangeRightBoundary(grid, bc, row, col)
calcHorizontalChangeRightBoundaryConstant(grid, bc, row, col)
)
+ timestep/(deltaRow*deltaRow)
* (
calcVerticalChangeBottomBoundary(grid, bc, row, col)
calcVerticalChangeBottomBoundaryConstant(grid, bc, row, col)
)
;