From 58cb8a965765799b261d154f5a460b2a825dc4c4 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 2 Apr 2026 12:43:11 +0200 Subject: [PATCH 1/2] Remove unused domain_geometry --- .../directSolverGive.h | 1 - .../directSolverGive.inl | 5 +- .../directSolverTake.h | 1 - .../directSolverTake.inl | 5 +- .../directSolverGive.inl | 5 +- .../directSolverGiveCustomLU.h | 1 - .../directSolverTake.inl | 5 +- .../directSolverTakeCustomLU.h | 1 - include/DirectSolver/directSolver.h | 3 - .../extrapolatedSmootherGive.h | 1 - .../extrapolatedSmootherGive.inl | 6 +- .../extrapolatedSmootherTake.h | 1 - .../extrapolatedSmootherTake.inl | 6 +- .../extrapolatedSmoother.h | 3 - include/GMGPolar/setup.h | 21 +- include/Level/level.h | 12 +- include/Level/level.inl | 33 ++- include/Residual/ResidualGive/residualGive.h | 1 - .../Residual/ResidualGive/residualGive.inl | 4 +- include/Residual/ResidualTake/residualTake.h | 1 - .../Residual/ResidualTake/residualTake.inl | 4 +- include/Residual/residual.h | 3 - include/Smoother/SmootherGive/smootherGive.h | 1 - .../Smoother/SmootherGive/smootherGive.inl | 4 +- include/Smoother/SmootherTake/smootherTake.h | 1 - .../Smoother/SmootherTake/smootherTake.inl | 4 +- include/Smoother/smoother.h | 3 - tests/DirectSolver/directSolver.cpp | 200 ++++++++--------- tests/DirectSolver/directSolverNoMumps.cpp | 200 ++++++++--------- .../extrapolated_smoother.cpp | 176 +++++++-------- tests/Residual/residual.cpp | 16 +- tests/Smoother/smoother.cpp | 208 +++++++++--------- 32 files changed, 447 insertions(+), 489 deletions(-) diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h index 2aa7a65b..b30ac27a 100644 --- a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h +++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h @@ -9,7 +9,6 @@ class DirectSolver_COO_MUMPS_Give : public DirectSolver { public: explicit DirectSolver_COO_MUMPS_Give(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.inl b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.inl index fec3823e..286efc8f 100644 --- a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.inl +++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.inl @@ -4,10 +4,9 @@ template DirectSolver_COO_MUMPS_Give::DirectSolver_COO_MUMPS_Give( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : DirectSolver(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : DirectSolver(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) , mumps_solver_(buildSolverMatrix()) { } diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h index f3d00bae..8e96ccc0 100644 --- a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h +++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h @@ -9,7 +9,6 @@ class DirectSolver_COO_MUMPS_Take : public DirectSolver { public: explicit DirectSolver_COO_MUMPS_Take(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.inl b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.inl index 07536127..95627c55 100644 --- a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.inl +++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.inl @@ -4,10 +4,9 @@ template DirectSolver_COO_MUMPS_Take::DirectSolver_COO_MUMPS_Take( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : DirectSolver(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : DirectSolver(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) , mumps_solver_(buildSolverMatrix()) { } diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGive.inl b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGive.inl index d26cab1f..6528dd97 100644 --- a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGive.inl +++ b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGive.inl @@ -2,10 +2,9 @@ template DirectSolver_CSR_LU_Give::DirectSolver_CSR_LU_Give( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : DirectSolver(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : DirectSolver(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) { solver_matrix_ = buildSolverMatrix(); lu_solver_ = SparseLUSolver(solver_matrix_); diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h index 0c069860..cbad6464 100644 --- a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h +++ b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h @@ -7,7 +7,6 @@ class DirectSolver_CSR_LU_Give : public DirectSolver { public: explicit DirectSolver_CSR_LU_Give(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTake.inl b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTake.inl index ac56f829..41cf6b6c 100644 --- a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTake.inl +++ b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTake.inl @@ -2,10 +2,9 @@ template DirectSolver_CSR_LU_Take::DirectSolver_CSR_LU_Take( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : DirectSolver(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : DirectSolver(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) { solver_matrix_ = buildSolverMatrix(); lu_solver_ = SparseLUSolver(solver_matrix_); diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h index 32cf4c5d..23376f70 100644 --- a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h +++ b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h @@ -7,7 +7,6 @@ class DirectSolver_CSR_LU_Take : public DirectSolver { public: explicit DirectSolver_CSR_LU_Take(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/DirectSolver/directSolver.h b/include/DirectSolver/directSolver.h index 9bcb1087..1c140ac3 100644 --- a/include/DirectSolver/directSolver.h +++ b/include/DirectSolver/directSolver.h @@ -33,12 +33,10 @@ class DirectSolver { public: explicit DirectSolver(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) : grid_(grid) , level_cache_(level_cache) - , domain_geometry_(domain_geometry) , density_profile_coefficients_(density_profile_coefficients) , DirBC_Interior_(DirBC_Interior) , num_omp_threads_(num_omp_threads) @@ -53,7 +51,6 @@ class DirectSolver protected: const PolarGrid& grid_; const LevelCache& level_cache_; - const DomainGeometry& domain_geometry_; const DensityProfileCoefficients& density_profile_coefficients_; const bool DirBC_Interior_; const int num_omp_threads_; diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h index 804abaab..25178888 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h @@ -58,7 +58,6 @@ class ExtrapolatedSmootherGive : public ExtrapolatedSmoother // Constructs the coupled circle-radial extrapolated smoother. // Builds the A_sc smoother matrices and prepares the solvers. explicit ExtrapolatedSmootherGive(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.inl index a358b5db..49f8586f 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.inl @@ -2,11 +2,11 @@ template ExtrapolatedSmootherGive::ExtrapolatedSmootherGive( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads) - : ExtrapolatedSmoother(grid, level_cache, domain_geometry, density_profile_coefficients, - DirBC_Interior, num_omp_threads) + : ExtrapolatedSmoother(grid, level_cache, density_profile_coefficients, DirBC_Interior, + num_omp_threads) , circle_tridiagonal_solver_(grid.ntheta(), grid.numberSmootherCircles(), true) , radial_tridiagonal_solver_(grid.lengthSmootherRadial(), grid.ntheta(), false) { diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h index de0c615f..a6d7afd5 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h @@ -58,7 +58,6 @@ class ExtrapolatedSmootherTake : public ExtrapolatedSmoother // Constructs the coupled circle-radial extrapolated smoother. // Builds the A_sc smoother matrices and prepares the solvers. explicit ExtrapolatedSmootherTake(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.inl index efbef404..41216148 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.inl @@ -2,11 +2,11 @@ template ExtrapolatedSmootherTake::ExtrapolatedSmootherTake( - const PolarGrid& grid, const LevelCache& level_cache, const DomainGeometry& domain_geometry, + const PolarGrid& grid, const LevelCache& level_cache, const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads) - : ExtrapolatedSmoother(grid, level_cache, domain_geometry, density_profile_coefficients, - DirBC_Interior, num_omp_threads) + : ExtrapolatedSmoother(grid, level_cache, density_profile_coefficients, DirBC_Interior, + num_omp_threads) , circle_tridiagonal_solver_(grid.ntheta(), grid.numberSmootherCircles(), true) , radial_tridiagonal_solver_(grid.lengthSmootherRadial(), grid.ntheta(), false) { diff --git a/include/ExtrapolatedSmoother/extrapolatedSmoother.h b/include/ExtrapolatedSmoother/extrapolatedSmoother.h index 5e697e60..75163bf2 100644 --- a/include/ExtrapolatedSmoother/extrapolatedSmoother.h +++ b/include/ExtrapolatedSmoother/extrapolatedSmoother.h @@ -34,12 +34,10 @@ class ExtrapolatedSmoother { public: explicit ExtrapolatedSmoother(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) : grid_(grid) , level_cache_(level_cache) - , domain_geometry_(domain_geometry) , density_profile_coefficients_(density_profile_coefficients) , DirBC_Interior_(DirBC_Interior) , num_omp_threads_(num_omp_threads) @@ -52,7 +50,6 @@ class ExtrapolatedSmoother protected: const PolarGrid& grid_; const LevelCache& level_cache_; - const DomainGeometry& domain_geometry_; const DensityProfileCoefficients& density_profile_coefficients_; const bool DirBC_Interior_; const int num_omp_threads_; diff --git a/include/GMGPolar/setup.h b/include/GMGPolar/setup.h index 24f6ca29..bb33c613 100644 --- a/include/GMGPolar/setup.h +++ b/include/GMGPolar/setup.h @@ -99,17 +99,16 @@ void GMGPolar::setup() // Define residual operator on all multigrid levels // // ------------------------------------------------ // for (int level_depth = 0; level_depth < number_of_levels_; level_depth++) { - levels_[level_depth].initializeResidual(domain_geometry_, density_profile_coefficients_, DirBC_Interior_, - max_omp_threads_, stencil_distribution_method_); + levels_[level_depth].initializeResidual(density_profile_coefficients_, DirBC_Interior_, max_omp_threads_, + stencil_distribution_method_); } // ----------------------------------------- // // Build direct solver on the coarsest level // // ----------------------------------------- // auto start_setup_directSolver = std::chrono::high_resolution_clock::now(); - levels_[number_of_levels_ - 1].initializeDirectSolver(domain_geometry_, density_profile_coefficients_, - DirBC_Interior_, max_omp_threads_, - stencil_distribution_method_); + levels_[number_of_levels_ - 1].initializeDirectSolver(density_profile_coefficients_, DirBC_Interior_, + max_omp_threads_, stencil_distribution_method_); auto end_setup_directSolver = std::chrono::high_resolution_clock::now(); t_setup_directSolver_ += std::chrono::duration(end_setup_directSolver - start_setup_directSolver).count(); @@ -146,17 +145,17 @@ void GMGPolar::setup() if (number_of_levels_ > 1) { // PCG uses non-extrapolated smoothing on level 0, so we need to initialize it if PCG is enabled. if (do_full_grid_smoothing || (PCG_ && PCG_MG_iterations_ > 0)) { - levels_[0].initializeSmoothing(domain_geometry_, density_profile_coefficients_, DirBC_Interior_, - max_omp_threads_, stencil_distribution_method_); + levels_[0].initializeSmoothing(density_profile_coefficients_, DirBC_Interior_, max_omp_threads_, + stencil_distribution_method_); } // PCG doesn't use extrapolated smoothing, so we only initialize it if PCG is disabled. if (do_extrapolated_smoothing && !PCG_) { - levels_[0].initializeExtrapolatedSmoothing(domain_geometry_, density_profile_coefficients_, DirBC_Interior_, - max_omp_threads_, stencil_distribution_method_); + levels_[0].initializeExtrapolatedSmoothing(density_profile_coefficients_, DirBC_Interior_, max_omp_threads_, + stencil_distribution_method_); } for (int level_depth = 1; level_depth < number_of_levels_ - 1; level_depth++) { - levels_[level_depth].initializeSmoothing(domain_geometry_, density_profile_coefficients_, DirBC_Interior_, - max_omp_threads_, stencil_distribution_method_); + levels_[level_depth].initializeSmoothing(density_profile_coefficients_, DirBC_Interior_, max_omp_threads_, + stencil_distribution_method_); } } auto end_setup_smoother = std::chrono::high_resolution_clock::now(); diff --git a/include/Level/level.h b/include/Level/level.h index 98651ee9..e8d1733c 100644 --- a/include/Level/level.h +++ b/include/Level/level.h @@ -69,16 +69,14 @@ class Level // -------------- // // Apply Residual // - void initializeResidual(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, + void initializeResidual(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); void computeResidual(Vector result, ConstVector rhs, ConstVector x) const; void applySystemOperator(Vector result, ConstVector x) const; // ------------------- // // Solve coarse System // - void initializeDirectSolver(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, + void initializeDirectSolver(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); // Note: The rhs (right-hand side) vector gets overwritten by the solution. @@ -86,15 +84,13 @@ class Level // --------------- // // Apply Smoothing // - void initializeSmoothing(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, + void initializeSmoothing(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); void smoothing(Vector x, ConstVector rhs, Vector temp) const; // ---------------------------- // // Apply Extrapolated Smoothing // - void initializeExtrapolatedSmoothing(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, + void initializeExtrapolatedSmoothing(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); void extrapolatedSmoothing(Vector x, ConstVector rhs, Vector temp) const; diff --git a/include/Level/level.inl b/include/Level/level.inl index 60ff2fcd..4bc0d6ef 100644 --- a/include/Level/level.inl +++ b/include/Level/level.inl @@ -102,18 +102,17 @@ ConstVector Level::error_correction() const // -------------- // // Apply Residual // template -void Level::initializeResidual(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, +void Level::initializeResidual(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_residual_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } else if (stencil_distribution_method == StencilDistributionMethod::CPU_GIVE) { op_residual_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } if (!op_residual_) throw std::runtime_error("Failed to initialize Residual."); @@ -137,28 +136,27 @@ void Level::applySystemOperator(Vector result, ConstVect // ------------------- // // Solve coarse System // template -void Level::initializeDirectSolver(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, +void Level::initializeDirectSolver(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { #ifdef GMGPOLAR_USE_MUMPS if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_directSolver_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } else if (stencil_distribution_method == StencilDistributionMethod::CPU_GIVE) { op_directSolver_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } #else if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_directSolver_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } else if (stencil_distribution_method == StencilDistributionMethod::CPU_GIVE) { op_directSolver_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } #endif if (!op_directSolver_) @@ -176,18 +174,17 @@ void Level::directSolveInPlace(Vector x) const // --------------- // // Apply Smoothing // template -void Level::initializeSmoothing(const DomainGeometry& domain_geometry, - const DensityProfileCoefficients& density_profile_coefficients, +void Level::initializeSmoothing(const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_smoother_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } else if (stencil_distribution_method == StencilDistributionMethod::CPU_GIVE) { op_smoother_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } if (!op_smoother_) throw std::runtime_error("Failed to initialize Smoother."); @@ -205,16 +202,16 @@ void Level::smoothing(Vector x, ConstVector rhs, // Apply Extrapolated Smoothing // template void Level::initializeExtrapolatedSmoothing( - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, - const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) + const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, + const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_extrapolated_smoother_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } else if (stencil_distribution_method == StencilDistributionMethod::CPU_GIVE) { op_extrapolated_smoother_ = std::make_unique>( - *grid_, *level_cache_, domain_geometry, density_profile_coefficients, DirBC_Interior, num_omp_threads); + *grid_, *level_cache_, density_profile_coefficients, DirBC_Interior, num_omp_threads); } if (!op_extrapolated_smoother_) throw std::runtime_error("Failed to initialize Extrapolated Smoother."); diff --git a/include/Residual/ResidualGive/residualGive.h b/include/Residual/ResidualGive/residualGive.h index c37e3fe9..e0582b97 100644 --- a/include/Residual/ResidualGive/residualGive.h +++ b/include/Residual/ResidualGive/residualGive.h @@ -7,7 +7,6 @@ class ResidualGive : public Residual { public: explicit ResidualGive(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads); ~ResidualGive() override = default; diff --git a/include/Residual/ResidualGive/residualGive.inl b/include/Residual/ResidualGive/residualGive.inl index 7eb79fec..87e7c26d 100644 --- a/include/Residual/ResidualGive/residualGive.inl +++ b/include/Residual/ResidualGive/residualGive.inl @@ -2,11 +2,9 @@ template ResidualGive::ResidualGive(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : Residual(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : Residual(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) { } diff --git a/include/Residual/ResidualTake/residualTake.h b/include/Residual/ResidualTake/residualTake.h index 21ca36da..b100c55a 100644 --- a/include/Residual/ResidualTake/residualTake.h +++ b/include/Residual/ResidualTake/residualTake.h @@ -7,7 +7,6 @@ class ResidualTake : public Residual { public: explicit ResidualTake(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads); ~ResidualTake() override = default; diff --git a/include/Residual/ResidualTake/residualTake.inl b/include/Residual/ResidualTake/residualTake.inl index f2c43964..a0347508 100644 --- a/include/Residual/ResidualTake/residualTake.inl +++ b/include/Residual/ResidualTake/residualTake.inl @@ -2,11 +2,9 @@ template ResidualTake::ResidualTake(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : Residual(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : Residual(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) { } diff --git a/include/Residual/residual.h b/include/Residual/residual.h index c377752a..48187333 100644 --- a/include/Residual/residual.h +++ b/include/Residual/residual.h @@ -24,12 +24,10 @@ class Residual { public: explicit Residual(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, const bool DirBC_Interior, const int num_omp_threads) : grid_(grid) , level_cache_(level_cache) - , domain_geometry_(domain_geometry) , density_profile_coefficients_(density_profile_coefficients) , DirBC_Interior_(DirBC_Interior) , num_omp_threads_(num_omp_threads) @@ -46,7 +44,6 @@ class Residual /* Constructor members */ const PolarGrid& grid_; const LevelCache& level_cache_; - const DomainGeometry& domain_geometry_; const DensityProfileCoefficients& density_profile_coefficients_; const bool DirBC_Interior_; const int num_omp_threads_; diff --git a/include/Smoother/SmootherGive/smootherGive.h b/include/Smoother/SmootherGive/smootherGive.h index 7f89b0af..f17f99eb 100644 --- a/include/Smoother/SmootherGive/smootherGive.h +++ b/include/Smoother/SmootherGive/smootherGive.h @@ -51,7 +51,6 @@ class SmootherGive : public Smoother // Constructs the coupled circle-radial smoother. // Builds the A_sc smoother matrices and prepares the solvers. explicit SmootherGive(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/Smoother/SmootherGive/smootherGive.inl b/include/Smoother/SmootherGive/smootherGive.inl index f99efdea..6a92da7e 100644 --- a/include/Smoother/SmootherGive/smootherGive.inl +++ b/include/Smoother/SmootherGive/smootherGive.inl @@ -2,11 +2,9 @@ template SmootherGive::SmootherGive(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : Smoother(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : Smoother(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) , circle_tridiagonal_solver_(grid.ntheta(), grid.numberSmootherCircles(), true) , radial_tridiagonal_solver_(grid.lengthSmootherRadial(), grid.ntheta(), false) { diff --git a/include/Smoother/SmootherTake/smootherTake.h b/include/Smoother/SmootherTake/smootherTake.h index e567998e..da8935cf 100644 --- a/include/Smoother/SmootherTake/smootherTake.h +++ b/include/Smoother/SmootherTake/smootherTake.h @@ -51,7 +51,6 @@ class SmootherTake : public Smoother // Constructs the coupled circle-radial smoother. // Builds the A_sc smoother matrices and prepares the solvers. explicit SmootherTake(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads); diff --git a/include/Smoother/SmootherTake/smootherTake.inl b/include/Smoother/SmootherTake/smootherTake.inl index 083ed106..b1dbb684 100644 --- a/include/Smoother/SmootherTake/smootherTake.inl +++ b/include/Smoother/SmootherTake/smootherTake.inl @@ -2,11 +2,9 @@ template SmootherTake::SmootherTake(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) - : Smoother(grid, level_cache, domain_geometry, density_profile_coefficients, DirBC_Interior, - num_omp_threads) + : Smoother(grid, level_cache, density_profile_coefficients, DirBC_Interior, num_omp_threads) , circle_tridiagonal_solver_(grid.ntheta(), grid.numberSmootherCircles(), true) , radial_tridiagonal_solver_(grid.lengthSmootherRadial(), grid.ntheta(), false) #ifdef GMGPOLAR_USE_MUMPS diff --git a/include/Smoother/smoother.h b/include/Smoother/smoother.h index 07f95051..a54f883c 100644 --- a/include/Smoother/smoother.h +++ b/include/Smoother/smoother.h @@ -35,12 +35,10 @@ class Smoother { public: explicit Smoother(const PolarGrid& grid, const LevelCache& level_cache, - const DomainGeometry& domain_geometry, const DensityProfileCoefficients& density_profile_coefficients, bool DirBC_Interior, int num_omp_threads) : grid_(grid) , level_cache_(level_cache) - , domain_geometry_(domain_geometry) , density_profile_coefficients_(density_profile_coefficients) , DirBC_Interior_(DirBC_Interior) , num_omp_threads_(num_omp_threads) @@ -53,7 +51,6 @@ class Smoother protected: const PolarGrid& grid_; const LevelCache& level_cache_; - const DomainGeometry& domain_geometry_; const DensityProfileCoefficients& density_profile_coefficients_; const bool DirBC_Interior_; const int num_omp_threads_; diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp index 17118f9e..79b609cc 100644 --- a/tests/DirectSolver/directSolver.cpp +++ b/tests/DirectSolver/directSolver.cpp @@ -79,9 +79,9 @@ TEST(DirectSolverTest, directSolver_DirBC_Interior) std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolver_COO_MUMPS_Take directSolverGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); DirectSolver_COO_MUMPS_Give directSolverTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -134,9 +134,9 @@ TEST(DirectSolverTest, directSolver_AcrossOrigin) std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolver_COO_MUMPS_Give directSolverGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); DirectSolver_COO_MUMPS_Take directSolverTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -190,10 +190,10 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverDirBC_Interior_Cir std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -235,10 +235,10 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_Circu std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -280,10 +280,10 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_Circu std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -325,10 +325,10 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Circula std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -375,10 +375,10 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverDirBC_Interior_ShafranovGeo std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -421,10 +421,10 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -472,10 +472,10 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -519,10 +519,10 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -568,10 +568,10 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -613,10 +613,10 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -670,10 +670,10 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -715,10 +715,10 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision2 std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -761,10 +761,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverDirBC_Interior std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -806,10 +806,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_C std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -851,10 +851,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_C std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -896,10 +896,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Cir std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -946,10 +946,10 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverDirBC_Interior_Shafrano std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -992,10 +992,10 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovG std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1043,10 +1043,10 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1090,10 +1090,10 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1139,10 +1139,10 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1184,10 +1184,10 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1239,10 +1239,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1284,10 +1284,10 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index 48c6504c..259aa1ce 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -78,9 +78,9 @@ TEST(DirectSolverTestNoMumps, directSolver_DirBC_Interior) std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolver_CSR_LU_Take directSolverGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); DirectSolver_CSR_LU_Give directSolverTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -134,9 +134,9 @@ TEST(DirectSolverTestNoMumps, directSolver_AcrossOrigin) std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolver_CSR_LU_Give directSolverGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); DirectSolver_CSR_LU_Take directSolverTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -190,10 +190,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverDirBC_Inter std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -235,10 +235,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverDirBC_Interio std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -280,10 +280,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverAcrossOrigi std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -325,10 +325,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverAcrossOrigin_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -376,10 +376,10 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverDirBC_Interior_Shafr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -423,10 +423,10 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverAcrossOrigin_Shafran std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -475,10 +475,10 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGe std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -523,10 +523,10 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeom std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -572,10 +572,10 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGe std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -617,10 +617,10 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeom std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -674,10 +674,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -719,10 +719,10 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -765,10 +765,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverDirBC_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -810,10 +810,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverDirBC_In std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -855,10 +855,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverAcross std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -900,10 +900,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverAcrossOr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -951,10 +951,10 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverDirBC_Interior_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -998,10 +998,10 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverAcrossOrigin_Sh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1050,10 +1050,10 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverDirBC_Interior_Cza std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1098,10 +1098,10 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverAcrossOrigin_Czarn std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1147,10 +1147,10 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverDirBC_Interior_Cul std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1192,10 +1192,10 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverAcrossOrigin_Culha std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1247,10 +1247,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1292,10 +1292,10 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index 407e9b54..8d108352 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -61,10 +61,10 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ExtrapolatedSmootherGive smootherGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); - ExtrapolatedSmootherTake smootherTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake smootherTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -122,10 +122,10 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_AcossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ExtrapolatedSmootherGive smootherGive_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); - ExtrapolatedSmootherTake smootherTake_operator( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake smootherTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -185,12 +185,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -270,12 +270,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -355,12 +355,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -442,12 +442,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -528,12 +528,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior_Smal std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -614,12 +614,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior_Smalle std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -700,12 +700,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin_Smalle std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -784,12 +784,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin_Smallest std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -871,12 +871,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -958,12 +958,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1043,12 +1043,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1128,12 +1128,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1212,12 +1212,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1296,12 +1296,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior_Sm std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1380,12 +1380,12 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin_Sm std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1464,12 +1464,12 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin_Smal std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); + level.grid(), level.levelCache(), *coefficients, DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp index 9ad129d2..d7be4fdf 100644 --- a/tests/Residual/residual.cpp +++ b/tests/Residual/residual.cpp @@ -55,10 +55,10 @@ TEST(OperatorATest, applyA_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ResidualGive residualGive_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residualTake_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); + ResidualGive residualGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residualTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector x = generate_random_sample_data(level.grid(), 42); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -111,10 +111,10 @@ TEST(OperatorATest, applyA_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ResidualGive residualGive_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualTake residualTake_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); + ResidualGive residualGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualTake residualTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector x = generate_random_sample_data(level.grid(), 42); Vector rhs = generate_random_sample_data(level.grid(), 69); diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index 2ef91c26..009e8fb1 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -60,10 +60,10 @@ TEST(SmootherTest, smoother_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - SmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - SmootherTake smootherTake_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); + SmootherGive smootherGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + SmootherTake smootherTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -120,10 +120,10 @@ TEST(SmootherTest, smoother_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - SmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - SmootherTake smootherTake_operator(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); + SmootherGive smootherGive_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + SmootherTake smootherTake_operator(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -182,12 +182,12 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -261,12 +261,12 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -340,12 +340,12 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -419,12 +419,12 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -497,12 +497,12 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -575,12 +575,12 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -653,12 +653,12 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -731,12 +731,12 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -812,12 +812,12 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -891,12 +891,12 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -970,12 +970,12 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1049,12 +1049,12 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1127,12 +1127,12 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1205,12 +1205,12 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1283,12 +1283,12 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1361,12 +1361,12 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), domain_geometry, - *coefficients, DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, - DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), *coefficients, + DirBC_Interior, maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), *coefficients, DirBC_Interior, + maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); From b3ab802fa65eb9d7c39a6838749f11788d2b03e0 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 2 Apr 2026 13:31:47 +0200 Subject: [PATCH 2/2] Clang format --- include/DirectSolver/directSolver.h | 3 +- .../extrapolatedSmoother.h | 3 +- include/GMGPolar/setup.h | 16 +- include/Level/level.h | 15 +- include/Residual/residual.h | 4 +- include/Smoother/SmootherGive/smootherGive.h | 4 +- include/Smoother/SmootherTake/smootherTake.h | 4 +- include/Smoother/smoother.h | 4 +- tests/DirectSolver/directSolver.cpp | 184 ++++++++--------- tests/DirectSolver/directSolverNoMumps.cpp | 184 ++++++++--------- .../extrapolated_smoother.cpp | 192 ++++++++---------- tests/Residual/residual.cpp | 16 +- tests/Smoother/smoother.cpp | 176 +++++++--------- 13 files changed, 351 insertions(+), 454 deletions(-) diff --git a/include/DirectSolver/directSolver.h b/include/DirectSolver/directSolver.h index 64b36336..9106b91c 100644 --- a/include/DirectSolver/directSolver.h +++ b/include/DirectSolver/directSolver.h @@ -31,8 +31,7 @@ template class DirectSolver { public: - explicit DirectSolver(const PolarGrid& grid, const LevelCache& level_cache, - bool DirBC_Interior, + explicit DirectSolver(const PolarGrid& grid, const LevelCache& level_cache, bool DirBC_Interior, int num_omp_threads) : grid_(grid) , level_cache_(level_cache) diff --git a/include/ExtrapolatedSmoother/extrapolatedSmoother.h b/include/ExtrapolatedSmoother/extrapolatedSmoother.h index b4ba6c96..abf8aee3 100644 --- a/include/ExtrapolatedSmoother/extrapolatedSmoother.h +++ b/include/ExtrapolatedSmoother/extrapolatedSmoother.h @@ -35,8 +35,7 @@ class ExtrapolatedSmoother { public: explicit ExtrapolatedSmoother(const PolarGrid& grid, const LevelCache& level_cache, - bool DirBC_Interior, - int num_omp_threads) + bool DirBC_Interior, int num_omp_threads) : grid_(grid) , level_cache_(level_cache) , DirBC_Interior_(DirBC_Interior) diff --git a/include/GMGPolar/setup.h b/include/GMGPolar/setup.h index 9ad35a05..a8db96e2 100644 --- a/include/GMGPolar/setup.h +++ b/include/GMGPolar/setup.h @@ -99,16 +99,15 @@ void GMGPolar::setup() // Define residual operator on all multigrid levels // // ------------------------------------------------ // for (int level_depth = 0; level_depth < number_of_levels_; level_depth++) { - levels_[level_depth].initializeResidual(DirBC_Interior_, max_omp_threads_, - stencil_distribution_method_); + levels_[level_depth].initializeResidual(DirBC_Interior_, max_omp_threads_, stencil_distribution_method_); } // ----------------------------------------- // // Build direct solver on the coarsest level // // ----------------------------------------- // auto start_setup_directSolver = std::chrono::high_resolution_clock::now(); - levels_[number_of_levels_ - 1].initializeDirectSolver(DirBC_Interior_, - max_omp_threads_, stencil_distribution_method_); + levels_[number_of_levels_ - 1].initializeDirectSolver(DirBC_Interior_, max_omp_threads_, + stencil_distribution_method_); auto end_setup_directSolver = std::chrono::high_resolution_clock::now(); t_setup_directSolver_ += std::chrono::duration(end_setup_directSolver - start_setup_directSolver).count(); @@ -145,17 +144,14 @@ void GMGPolar::setup() if (number_of_levels_ > 1) { // PCG uses non-extrapolated smoothing on level 0, so we need to initialize it if PCG is enabled. if (do_full_grid_smoothing || (PCG_ && PCG_MG_iterations_ > 0)) { - levels_[0].initializeSmoothing(DirBC_Interior_, max_omp_threads_, - stencil_distribution_method_); + levels_[0].initializeSmoothing(DirBC_Interior_, max_omp_threads_, stencil_distribution_method_); } // PCG doesn't use extrapolated smoothing, so we only initialize it if PCG is disabled. if (do_extrapolated_smoothing && !PCG_) { - levels_[0].initializeExtrapolatedSmoothing(DirBC_Interior_, max_omp_threads_, - stencil_distribution_method_); + levels_[0].initializeExtrapolatedSmoothing(DirBC_Interior_, max_omp_threads_, stencil_distribution_method_); } for (int level_depth = 1; level_depth < number_of_levels_ - 1; level_depth++) { - levels_[level_depth].initializeSmoothing(DirBC_Interior_, max_omp_threads_, - stencil_distribution_method_); + levels_[level_depth].initializeSmoothing(DirBC_Interior_, max_omp_threads_, stencil_distribution_method_); } } auto end_setup_smoother = std::chrono::high_resolution_clock::now(); diff --git a/include/Level/level.h b/include/Level/level.h index 1d452131..6bb43b1b 100644 --- a/include/Level/level.h +++ b/include/Level/level.h @@ -69,28 +69,27 @@ class Level // -------------- // // Apply Residual // - void initializeResidual(const bool DirBC_Interior, - const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); + void initializeResidual(const bool DirBC_Interior, const int num_omp_threads, + const StencilDistributionMethod stencil_distribution_method); void computeResidual(Vector result, ConstVector rhs, ConstVector x) const; void applySystemOperator(Vector result, ConstVector x) const; // ------------------- // // Solve coarse System // - void initializeDirectSolver(const bool DirBC_Interior, - const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); + void initializeDirectSolver(const bool DirBC_Interior, const int num_omp_threads, + const StencilDistributionMethod stencil_distribution_method); // Note: The rhs (right-hand side) vector gets overwritten by the solution. void directSolveInPlace(Vector x) const; // --------------- // // Apply Smoothing // - void initializeSmoothing(const bool DirBC_Interior, - const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); + void initializeSmoothing(const bool DirBC_Interior, const int num_omp_threads, + const StencilDistributionMethod stencil_distribution_method); void smoothing(Vector x, ConstVector rhs, Vector temp) const; // ---------------------------- // // Apply Extrapolated Smoothing // - void initializeExtrapolatedSmoothing(const bool DirBC_Interior, - const int num_omp_threads, + void initializeExtrapolatedSmoothing(const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method); void extrapolatedSmoothing(Vector x, ConstVector rhs, Vector temp) const; diff --git a/include/Residual/residual.h b/include/Residual/residual.h index 487a148d..f71e12b1 100644 --- a/include/Residual/residual.h +++ b/include/Residual/residual.h @@ -22,8 +22,8 @@ template class Residual { public: - explicit Residual(const PolarGrid& grid, const LevelCache& level_cache, - const bool DirBC_Interior, const int num_omp_threads) + explicit Residual(const PolarGrid& grid, const LevelCache& level_cache, const bool DirBC_Interior, + const int num_omp_threads) : grid_(grid) , level_cache_(level_cache) , DirBC_Interior_(DirBC_Interior) diff --git a/include/Smoother/SmootherGive/smootherGive.h b/include/Smoother/SmootherGive/smootherGive.h index 9c9eeb20..638520f9 100644 --- a/include/Smoother/SmootherGive/smootherGive.h +++ b/include/Smoother/SmootherGive/smootherGive.h @@ -50,8 +50,8 @@ class SmootherGive : public Smoother public: // Constructs the coupled circle-radial smoother. // Builds the A_sc smoother matrices and prepares the solvers. - explicit SmootherGive(const PolarGrid& grid, const LevelCache& level_cache, - bool DirBC_Interior, int num_omp_threads); + explicit SmootherGive(const PolarGrid& grid, const LevelCache& level_cache, bool DirBC_Interior, + int num_omp_threads); // If MUMPS is enabled, this cleans up the inner boundary solver. ~SmootherGive() override; diff --git a/include/Smoother/SmootherTake/smootherTake.h b/include/Smoother/SmootherTake/smootherTake.h index d4182f11..d3041d79 100644 --- a/include/Smoother/SmootherTake/smootherTake.h +++ b/include/Smoother/SmootherTake/smootherTake.h @@ -50,8 +50,8 @@ class SmootherTake : public Smoother public: // Constructs the coupled circle-radial smoother. // Builds the A_sc smoother matrices and prepares the solvers. - explicit SmootherTake(const PolarGrid& grid, const LevelCache& level_cache, - bool DirBC_Interior, int num_omp_threads); + explicit SmootherTake(const PolarGrid& grid, const LevelCache& level_cache, bool DirBC_Interior, + int num_omp_threads); // Performs one full coupled smoothing sweep: // BC -> WC -> BR -> WR diff --git a/include/Smoother/smoother.h b/include/Smoother/smoother.h index 7c228dce..d6d18ab5 100644 --- a/include/Smoother/smoother.h +++ b/include/Smoother/smoother.h @@ -33,8 +33,8 @@ template class Smoother { public: - explicit Smoother(const PolarGrid& grid, const LevelCache& level_cache, - bool DirBC_Interior, int num_omp_threads) + explicit Smoother(const PolarGrid& grid, const LevelCache& level_cache, bool DirBC_Interior, + int num_omp_threads) : grid_(grid) , level_cache_(level_cache) , DirBC_Interior_(DirBC_Interior) diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp index 66c73f2d..362b7539 100644 --- a/tests/DirectSolver/directSolver.cpp +++ b/tests/DirectSolver/directSolver.cpp @@ -78,10 +78,10 @@ TEST(DirectSolverTest, directSolver_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take directSolverGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - DirectSolver_COO_MUMPS_Give directSolverTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take directSolverGive_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give directSolverTake_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -133,10 +133,10 @@ TEST(DirectSolverTest, directSolver_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give directSolverGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - DirectSolver_COO_MUMPS_Take directSolverTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give directSolverGive_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take directSolverTake_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -190,10 +190,9 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverDirBC_Interior_Cir std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -235,10 +234,9 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_Circu std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -280,10 +278,9 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_Circu std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -325,10 +322,9 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Circula std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -375,10 +371,9 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverDirBC_Interior_ShafranovGeo std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -421,10 +416,9 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -472,10 +466,9 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -519,10 +512,9 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -568,10 +560,9 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -613,10 +604,9 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometry) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -670,10 +660,9 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -715,10 +704,9 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision2 std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -761,10 +749,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverDirBC_Interior std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -806,10 +793,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_C std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -851,10 +837,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_C std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -896,10 +881,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Cir std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -946,10 +930,9 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverDirBC_Interior_Shafrano std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -992,10 +975,9 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovG std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1043,10 +1025,9 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1090,10 +1071,9 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1139,10 +1119,9 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeome std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1184,10 +1163,9 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1239,10 +1217,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); @@ -1284,10 +1261,9 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_COO_MUMPS_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("sol", rhs.size()); diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index 0d5b9d04..9ac9c87b 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -77,10 +77,10 @@ TEST(DirectSolverTestNoMumps, directSolver_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take directSolverGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - DirectSolver_CSR_LU_Give directSolverTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take directSolverGive_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give directSolverTake_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -133,10 +133,10 @@ TEST(DirectSolverTestNoMumps, directSolver_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give directSolverGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - DirectSolver_CSR_LU_Take directSolverTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give directSolverGive_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take directSolverTake_operator(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -190,10 +190,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverDirBC_Inter std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -235,10 +234,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverDirBC_Interio std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -280,10 +278,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverAcrossOrigi std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -325,10 +322,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverAcrossOrigin_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -376,10 +372,9 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverDirBC_Interior_Shafr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -423,10 +418,9 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverAcrossOrigin_Shafran std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -475,10 +469,9 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGe std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -523,10 +516,9 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeom std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -572,10 +564,9 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGe std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -617,10 +608,9 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeom std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -674,10 +664,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -719,10 +708,9 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -765,10 +753,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverDirBC_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -810,10 +797,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverDirBC_In std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -855,10 +841,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverAcross std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -900,10 +885,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverAcrossOr std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -951,10 +935,9 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverDirBC_Interior_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -998,10 +981,9 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverAcrossOrigin_Sh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1050,10 +1032,9 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverDirBC_Interior_Cza std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1098,10 +1079,9 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverAcrossOrigin_Czarn std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1147,10 +1127,9 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverDirBC_Interior_Cul std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1192,10 +1171,9 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverAcrossOrigin_Culha std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1247,10 +1225,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); @@ -1292,10 +1269,9 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector solution("solution", rhs.size()); diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index 26a65d73..4caad3ff 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -61,10 +61,10 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ExtrapolatedSmootherGive smootherGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - ExtrapolatedSmootherTake smootherTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ExtrapolatedSmootherTake smootherTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -122,10 +122,10 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_AcossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ExtrapolatedSmootherGive smootherGive_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); - ExtrapolatedSmootherTake smootherTake_operator( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ExtrapolatedSmootherTake smootherTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -185,12 +185,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -270,12 +269,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -355,12 +353,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -442,12 +439,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -528,12 +524,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior_Smal std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -614,12 +609,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior_Smalle std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -700,12 +694,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin_Smalle std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -784,12 +777,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin_Smallest std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherGive extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherGive extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -871,12 +863,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -958,12 +949,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1043,12 +1033,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1128,12 +1117,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1212,12 +1200,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior_ std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1296,12 +1283,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior_Sm std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1380,12 +1366,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin_Sm std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1464,12 +1449,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin_Smal std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - ExtrapolatedSmootherTake extrapolated_smoother_op( - level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + DirectSolver_CSR_LU_Take solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + ExtrapolatedSmootherTake extrapolated_smoother_op(level.grid(), level.levelCache(), + DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp index b3ff3b40..46d88ded 100644 --- a/tests/Residual/residual.cpp +++ b/tests/Residual/residual.cpp @@ -55,10 +55,10 @@ TEST(OperatorATest, applyA_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ResidualGive residualGive_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residualTake_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); + ResidualGive residualGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residualTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector x = generate_random_sample_data(level.grid(), 42); Vector rhs = generate_random_sample_data(level.grid(), 69); @@ -111,10 +111,10 @@ TEST(OperatorATest, applyA_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - ResidualGive residualGive_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualTake residualTake_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); + ResidualGive residualGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualTake residualTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector x = generate_random_sample_data(level.grid(), 42); Vector rhs = generate_random_sample_data(level.grid(), 69); diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index 06ffb0f4..e733da89 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -60,10 +60,10 @@ TEST(SmootherTest, smoother_DirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - SmootherGive smootherGive_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - SmootherTake smootherTake_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); + SmootherGive smootherGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + SmootherTake smootherTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -120,10 +120,10 @@ TEST(SmootherTest, smoother_AcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - SmootherGive smootherGive_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - SmootherTake smootherTake_operator(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); + SmootherGive smootherGive_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + SmootherTake smootherTake_operator(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); Vector rhs = generate_random_sample_data(level.grid(), 69); Vector start = generate_random_sample_data(level.grid(), 24); @@ -182,12 +182,10 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -261,12 +259,10 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -340,12 +336,10 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -419,12 +413,10 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -497,12 +489,10 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -575,12 +565,10 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -653,12 +641,10 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -731,12 +717,10 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherGive smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -812,12 +796,10 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -891,12 +873,10 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -970,12 +950,10 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1049,12 +1027,10 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1127,12 +1103,10 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1205,12 +1179,10 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1283,12 +1255,10 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size()); @@ -1361,12 +1331,10 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin_SmallestGrid) std::unique_ptr source_term = std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); - DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), - DirBC_Interior, maxOpenMPThreads); - ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); - SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, - maxOpenMPThreads); + DirectSolver_CSR_LU_Give solver_op(level.grid(), level.levelCache(), DirBC_Interior, + maxOpenMPThreads); + ResidualGive residual_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); + SmootherTake smoother_op(level.grid(), level.levelCache(), DirBC_Interior, maxOpenMPThreads); ConstVector rhs = generate_random_sample_data(level.grid(), 42); Vector discrete_solution("discrete_solution", rhs.size());