diff --git a/src/BTCSDiffusion.cpp b/src/BTCSDiffusion.cpp index 161df32..fd1b5a7 100644 --- a/src/BTCSDiffusion.cpp +++ b/src/BTCSDiffusion.cpp @@ -26,7 +26,7 @@ BTCSDiffusion::BTCSDiffusion(unsigned int dim) : grid_dim(dim) { deltas.resize(dim, 1); } -void BTCSDiffusion::setXDimensions(unsigned int domain_size, +void BTCSDiffusion::setXDimensions(double domain_size, unsigned int n_grid_cells) { assert(this->grid_dim > 0); this->domain_size[0] = domain_size; @@ -35,7 +35,7 @@ void BTCSDiffusion::setXDimensions(unsigned int domain_size, updateInternals(); } -void BTCSDiffusion::setYDimensions(unsigned int domain_size, +void BTCSDiffusion::setYDimensions(double domain_size, unsigned int n_grid_cells) { assert(this->grid_dim > 1); this->domain_size[1] = domain_size; @@ -44,7 +44,7 @@ void BTCSDiffusion::setYDimensions(unsigned int domain_size, updateInternals(); } -void BTCSDiffusion::setZDimensions(unsigned int domain_size, +void BTCSDiffusion::setZDimensions(double domain_size, unsigned int n_grid_cells) { assert(this->grid_dim > 2); this->domain_size[2] = domain_size; @@ -158,7 +158,7 @@ void BTCSDiffusion::simulate2D(Eigen::Map &c, fillMatrixFromRow(alpha.row(i), n_cols, i, left_constant, right_constant, deltas[0], this->time_step / 2); - fillVectorFromRow2D(c, alpha.row(i), i, deltas[0], left, right); + fillVectorFromRowADI(c, alpha.row(i), i, deltas[0], left, right); } solveLES(); @@ -190,7 +190,7 @@ void BTCSDiffusion::simulate2D(Eigen::Map &c, fillMatrixFromRow(alpha.col(i), n_cols, i, left_constant, right_constant, deltas[1], this->time_step / 2); - fillVectorFromRow2D(c, alpha.row(i), i, deltas[1], left, right); + fillVectorFromRowADI(c, alpha.row(i), i, deltas[1], left, right); } solveLES(); @@ -237,7 +237,7 @@ void BTCSDiffusion::fillMatrixFromRow(const DVectorRowMajor &alpha, int n_cols, } } -void BTCSDiffusion::fillVectorFromRow2D(Eigen::Map &c, +void BTCSDiffusion::fillVectorFromRowADI(Eigen::Map &c, const Eigen::VectorXd alpha, int row, double delta, boundary_condition left, boundary_condition right) { diff --git a/src/BTCSDiffusion.hpp b/src/BTCSDiffusion.hpp index 2e9b8fd..ebfda26 100644 --- a/src/BTCSDiffusion.hpp +++ b/src/BTCSDiffusion.hpp @@ -51,7 +51,7 @@ public: * @param n_grid_cells Number of grid cells in x direction the domain is * divided to. */ - void setXDimensions(unsigned int domain_size, unsigned int n_grid_cells); + void setXDimensions(double domain_size, unsigned int n_grid_cells); /*! * Define the grid in y direction. @@ -62,7 +62,7 @@ public: * @param n_grid_cells Number of grid cells in y direction the domain is * divided to. */ - void setYDimensions(unsigned int domain_size, unsigned int n_grid_cells); + void setYDimensions(double domain_size, unsigned int n_grid_cells); /*! * Define the grid in z direction. @@ -73,7 +73,7 @@ public: * @param n_grid_cells Number of grid cells in z direction the domain is * divided to. */ - void setZDimensions(unsigned int domain_size, unsigned int n_grid_cells); + void setZDimensions(double domain_size, unsigned int n_grid_cells); /*! * Returns the number of grid cells in x direction. @@ -152,7 +152,7 @@ private: void fillMatrixFromRow(const DVectorRowMajor &alpha, int n_cols, int row, bool left_constant, bool right_constant, double delta, double time_step); - void fillVectorFromRow2D(Eigen::Map &c, + void fillVectorFromRowADI(Eigen::Map &c, const Eigen::VectorXd alpha, int row, double delta, boundary_condition left, boundary_condition right); void simulate3D(std::vector &c); @@ -172,7 +172,7 @@ private: int grid_dim; std::vector grid_cells; - std::vector domain_size; + std::vector domain_size; std::vector deltas; };