From ffd927a26d49c3841f526c2679d2c9143576df98 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:31:41 +0200 Subject: [PATCH 1/5] Remove coeff_beta parameter from applyAscOrtho functions Removed unused parameter 'coeff_beta' from nodeApplyAscOrtho functions. --- .../Smoother/SmootherTake/applyAscOrtho.inl | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/include/Smoother/SmootherTake/applyAscOrtho.inl b/include/Smoother/SmootherTake/applyAscOrtho.inl index 57b367c4..3d53bef4 100644 --- a/include/Smoother/SmootherTake/applyAscOrtho.inl +++ b/include/Smoother/SmootherTake/applyAscOrtho.inl @@ -7,8 +7,7 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoCircleTake(const int i_r, co bool DirBC_Interior, ConstVector& x, ConstVector& rhs, Vector& result, ConstVector& arr, ConstVector& att, - ConstVector& art, ConstVector& detDF, - ConstVector& coeff_beta) + ConstVector& art, ConstVector& detDF) { KOKKOS_ASSERT(i_r >= 0 && i_r < grid.numberSmootherCircles()); @@ -60,7 +59,7 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoRadialTake(const int i_r, const int i_theta, const PolarGrid& grid, bool DirBC_Interior, ConstVector& x, ConstVector& rhs, Vector& result, ConstVector& arr, const ConstVector& att, ConstVector& art, - const ConstVector& detDF, ConstVector& coeff_beta) + const ConstVector& detDF) { KOKKOS_ASSERT(i_r >= grid.numberSmootherCircles() && i_r < grid.nr()); @@ -127,14 +126,12 @@ void SmootherTake::applyAscOrthoBlackCircleSection(ConstVector::level_cache_; const bool DirBC_Interior = Smoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); ConstVector arr = level_cache.arr(); ConstVector att = level_cache.att(); ConstVector art = level_cache.art(); ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); /* The outer most circle next to the radial section is defined to be black. */ const int start_black_circles = (grid.numberSmootherCircles() % 2 == 0) ? 1 : 0; @@ -149,8 +146,7 @@ void SmootherTake::applyAscOrthoBlackCircleSection(ConstVector::applyAscOrthoWhiteCircleSection(ConstVector::level_cache_; const bool DirBC_Interior = Smoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); ConstVector arr = level_cache.arr(); ConstVector att = level_cache.att(); ConstVector art = level_cache.art(); ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); /* The outer most circle next to the radial section is defined to be black. */ const int start_white_circles = (grid.numberSmootherCircles() % 2 == 0) ? 0 : 1; @@ -188,8 +182,7 @@ void SmootherTake::applyAscOrthoWhiteCircleSection(ConstVector::applyAscOrthoBlackRadialSection(ConstVector::level_cache_; const bool DirBC_Interior = Smoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); ConstVector arr = level_cache.arr(); ConstVector att = level_cache.att(); ConstVector art = level_cache.art(); ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); assert(grid.ntheta() % 2 == 0); const int start_black_radials = 0; @@ -227,8 +218,7 @@ void SmootherTake::applyAscOrthoBlackRadialSection(ConstVector::applyAscOrthoWhiteRadialSection(ConstVector::level_cache_; const bool DirBC_Interior = Smoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); ConstVector arr = level_cache.arr(); ConstVector att = level_cache.att(); ConstVector art = level_cache.art(); ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1; @@ -266,8 +254,7 @@ void SmootherTake::applyAscOrthoWhiteRadialSection(ConstVector Date: Mon, 29 Jun 2026 22:12:41 +0200 Subject: [PATCH 2/5] Update applyAscOrtho.inl --- .../Smoother/SmootherTake/applyAscOrtho.inl | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/Smoother/SmootherTake/applyAscOrtho.inl b/include/Smoother/SmootherTake/applyAscOrtho.inl index 3d53bef4..f4646fd6 100644 --- a/include/Smoother/SmootherTake/applyAscOrtho.inl +++ b/include/Smoother/SmootherTake/applyAscOrtho.inl @@ -128,10 +128,10 @@ void SmootherTake::applyAscOrthoBlackCircleSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); /* The outer most circle next to the radial section is defined to be black. */ const int start_black_circles = (grid.numberSmootherCircles() % 2 == 0) ? 1 : 0; @@ -164,10 +164,10 @@ void SmootherTake::applyAscOrthoWhiteCircleSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); /* The outer most circle next to the radial section is defined to be black. */ const int start_white_circles = (grid.numberSmootherCircles() % 2 == 0) ? 0 : 1; @@ -200,10 +200,10 @@ void SmootherTake::applyAscOrthoBlackRadialSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); assert(grid.ntheta() % 2 == 0); const int start_black_radials = 0; @@ -236,10 +236,10 @@ void SmootherTake::applyAscOrthoWhiteRadialSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1; From 29f67f889ab1c3076d07499a2c4cc575b746b037 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Mon, 29 Jun 2026 23:24:50 +0200 Subject: [PATCH 3/5] Update applyAscOrtho.inl --- include/Smoother/SmootherTake/applyAscOrtho.inl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Smoother/SmootherTake/applyAscOrtho.inl b/include/Smoother/SmootherTake/applyAscOrtho.inl index f4646fd6..0e5fb818 100644 --- a/include/Smoother/SmootherTake/applyAscOrtho.inl +++ b/include/Smoother/SmootherTake/applyAscOrtho.inl @@ -55,11 +55,11 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoCircleTake(const int i_r, co ); } -static KOKKOS_INLINE_FUNCTION void -nodeApplyAscOrthoRadialTake(const int i_r, const int i_theta, const PolarGrid& grid, bool DirBC_Interior, - ConstVector& x, ConstVector& rhs, Vector& result, - ConstVector& arr, const ConstVector& att, ConstVector& art, - const ConstVector& detDF) +static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoRadialTake(const int i_r, const int i_theta, const PolarGrid& grid, + bool DirBC_Interior, ConstVector& x, + ConstVector& rhs, Vector& result, + ConstVector& arr, ConstVector& att, + ConstVector& art, ConstVector& detDF) { KOKKOS_ASSERT(i_r >= grid.numberSmootherCircles() && i_r < grid.nr()); From 19434be2e43fa214bd4720c1da423cb36d7609a4 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Tue, 30 Jun 2026 00:07:32 +0200 Subject: [PATCH 4/5] Update applyAscOrtho.inl --- .../applyAscOrtho.inl | 57 +++++++------------ 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl index 71d2d1d5..89067fab 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl @@ -7,8 +7,7 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoCircleTake(const int i_r, co const bool DirBC_Interior, ConstVector& x, ConstVector& rhs, Vector& result, ConstVector& arr, ConstVector& att, - ConstVector& art, ConstVector& detDF, - ConstVector& coeff_beta) + ConstVector& art, ConstVector& detDF) { KOKKOS_ASSERT(i_r >= 0 && i_r <= grid.numberSmootherCircles()); @@ -185,11 +184,11 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoCircleTake(const int i_r, co } } -static KOKKOS_INLINE_FUNCTION void -nodeApplyAscOrthoRadialTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior, ConstVector& x, - ConstVector& rhs, Vector& result, ConstVector& arr, - const ConstVector& att, ConstVector& art, const ConstVector& detDF, - ConstVector& coeff_beta) +static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoRadialTake(const int i_r, const int i_theta, const PolarGrid& grid, + const bool DirBC_Interior, ConstVector& x, + ConstVector& rhs, Vector& result, + ConstVector& arr, ConstVector& att, + ConstVector& art, ConstVector& detDF) { assert(i_r >= grid.numberSmootherCircles() - 1 && i_r < grid.nr()); @@ -471,14 +470,12 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackCircleSection(C const LevelCacheType& level_cache = ExtrapolatedSmoother::level_cache_; const bool DirBC_Interior = ExtrapolatedSmoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); /* The outer most circle next to the radial section is defined to be black. */ const int start_black_circles = (grid.numberSmootherCircles() % 2 == 0) ? 1 : 0; @@ -493,8 +490,7 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackCircleSection(C // Kokkos lambda function to execute for each point in the index space KOKKOS_LAMBDA(const int circle_task, const int i_theta) { int i_r = start_black_circles + circle_task * 2; - nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF, - coeff_beta); + nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF); }); Kokkos::fence(); @@ -511,14 +507,12 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteCircleSection(C const LevelCacheType& level_cache = ExtrapolatedSmoother::level_cache_; const bool DirBC_Interior = ExtrapolatedSmoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); /* The outer most circle next to the radial section is defined to be black. */ const int start_white_circles = (grid.numberSmootherCircles() % 2 == 0) ? 0 : 1; @@ -533,8 +527,7 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteCircleSection(C // Kokkos lambda function to execute for each point in the index space KOKKOS_LAMBDA(const int circle_task, const int i_theta) { const int i_r = start_white_circles + circle_task * 2; - nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF, - coeff_beta); + nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF); }); Kokkos::fence(); @@ -551,14 +544,12 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackRadialSection(C const LevelCacheType& level_cache = ExtrapolatedSmoother::level_cache_; const bool DirBC_Interior = ExtrapolatedSmoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); assert(grid.ntheta() % 2 == 0); const int start_black_radials = 0; @@ -573,8 +564,7 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackRadialSection(C // Kokkos lambda function to execute for each point in the index space KOKKOS_LAMBDA(const int radial_task, const int i_r) { const int i_theta = start_black_radials + radial_task * 2; - nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF, - coeff_beta); + nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF); }); Kokkos::fence(); @@ -591,14 +581,12 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteRadialSection(C const LevelCacheType& level_cache = ExtrapolatedSmoother::level_cache_; const bool DirBC_Interior = ExtrapolatedSmoother::DirBC_Interior_; - assert(level_cache.cacheDensityProfileCoefficients()); assert(level_cache.cacheDomainGeometry()); ConstVector arr = level_cache.arr(); ConstVector att = level_cache.att(); ConstVector art = level_cache.art(); ConstVector detDF = level_cache.detDF(); - ConstVector coeff_beta = level_cache.coeff_beta(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1; @@ -613,8 +601,7 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteRadialSection(C // Kokkos lambda function to execute for each point in the index space KOKKOS_LAMBDA(const int radial_task, const int i_r) { const int i_theta = start_white_radials + radial_task * 2; - nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF, - coeff_beta); + nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art, detDF); }); Kokkos::fence(); From 2546e0be9961ae618d0a7ce0fb3df9e6706daf09 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Tue, 30 Jun 2026 00:13:12 +0200 Subject: [PATCH 5/5] Update applyAscOrtho.inl --- .../ExtrapolatedSmootherTake/applyAscOrtho.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl index 89067fab..8d0c0fbc 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl @@ -583,10 +583,10 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteRadialSection(C assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); - ConstVector detDF = level_cache.detDF(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); + ConstVector detDF = level_cache.detDF(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1;