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 uncommenting solving function.

Browse Source 
Now x is actually solved with the help of the equation system.
This commit is contained in:
Max Luebke 2022-01-25 09:55:54 +01:00
parent f6dbc3fb16
commit 6308cd52af
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BTCSDiffusion.cpp
View File

@ -112,11 +112,13 @@ void BTCSDiffusion::simulate1D(std::vector<double> &c, boundary_condition left,
A_matrix.reserve(Eigen::VectorXi::Constant(size + bc_offset, 3));
A_matrix.insert(0, 0) = 1;
b_vector[0] = (left_is_constant ? left.value : getBCFromFlux(left, c[0], alpha[0]));
b_vector[0] =
(left_is_constant ? left.value : getBCFromFlux(left, c[0], alpha[0]));
A_matrix.insert((size + bc_offset) - 1, (size + bc_offset) - 1) = 1;
b_vector[size + bc_offset - 1] =
(right_is_constant ? right.value : getBCFromFlux(right, c[size - 1], alpha[size - 1]));
(right_is_constant ? right.value
: getBCFromFlux(right, c[size - 1], alpha[size - 1]));
// A_matrix.insert(0, 0) = 1;
// A_matrix.insert(size + 1, size + 1) = 1;
@ -131,7 +133,7 @@ void BTCSDiffusion::simulate1D(std::vector<double> &c, boundary_condition left,
b_vector[i] = -c[i + !(left_is_constant)];
}
std::cout << b_vector << "\n" << A_matrix << std::endl;
std::cout << b_vector << "\n" << A_matrix << std::endl;
Eigen::SparseLU<Eigen::SparseMatrix<double>, Eigen::COLAMDOrdering<int>>
solver;
@ -141,7 +143,7 @@ std::cout << b_vector << "\n" << A_matrix << std::endl;
std::cout << solver.lastErrorMessage() << std::endl;
// x_vector = solver.solve(b_vector);
x_vector = solver.solve(b_vector);
std::cout << std::setprecision(10) << x_vector << std::endl << std::endl;
@ -165,16 +167,17 @@ void BTCSDiffusion::simulate(std::vector<double> &c,
}
}
inline double BTCSDiffusion::getBCFromFlux(boundary_condition bc, double neighbor_c,
double neighbor_alpha) {
inline double BTCSDiffusion::getBCFromFlux(boundary_condition bc,
double neighbor_c,
double neighbor_alpha) {
double val;
if (bc.type == BTCSDiffusion::BC_CLOSED) {
val = neighbor_c;
} else if (bc.type == BTCSDiffusion::BC_FLUX) {
//TODO
// val = bc[index].value;
// TODO
// val = bc[index].value;
} else {
// TODO: implement error handling here. Type was set to wrong value.
}

2
src/main.cpp
View File

@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
// loop 100 times
// output is currently generated by the method itself
for (int i = 0; i < 1; i++) {
for (int i = 0; i < 100; i++) {
diffu.simulate(field, alpha);
}