remove old library files

This commit is contained in:
Max Luebke 2021-12-01 17:59:08 +01:00
parent 57a0e8a1a6
commit 96a2d1cc5b
5 changed files with 12 additions and 190 deletions

View File

@ -1,11 +1,5 @@
add_library(diffusion OBJECT diffusion.cpp diffusion.hpp)
add_library(diffusion OBJECT BTCSDiffusion.cpp BTCSDiffusion.hpp)
target_link_libraries(diffusion Eigen3::Eigen)
add_library(diffusion_class OBJECT BTCSDiffusion.cpp BTCSDiffusion.hpp)
target_link_libraries(diffusion_class Eigen3::Eigen)
add_executable(test main.cpp)
target_link_libraries(test PUBLIC diffusion)
add_executable(test_class test_class.cpp)
target_link_libraries(test_class PUBLIC diffusion_class)

View File

@ -1,132 +0,0 @@
#include "diffusion.hpp"
#include <Eigen/SparseCholesky>
#include <Eigen/SparseLU>
#include <Eigen/SparseQR>
#include <Eigen/src/Core/Matrix.h>
#include <Eigen/src/Core/util/Constants.h>
#include <Eigen/src/OrderingMethods/Ordering.h>
#include <Eigen/src/SparseCholesky/SimplicialCholesky.h>
#include <Eigen/src/SparseCore/SparseMap.h>
#include <Eigen/src/SparseCore/SparseMatrix.h>
#include <Eigen/src/SparseCore/SparseMatrixBase.h>
#include <Eigen/src/SparseLU/SparseLU.h>
#include <Eigen/src/SparseQR/SparseQR.h>
#include <iostream>
#include <iomanip>
#include <ostream>
void BTCS1D(int x, std::vector<double> &c, std::vector<double> &alpha,
double timestep, std::vector<double> &bc) {
double dx = 1. / x;
int size = x + 2;
Eigen::VectorXd b = Eigen::VectorXd::Constant(size, 0);
Eigen::VectorXd x_out(size);
std::vector<T> tripletList;
tripletList.reserve(c.size() * 3 + bc.size());
int A_line = 0;
for (int i = 1; i < x + 1; i++) {
double sx = (alpha[i-1] * timestep) / (dx * dx);
tripletList.push_back(T(A_line, i, (-1. - 2. * sx)));
tripletList.push_back(T(A_line, i - 1, sx));
tripletList.push_back(T(A_line, i + 1, sx));
b[A_line] = -c[i-1];
A_line++;
}
tripletList.push_back(T(A_line, 0, 1));
b[A_line] = bc[0];
A_line++;
tripletList.push_back(T(A_line, size-1, 1));
// b[A_line] = bc[1];
b[A_line] = c[c.size()-1];
// std::cout << b << std::endl;
Eigen::SparseMatrix<double> A(size, size);
A.setFromTriplets(tripletList.begin(), tripletList.end());
// std::cout << A << std::endl;
Eigen::SparseQR<Eigen::SparseMatrix<double>, Eigen::COLAMDOrdering<int>>
solver;
// Eigen::SparseLU<Eigen::SparseMatrix<double>, Eigen::COLAMDOrdering<int>>
// solver;
solver.analyzePattern(A);
solver.factorize(A);
std::cout << solver.lastErrorMessage() << std::endl;
x_out = solver.solve(b);
std::cout << std::setprecision(10) << x_out << std::endl << std::endl;
for (int i=0; i < c.size(); i++) {
c[i] = x_out[i+1];
}
}
void BTCS2D(int x, int y, std::vector<double> &c, std::vector<double> &alpha,
double timestep) {
double dx = 1. / x;
double dy = 1. / y;
int size = (x - 2) * (y - 2);
Eigen::VectorXd b = Eigen::VectorXd::Constant(size, 0);
Eigen::VectorXd x_out(x * y);
std::vector<T> tripletList;
tripletList.reserve(size * 5);
int A_line = 0;
for (int i = 1; i < y - 1; i++) {
for (int j = 1; j < x - 1; j++) {
double sx = (alpha[i * x + j] * timestep) / (dx * dx);
double sy = (alpha[i * x + j] * timestep) / (dy * dy);
tripletList.push_back(T(A_line, i * x + j, (1. + 2. * sx + 2. * sy)));
std::cout << sx << std::endl;
tripletList.push_back(T(A_line, (i - 1) * x + j, sy));
tripletList.push_back(T(A_line, (i + 1) * x + j, sy));
tripletList.push_back(T(A_line, i * x + (j + 1), sx));
tripletList.push_back(T(A_line, i * x + (j - 1), sx));
b[A_line] = -c[i * x + j];
A_line++;
}
}
std::cout << b << std::endl;
Eigen::SparseMatrix<double> A(size, x * y);
A.setFromTriplets(tripletList.begin(), tripletList.end());
Eigen::SparseQR<Eigen::SparseMatrix<double>, Eigen::COLAMDOrdering<int>>
solver;
// Eigen::SparseLU<Eigen::SparseMatrix<double>, Eigen::COLAMDOrdering<int>>
// solver;
solver.analyzePattern(A);
solver.factorize(A);
std::cout << A << std::endl;
std::cout << solver.lastErrorMessage() << std::endl;
x_out = solver.solve(b);
std::cout << x_out << std::endl;
}

