yohai/phigrape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New timing, moved MPI reduction into function call, started converting some of the pointers into std::vectors

Browse source
This commit is contained in:
Yohai Meiron 2020-05-09 18:21:01 -04:00
parent 1a438449a8
commit 329dd2ca4d
5 changed files with 88 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

9
black_holes.h
View file

@ -46,7 +46,7 @@ public:
const double dt_bh, // pn_usage should be const
double3& acc1, double3& acc2,
double3& jrk1, double3& jrk2);
void write_bh_data(double time_cur, double m[], double3 x[], double3 v[], double pot[], double3 a[], double3 adot[], double dt[]);
void write_bh_data(double time_cur, double m[], double3 x[], double3 v[], const std::vector<double>& pot, double3 a[], double3 adot[], double dt[]);
public: //TODO make private
double m1, m2;
int count;
@ -85,7 +85,7 @@ private:
class Binary_smbh_influence_sphere_output {
public:
Binary_smbh_influence_sphere_output(double factor, int N, double *m, double3 *x, double3 *v, double *pot, double *dt)
Binary_smbh_influence_sphere_output(double factor, int N, double *m, double3 *x, double3 *v, const std::vector<double>& pot, double *dt)
: factor(factor), m(m), x(x), v(v), pot(pot), dt(dt)
{
inf_event.assign(N, 0);
@ -96,10 +96,11 @@ public:
{
fclose(out);
}
void operator()(int ind_act[], int n_act, double timesteps, double time_cur);
void operator()(const std::vector<int>& ind_act, int n_act, double timesteps, double time_cur);
private:
double factor;
double *m, *pot, *dt;
const std::vector<double>& pot;
double *m, /**pot,*/ *dt;
double3 *x, *v;
std::vector<int> inf_event;
FILE *out;