Skip to content

Commit a359482

Browse files
hannoreinhannorein
committed
transforms
1 parent 1fec1cc commit a359482

6 files changed

Lines changed: 106 additions & 94 deletions

File tree

‎.github/workflows/function_prefix_checker.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- name: Build rebound
1414
run: make -j 24
15-
- name: Checking simulation.o
16-
run: bash .github/function_prefix_checker.bash src/simulation.o
1715
#- name: Checking integrator_bs.o
1816
# run: bash .github/function_prefix_checker.bash src/integrator_bs.o
1917
- name: Checking integrator_eos.o
@@ -36,8 +34,8 @@ jobs:
3634
run: bash .github/function_prefix_checker.bash src/integrator_whfast.o
3735
- name: Checking integrator_whfast512.o
3836
run: bash .github/function_prefix_checker.bash src/integrator_whfast512.o
39-
- name: Checking particle.o
40-
run: bash .github/function_prefix_checker.bash src/particle.o
37+
#- name: Checking particle.o
38+
# run: bash .github/function_prefix_checker.bash src/particle.o
4139
- name: Checking binarydata.o
4240
run: bash .github/function_prefix_checker.bash src/binarydata.o
4341
- name: Checking boundary.o
@@ -54,3 +52,17 @@ jobs:
5452
run: bash .github/function_prefix_checker.bash src/frequency_analysis.o
5553
#- name: Checking gravity.o
5654
# run: bash .github/function_prefix_checker.bash src/gravity.o
55+
#- name: Checking output.o
56+
# run: bash .github/function_prefix_checker.bash src/output.o
57+
#- name: Checking rotations.o
58+
# run: bash .github/function_prefix_checker.bash src/rotations.o
59+
#- name: Checking server.o
60+
# run: bash .github/function_prefix_checker.bash src/server.o
61+
- name: Checking simulation.o
62+
run: bash .github/function_prefix_checker.bash src/simulation.o
63+
- name: Checking simulationarchive.o
64+
run: bash .github/function_prefix_checker.bash src/simulationarchive.o
65+
#- name: Checking tools.o
66+
# run: bash .github/function_prefix_checker.bash src/tools.o
67+
- name: Checking transformations.o
68+
run: bash .github/function_prefix_checker.bash src/transformations.o

‎rebound/tests/test_transformations.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ def test_barycentric(self):
3030

3131
c0 = getc(sim)
3232
cl = rebound.clibrebound
33-
cl.reb_particles_transform_inertial_to_barycentric_posvel(sim._particles,p,sim.N,sim.N)
33+
cl.reb_transformations_inertial_to_barycentric_posvel(sim._particles,p,sim.N,sim.N)
3434

3535
for i in range(sim.N):
3636
sim.particles[i].x = 1234.
3737
sim.particles[i].vx = 1234.
38-
cl.reb_particles_transform_barycentric_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
38+
cl.reb_transformations_barycentric_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
3939

4040
c1 = getc(sim)
4141
for i in range(len(c0)):
4242
self.assertAlmostEqual(c0[i],c1[i],delta=1e-16)
4343

4444
for i in range(sim.N):
4545
sim.particles[i].x = 1234.
46-
cl.reb_particles_transform_barycentric_to_inertial_pos(sim._particles,p,sim.N,sim.N)
46+
cl.reb_transformations_barycentric_to_inertial_pos(sim._particles,p,sim.N,sim.N)
4747

4848
c1 = getc(sim)
4949
for i in range(len(c0)):
@@ -63,12 +63,12 @@ def test_democratichelio(self):
6363
c0 = getc(sim)
6464

6565
cl = rebound.clibrebound
66-
cl.reb_particles_transform_inertial_to_democraticheliocentric_posvel(sim._particles,p,sim.N,sim.N)
66+
cl.reb_transformations_inertial_to_democraticheliocentric_posvel(sim._particles,p,sim.N,sim.N)
6767

6868
for i in range(sim.N):
6969
sim.particles[i].x = 1234.
7070
sim.particles[i].vx = 1234.
71-
cl.reb_particles_transform_democraticheliocentric_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
71+
cl.reb_transformations_democraticheliocentric_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
7272

7373
c1 = getc(sim)
7474

@@ -77,7 +77,7 @@ def test_democratichelio(self):
7777

7878
for i in range(sim.N):
7979
sim.particles[i].x = 1234.
80-
cl.reb_particles_transform_democraticheliocentric_to_inertial_pos(sim._particles,p,sim.N,sim.N)
80+
cl.reb_transformations_democraticheliocentric_to_inertial_pos(sim._particles,p,sim.N,sim.N)
8181

8282
c1 = getc(sim)
8383

@@ -98,12 +98,12 @@ def test_whds(self):
9898
c0 = getc(sim)
9999

100100
cl = rebound.clibrebound
101-
cl.reb_particles_transform_inertial_to_whds_posvel(sim._particles,p,sim.N,sim.N)
101+
cl.reb_transformations_inertial_to_whds_posvel(sim._particles,p,sim.N,sim.N)
102102

