From aaffabf1a241a7dc544eb71dd14a8b6df8a22c46 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Mon, 10 Aug 2026 23:31:54 +0200 Subject: [PATCH 1/4] Remove detDF parameter from function calls Removed detDF parameter from nodeApplyAscOrthoCircleTake and nodeApplyAscOrthoRadialTake function calls. --- include/Smoother/SmootherTake/applyAscOrtho.inl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/Smoother/SmootherTake/applyAscOrtho.inl b/include/Smoother/SmootherTake/applyAscOrtho.inl index 0e5fb818..6658225c 100644 --- a/include/Smoother/SmootherTake/applyAscOrtho.inl +++ b/include/Smoother/SmootherTake/applyAscOrtho.inl @@ -7,7 +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& art) { KOKKOS_ASSERT(i_r >= 0 && i_r < grid.numberSmootherCircles()); @@ -59,7 +59,7 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoRadialTake(const int i_r, co bool DirBC_Interior, ConstVector& x, ConstVector& rhs, Vector& result, ConstVector& arr, ConstVector& att, - ConstVector& art, ConstVector& detDF) + ConstVector& art) { KOKKOS_ASSERT(i_r >= grid.numberSmootherCircles() && i_r < grid.nr()); @@ -131,7 +131,6 @@ void SmootherTake::applyAscOrthoBlackCircleSection(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; @@ -146,7 +145,7 @@ void SmootherTake::applyAscOrthoBlackCircleSection(ConstVector::applyAscOrthoWhiteCircleSection(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; @@ -182,7 +180,7 @@ void SmootherTake::applyAscOrthoWhiteCircleSection(ConstVector::applyAscOrthoBlackRadialSection(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; @@ -218,7 +215,7 @@ void SmootherTake::applyAscOrthoBlackRadialSection(ConstVector::applyAscOrthoWhiteRadialSection(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; @@ -254,7 +250,7 @@ void SmootherTake::applyAscOrthoWhiteRadialSection(ConstVector Date: Mon, 10 Aug 2026 23:33:45 +0200 Subject: [PATCH 2/4] Remove detDF parameter from nodeApplyAscOrtho functions --- .../ExtrapolatedSmootherTake/applyAscOrtho.inl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl index 8d0c0fbc..10324c6f 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl @@ -7,7 +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& art) { KOKKOS_ASSERT(i_r >= 0 && i_r <= grid.numberSmootherCircles()); @@ -188,7 +188,7 @@ static KOKKOS_INLINE_FUNCTION void nodeApplyAscOrthoRadialTake(const int i_r, co const bool DirBC_Interior, ConstVector& x, ConstVector& rhs, Vector& result, ConstVector& arr, ConstVector& att, - ConstVector& art, ConstVector& detDF) + ConstVector& art) { assert(i_r >= grid.numberSmootherCircles() - 1 && i_r < grid.nr()); @@ -475,7 +475,6 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackCircleSection(C 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; @@ -490,7 +489,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); + nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art); }); Kokkos::fence(); @@ -512,7 +511,6 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteCircleSection(C 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; @@ -527,7 +525,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); + nodeApplyAscOrthoCircleTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art); }); Kokkos::fence(); @@ -549,7 +547,6 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackRadialSection(C 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; @@ -564,7 +561,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); + nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art); }); Kokkos::fence(); @@ -586,7 +583,6 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteRadialSection(C 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; @@ -601,7 +597,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); + nodeApplyAscOrthoRadialTake(i_r, i_theta, grid, DirBC_Interior, x, rhs, temp, arr, att, art); }); Kokkos::fence(); From dd9b269845eaaed9844d3dc0eeb978e1a3b6d381 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Mon, 10 Aug 2026 23:46:08 +0200 Subject: [PATCH 3/4] Refactor variable declarations for consistency --- .../Smoother/SmootherTake/applyAscOrtho.inl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/Smoother/SmootherTake/applyAscOrtho.inl b/include/Smoother/SmootherTake/applyAscOrtho.inl index 6658225c..d8b0af86 100644 --- a/include/Smoother/SmootherTake/applyAscOrtho.inl +++ b/include/Smoother/SmootherTake/applyAscOrtho.inl @@ -128,9 +128,9 @@ void SmootherTake::applyAscOrthoBlackCircleSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); /* 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; @@ -163,9 +163,9 @@ void SmootherTake::applyAscOrthoWhiteCircleSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); /* 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; @@ -198,9 +198,9 @@ void SmootherTake::applyAscOrthoBlackRadialSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); assert(grid.ntheta() % 2 == 0); const int start_black_radials = 0; @@ -233,9 +233,9 @@ void SmootherTake::applyAscOrthoWhiteRadialSection(ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1; From 784d5d14ab72ddd24010e268e9173d263d712ae8 Mon Sep 17 00:00:00 2001 From: Julian Litz <91479202+julianlitz@users.noreply.github.com> Date: Mon, 10 Aug 2026 23:47:13 +0200 Subject: [PATCH 4/4] Refactor variable declarations for consistency --- .../applyAscOrtho.inl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl index 10324c6f..ef66592f 100644 --- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl +++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/applyAscOrtho.inl @@ -472,9 +472,9 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackCircleSection(C assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); /* 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; @@ -508,9 +508,9 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteCircleSection(C assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); /* 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; @@ -544,9 +544,9 @@ void ExtrapolatedSmootherTake::applyAscOrthoBlackRadialSection(C assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); assert(grid.ntheta() % 2 == 0); const int start_black_radials = 0; @@ -580,9 +580,9 @@ void ExtrapolatedSmootherTake::applyAscOrthoWhiteRadialSection(C assert(level_cache.cacheDomainGeometry()); - ConstVector arr = level_cache.arr(); - ConstVector att = level_cache.att(); - ConstVector art = level_cache.art(); + ConstVector arr = level_cache.arr(); + ConstVector att = level_cache.att(); + ConstVector art = level_cache.art(); assert(grid.ntheta() % 2 == 0); const int start_white_radials = 1;