View File

@ -1,14 +0,0 @@
#ifndef DIFFUSION_H_
#define DIFFUSION_H_
#include <Eigen/SparseCore>
#include <vector>
typedef Eigen::Triplet<double> T;
extern void BTCS1D(int x, std::vector<double> &c, std::vector<double> &alpha,
double timestep, std::vector<double> &bc);
extern void BTCS2D(int x, int y, std::vector<double> &c,
std::vector<double> &alpha, double timestep);
#endif // DIFFUSION_H_

View File

@ -1,4 +1,4 @@
#include "diffusion.hpp"
#include "BTCSDiffusion.hpp"
#include <cmath>
#include <iostream>
#include <vector>
@ -11,15 +11,21 @@ int main(int argc, char *argv[]) {
std::vector<double> alpha(x, 1 * pow(10, -1));
std::vector<double> input(x, 1 * std::pow(10, -6));
std::vector<double> bc;
std::vector<double> bc_left, bc_right;
bc.push_back(5. * std::pow(10, -6));
bc.push_back(1. * std::pow(10, -6));
bc_left.push_back(5. * std::pow(10, -6));
bc_right.push_back(-1);
// input[x + 2] = 5.5556554 * std::pow(10, -6);
// input[x + 3] = 5.234564213 * std::pow(10, -6);
BTCSDiffusion diffu(x);
diffu.setBoundaryCondition(bc_left, BTCSDiffusion::LEFT);
diffu.setBoundaryCondition(bc_right, BTCSDiffusion::RIGHT);
for (int i = 0; i < 100; i++) {
BTCS1D(x, input, alpha, 1., bc);
diffu.simulate(input, alpha, 1.);
// BTCS1D(x, input, alpha, 1., bc);
}
return 0;

View File

@ -1,32 +0,0 @@
#include "BTCSDiffusion.hpp"
#include <cmath>
#include <iostream>
#include <vector>
using namespace std;
int main(int argc, char *argv[]) {
int x = 20;
std::vector<double> alpha(x, 1 * pow(10, -1));
std::vector<double> input(x, 1 * std::pow(10, -6));
std::vector<double> bc_left, bc_right;
bc_left.push_back(5. * std::pow(10, -6));
bc_right.push_back(-1);
// input[x + 2] = 5.5556554 * std::pow(10, -6);
// input[x + 3] = 5.234564213 * std::pow(10, -6);
BTCSDiffusion diffu(x);
diffu.setBoundaryCondition(bc_left, BTCSDiffusion::LEFT);
diffu.setBoundaryCondition(bc_right, BTCSDiffusion::RIGHT);
for (int i = 0; i < 100; i++) {
diffu.simulate(input, alpha, 1.);
// BTCS1D(x, input, alpha, 1., bc);
}
return 0;
}