Skip to content

Patch accessor stores mprts #355

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

Closed
JamesMcClung wants to merge 2 commits into from
Closed

Patch accessor stores mprts #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2a8a1
const_accessor_simple: store ref to mprts instead of accessor
JamesMcClung May 5, 2025
01d794a
mparticles_patch_cuda: fix call to ctor
JamesMcClung May 5, 2025
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
13 changes: 6 additions & 7 deletions src/include/const_accessor_simple.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#pragma once

// ======================================================================
Expand Down Expand Up @@ -181,20 +180,20 @@ struct ConstAccessorPatchSimple
uint n_;
};

ConstAccessorPatchSimple(const ConstAccessorSimple& accessor, int p)
: accessor_{accessor}, p_{p}
ConstAccessorPatchSimple(const Mparticles& mprts, int p)
: mprts_{mprts}, p_{p}
{}

const_iterator begin() const { return {*this, 0}; }
const_iterator end() const { return {*this, size()}; }
ConstParticleProxy operator[](int n) const
{
return {accessor_.data(p_)[n], accessor_.mprts(), p_};
return {mprts_[p_].begin()[n], mprts_, p_};
}
uint size() const { return accessor_.size(p_); }
uint size() const { return mprts_[p_].size(); }

private:
const ConstAccessorSimple& accessor_;
const Mparticles& mprts_;
const int p_;
};

Expand All @@ -210,7 +209,7 @@ struct ConstAccessorSimple

ConstAccessorSimple(Mparticles& mprts) : mprts_{mprts} {}

Patch operator[](int p) const { return {*this, p}; }
Patch operator[](int p) const { return {mprts_, p}; }
const Mparticles& mprts() const { return mprts_; }
uint size(int p) const { return mprts_[p].size(); }
typename Mparticles::Patch::iterator data(int p) const
Expand Down
2 changes: 1 addition & 1 deletion src/libpsc/cuda/mparticles_patch_cuda.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct ConstAccessorCuda
off_{mprts.get_offsets()}
{}

Patch operator[](int p) const { return {*this, p}; }
Patch operator[](int p) const { return {mprts_, p}; }
Mparticles& mprts() const { return mprts_; }
const _Particle* data(int p) const { return &data_[off_[p]]; }
uint size(int p) const { return off_[p + 1] - off_[p]; }
Expand Down