103103
for i in range(sim.N):
104104
sim.particles[i].x = 1234.
105105
sim.particles[i].vx = 1234.
106-
cl.reb_particles_transform_whds_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
106+
cl.reb_transformations_whds_to_inertial_posvel(sim._particles,p,sim.N,sim.N)
107107

108108
c1 = getc(sim)
109109

@@ -112,7 +112,7 @@ def test_whds(self):
112112

113113
for i in range(sim.N):
114114
sim.particles[i].x = 1234.
115-
cl.reb_particles_transform_whds_to_inertial_pos(sim._particles,p,sim.N,sim.N)
115+
cl.reb_transformations_whds_to_inertial_pos(sim._particles,p,sim.N,sim.N)
116116

117117
c1 = getc(sim)
118118

@@ -137,12 +137,12 @@ def test_jacoobi(self):
137137
cl = rebound.clibrebound
138138

139139

140-
cl.reb_particles_transform_inertial_to_jacobi_posvel(sim._particles,p,sim._particles,sim.N,sim.N)
140+
cl.reb_transformations_inertial_to_jacobi_posvel(sim._particles,p,sim._particles,sim.N,sim.N)
141141

142142
for i in range(sim.N):
143143
sim.particles[i].x = 1234.
144144
sim.particles[i].vx = 1234.
145-
cl.reb_particles_transform_jacobi_to_inertial_posvel(sim._particles,p,sim._particles,sim.N,sim.N)
145+
cl.reb_transformations_jacobi_to_inertial_posvel(sim._particles,p,sim._particles,sim.N,sim.N)
146146

147147
c1 = getc(sim)
148148

@@ -151,7 +151,7 @@ def test_jacoobi(self):
151151

152152
for i in range(sim.N):
153153
sim.particles[i].x = 1234.
154-
cl.reb_particles_transform_jacobi_to_inertial_pos(sim._particles,p,sim._particles,sim.N,sim.N)
154+
cl.reb_transformations_jacobi_to_inertial_pos(sim._particles,p,sim._particles,sim.N,sim.N)
155155

156156
c1 = getc(sim)
157157

‎src/integrator_saba.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void reb_saba_corrector_step(struct reb_simulation* r, double cc){
130130
switch (r->ri_saba.type/0x100){
131131
case 1: // modified kick
132132
// Calculate normal kick
133-
reb_particles_transform_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
133+
reb_transformations_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
134134
reb_simulation_update_acceleration(r);
135135
// Calculate jerk
136136
reb_integrator_whfast_calculate_jerk(r);
@@ -153,9 +153,9 @@ static void reb_saba_corrector_step(struct reb_simulation* r, double cc){
153153
struct reb_particle* p_temp = ri_whfast->p_temp;
154154

155155
// Calculate normal kick
156-
reb_particles_transform_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
156+
reb_transformations_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
157157
reb_simulation_update_acceleration(r);
158-
reb_particles_transform_inertial_to_jacobi_acc(particles, p_j, particles, N, N);
158+
reb_transformations_inertial_to_jacobi_acc(particles, p_j, particles, N, N);
159159

160160
// make copy of original positions and accelerations
161161
memcpy(p_temp,p_j,r->N*sizeof(struct reb_particle));
@@ -169,9 +169,9 @@ static void reb_saba_corrector_step(struct reb_simulation* r, double cc){
169169
}
170170

171171
// recalculate kick
172-
reb_particles_transform_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
172+
reb_transformations_jacobi_to_inertial_pos(particles, p_j, particles, N, N);
173173
reb_simulation_update_acceleration(r);
174-
reb_particles_transform_inertial_to_jacobi_acc(particles, p_j, particles, N, N);
174+
reb_transformations_inertial_to_jacobi_acc(particles, p_j, particles, N, N);
175175

176176
const double prefact = cc*r->dt*12.;
177177
for (unsigned int i=1;i<N;i++){
@@ -282,7 +282,7 @@ void reb_integrator_saba_step(struct reb_simulation* const r){
282282
if (j>(stages-1)/2){
283283
i = stages-j-1;
284284
}
285-
reb_particles_transform_jacobi_to_inertial_pos(particles, ri_whfast->p_jh, particles, N, N);
285+
reb_transformations_jacobi_to_inertial_pos(particles, ri_whfast->p_jh, particles, N, N);
286286
reb_simulation_update_acceleration(r);
287287
reb_integrator_whfast_interaction_step(r, reb_saba_d[type%0x100][i]*r->dt);
288288
}
@@ -322,7 +322,7 @@ void reb_integrator_saba_synchronize(struct reb_simulation* const r){
322322
reb_integrator_whfast_kepler_step(r, reb_saba_c[type%0x100][0]*r->dt);
323323
reb_integrator_whfast_com_step(r, reb_saba_c[type%0x100][0]*r->dt);
324324
}
325-
reb_particles_transform_jacobi_to_inertial_posvel(r->particles, ri_whfast->p_jh, r->particles, N, N);
325+
reb_transformations_jacobi_to_inertial_posvel(r->particles, ri_whfast->p_jh, r->particles, N, N);
326326
if (ri_saba->keep_unsynchronized){
327327
memcpy(r->ri_whfast.p_jh,sync_pj,r->N*sizeof(struct reb_particle));
328328
free(sync_pj);

0 commit comments

Comments
 (0)