Skip to content

Parallel tipsy #156

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

Merged
michael-petersen merged 17 commits into from
Sep 29, 2025
Merged

Parallel tipsy #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
86fde7a
Enable parallel reading from a Tipsy file
Aug 7, 2025
38bae87
Update exputil/SLGridMP2.cc
The9Cat Aug 7, 2025
b4379ba
Update exputil/SLGridMP2.cc
The9Cat Aug 7, 2025
56c71ca
Need to reposition file pointer after reading each particle type
Aug 7, 2025
91afa01
Merge branch 'parallelTipsy' of github.com:EXP-code/EXP into parallel…
Aug 7, 2025
1291db3
Promote stream arithmetic to unsigned long
Aug 7, 2025
40ee042
Add losts more comments [no CI]
Aug 7, 2025
0bd7607
Added more explanation for setMPI()
Aug 8, 2025
5e2d557
Save native Tipsy particle offsets per node for creating unique seque…
Aug 10, 2025
85945c8
Assign EXP index from native Tipsy beginning with 1
Aug 10, 2025
4eaa424
Typo in Centering routine; missing count variable update
Aug 10, 2025
9db73e1
Updated Bonsai reader variant to v2
Aug 13, 2025
83ef0bd
Change Tipsy tag from ChaNGa to Bonsai1; since I can't figure out wha…
Aug 13, 2025
b609af3
Update include/tipsy.H
The9Cat Aug 17, 2025
b583156
Update expui/Centering.cc
The9Cat Aug 17, 2025
c9a8370
Remove debug cruft
Aug 17, 2025
57cc9f2
Merge branch 'devel' into parallelTipsy
michael-petersen Sep 29, 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
2 changes: 1 addition & 1 deletion expui/Centering.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ namespace Utility

