Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert Box to BoxND #4016

Merged
merged 16 commits into from
Aug 2, 2024
Merged

Convert Box to BoxND #4016

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
83e5bff
convert Box to BoxND
AlexanderSinn Jul 3, 2024
cdb79fa
convert BoxIndexer and rename old BoxND
AlexanderSinn Jul 3, 2024
b1a205f
remove AMREX_D_DECL
AlexanderSinn Jul 3, 2024
e6d5350
remove AMREX_SPACEDIM
AlexanderSinn Jul 8, 2024
fb0befe
fix atOffset
AlexanderSinn Jul 8, 2024
71607dd
fix atOffset 2
AlexanderSinn Jul 8, 2024
9b94a22
use auto
AlexanderSinn Jul 8, 2024
d180b8a
add maybe_unused for old NVCC
AlexanderSinn Jul 8, 2024
8b1394b
Merge branch 'development' into convert_Box_to_BoxND
AlexanderSinn Jul 23, 2024
34e0ad3
add ND print
AlexanderSinn Jul 23, 2024
d8f1e4d
fix
AlexanderSinn Jul 23, 2024
1927f98
revert fboxinfo
AlexanderSinn Jul 23, 2024
9ec2f93
add BoxCat BoxSplit BoxShrink BoxExpand BoxResize
AlexanderSinn Jul 28, 2024
8e2167e
add checkOverflow
AlexanderSinn Jul 28, 2024
94c2e5a
add ifdef to checkOverflow
AlexanderSinn Aug 1, 2024
30b5ca3
remove minBox
AlexanderSinn Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix atOffset
  • Loading branch information
@AlexanderSinn
AlexanderSinn committed Jul 8, 2024
commit fb0befed7b0269e633f60b53cd3857ec0ff32292
6 changes: 3 additions & 3 deletions Src/Base/AMReX_Box.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ AMREX_FORCE_INLINE
IntVectND<dim>
BoxND<dim>::atOffset (Long offset) const noexcept
{
IntVectND<dim> result;
IntVectND<dim> result = smallend;

if constexpr (dim > 1) {
GpuArray<Long, dim-1> mult{};
Expand All @@ -942,11 +942,11 @@ BoxND<dim>::atOffset (Long offset) const noexcept
for (int i = dim-1 ; i > 0; --i) {
Long idx = offset / mult[i-1];
offset -= idx * mult[i-1];
result[i] = static_cast<int>(idx);
result[i] += static_cast<int>(idx);
}
}

result[0] = static_cast<int>(offset);
result[0] += static_cast<int>(offset);
}

template<int dim>
Expand Down
Loading