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

Two minor fixes for Cube #55

Merged
merged 3 commits into from
Dec 15, 2023
Merged

Two minor fixes for Cube #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b6d72d
Two minor fixes: 'byPlanes' defined inside Cuda block; missing array …
Dec 11, 2023
2f36307
Typo in density evaluation for Cylinder
Dec 13, 2023
fb8ec19
Change defaults to match pyEXP
Dec 13, 2023
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
1 change: 1 addition & 0 deletions coefs/BasisFactory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,7 @@ namespace BasisClasses
double& tpotR, double& tpotz, double& tpotp)
{
sl->accumulated_eval(R, z, phi, tpotl0, tpotl, tpotR, tpotz, tpotp);
tdens = sl->accumulated_dens_eval(R, z, phi, tdens0);
}

void Cylindrical::accumulate(double x, double y, double z, double mass)
Expand Down
4 changes: 2 additions & 2 deletions src/Cube.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ private:
void cuda_zero_coefs();
//@}

#endif

//! Plane method (default: true)
bool byPlanes;

#endif

//! Cuda batch method (string, default: planes
std::string cuMethod;

Expand Down
24 changes: 12 additions & 12 deletions src/Cylinder.cc
View file
Open in desktop
michael-petersen marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,24 @@ Cylinder::Cylinder(Component* c0, const YAML::Node& conf, MixtureBasis *m) :
rcylmin = 0.001; // Should only change these two in
rcylmax = 20.0; // extreme circumstances

ncylnx = 128; // These defaults should do fine in
ncylnx = 256; // These defaults should do fine in
ncylny = 128; // most cases, as well
ncylr = 2000;

acyl = 1.0;
nmaxfid = 24;
lmaxfid = 36;
mmax = 4;
acyl = 0.01;
lmaxfid = 128;
nmaxfid = 64;
mmax = 6;
mlim = -1;
hcyl = 1.0;
nmax = 10;
ncylodd = -1;
hcyl = 0.002;
nmax = 18;
ncylodd = 9;
ncylrecomp = -1;

rnum = 100;
pnum = 40;
tnum = 40;
ashift = 0.25;
rnum = 200;
pnum = 1;
tnum = 80;
ashift = 0.0;

vflag = 0;
eof = 1;
Expand Down
1 change: 1 addition & 0 deletions utils/ICs/cubeICs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <random>
#include <string>
#include <vector>
#include <array>

#include <cxxopts.H>

Expand Down
Loading