int count = 0;
for (auto it=combo.rbegin(); it!=combo.rend(); it++) {
if (count > Nsort) break;
if (++count > Nsort) break;
for (int k=0; k<3; k++)
ctr[k] += it->first * points[it->second].get(k);
dentot += it->first;
Expand Down
38 changes: 28 additions & 10 deletions exputil/ParticleReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace PR {
{ {"Gas", 0}, {"Halo", 1}, {"Disk", 2}, {"Bulge", 3}, {"Stars", 4}, {"Bndry", 5}};


GadgetNative::GadgetNative(const std::vector<std::string>& files, bool verbose)
GadgetNative::GadgetNative(const std::vector<std::string>& files, bool verbose) : ParticleReader()
{
_files = files; // Copy file list (bunch)
_verbose = verbose;
Expand Down Expand Up @@ -317,7 +317,7 @@ namespace PR {
{ {"Gas", 0}, {"Halo", 1}, {"Disk", 2}, {"Bulge", 3}, {"Stars", 4}, {"Bndry", 5}};


GadgetHDF5::GadgetHDF5(const std::vector<std::string>& files, bool verbose)
GadgetHDF5::GadgetHDF5(const std::vector<std::string>& files, bool verbose) : ParticleReader()
{
_files = files;
_verbose = verbose;
Expand Down Expand Up @@ -705,7 +705,7 @@ namespace PR {
}


PSPhdf5::PSPhdf5(const std::vector<std::string>& files, bool verbose)
PSPhdf5::PSPhdf5(const std::vector<std::string>& files, bool verbose) : ParticleReader()
{
_files = files;
_verbose = verbose;
Expand Down Expand Up @@ -1896,7 +1896,7 @@ namespace PR {

std::vector<std::string> ParticleReader::readerTypes
{"PSPout", "PSPspl", "GadgetNative", "GadgetHDF5", "PSPhdf5",
"TipsyNative", "TipsyXDR", "Bonsai"};
"TipsyNative", "TipsyXDR", "Bonsai1", "Bonsai"};


std::vector<std::vector<std::string>>
Expand Down Expand Up @@ -2031,7 +2031,8 @@ namespace PR {
exit(1);
}
#endif

else if (reader.find("Bonsai1") == 0)
ret = std::make_shared<Tipsy>(file, Tipsy::TipsyType::bonsai1, verbose);
else if (reader.find("Bonsai") == 0)
ret = std::make_shared<Tipsy>(file, Tipsy::TipsyType::bonsai, verbose);
else {
Expand Down Expand Up @@ -2071,6 +2072,8 @@ namespace PR {
// Native tipsy with ID conversion
else if (ttype == TipsyType::bonsai)
ps = std::make_shared<TipsyReader::TipsyNative>(file);
else if (ttype == TipsyType::bonsai1)
ps = std::make_shared<TipsyReader::TipsyNative>(file);
// Make a tipsy xdr reader
else {
#ifdef HAVE_XDR
Expand Down Expand Up @@ -2110,6 +2113,8 @@ namespace PR {
ps = std::make_shared<TipsyReader::TipsyNative>(*curfile);
else if (ttype == TipsyType::bonsai)
ps = std::make_shared<TipsyReader::TipsyNative>(*curfile);
else if (ttype == TipsyType::bonsai1)
ps = std::make_shared<TipsyReader::TipsyNative>(*curfile);
else {
#ifdef HAVE_XDR
ps = std::make_shared<TipsyReader::TipsyXDR>(*curfile);
Expand All @@ -2125,7 +2130,7 @@ namespace PR {
}

Tipsy::Tipsy(const std::string& file, TipsyType Type,
bool verbose)
bool verbose) : ParticleReader()
{
ttype = Type;
files.push_back(file);
Expand All @@ -2137,7 +2142,7 @@ namespace PR {
}

Tipsy::Tipsy(const std::vector<std::string>& filelist, TipsyType Type,
bool verbose)
bool verbose) : ParticleReader()
{
files = filelist;

Expand Down Expand Up @@ -2184,7 +2189,8 @@ namespace PR {
P.pos[k] = ps->gas_particles[pcount].pos[k];
P.vel[k] = ps->gas_particles[pcount].vel[k];
}
if (ttype == TipsyType::bonsai) P.indx = ps->gas_particles[pcount].ID();
P.indx = ps->getIndexOffset(TipsyReader::Ptype::gas) + pcount + 1;

pcount++;
return;
}
Expand All @@ -2196,7 +2202,13 @@ namespace PR {
P.pos[k] = ps->dark_particles[pcount].pos[k];
P.vel[k] = ps->dark_particles[pcount].vel[k];
}
if (ttype == TipsyType::bonsai) P.indx = ps->dark_particles[pcount].ID();
if (ttype == TipsyType::bonsai)
P.indx = ps->dark_particles[pcount].ID2();
else if (ttype == TipsyType::bonsai1)
P.indx = ps->dark_particles[pcount].ID();
else
P.indx = ps->getIndexOffset(TipsyReader::Ptype::dark) + pcount + 1;

pcount++;
return;
}
Expand All @@ -2208,7 +2220,13 @@ namespace PR {
P.pos[k] = ps->star_particles[pcount].pos[k];
P.vel[k] = ps->star_particles[pcount].vel[k];
}
if (ttype == TipsyType::bonsai) P.indx = ps->star_particles[pcount].ID();
if (ttype == TipsyType::bonsai)
P.indx = ps->star_particles[pcount].ID2();
else if (ttype == TipsyType::bonsai1)
P.indx = ps->star_particles[pcount].ID();
else
P.indx = ps->getIndexOffset(TipsyReader::Ptype::star) + pcount + 1;

pcount++;
return;
}
Expand Down
1 change: 1 addition & 0 deletions exputil/SLGridMP2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2910,6 +2910,7 @@ void SLGridSlab::compute_table(struct TableSlab* table, int KX, int KY)

if (VERBOSE && iflag[i] != 0) {


if (iflag[i] > -10) {
cout << std::setw(14) << "x"
<< std::setw(25) << "u(x)"
Expand Down
4 changes: 2 additions & 2 deletions include/ParticleReader.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ namespace PR
public:

//! Default constructor
PSP(bool verbose) : VERBOSE(verbose) { init(); }
PSP(bool verbose) : VERBOSE(verbose), ParticleReader() { init(); }

//! Destructor
virtual ~PSP() { if (in.is_open()) in.close(); }
Expand Down Expand Up @@ -573,7 +573,7 @@ namespace PR

public:

enum class TipsyType { native, xdr, bonsai };
enum class TipsyType { native, xdr, bonsai1, bonsai };

private:
//! List of files
Expand Down
Loading