Skip to content
Snippets Groups Projects
Commit febcce80 authored by arnaud.devevey's avatar arnaud.devevey
Browse files

12h20

parent 868c8ae9
No related branches found
No related tags found
No related merge requests found
Pipeline #6095 failed
No preview for this file type
...@@ -45,7 +45,6 @@ int main(int argc, char **argv) { ...@@ -45,7 +45,6 @@ int main(int argc, char **argv) {
double zone = 1e10; double zone = 1e10;
Box box_initial = new_box(-zone, zone, zone, -zone); Box box_initial = new_box(-zone, zone, zone, -zone);
Galaxy* galaxy = create_and_init_galaxy(nb_stars, box_initial, DELTA_T); Galaxy* galaxy = create_and_init_galaxy(nb_stars, box_initial, DELTA_T);
...@@ -94,11 +93,11 @@ Galaxy* create_and_init_galaxy(int nb_bodies, Box box, double delta_t) { ...@@ -94,11 +93,11 @@ Galaxy* create_and_init_galaxy(int nb_bodies, Box box, double delta_t) {
} else { } else {
double m_i = random_mass(); double m_i = random_mass();
Vector v_i = random_speed(r_i, m_i);
Vector r_i; Vector r_i;
do { do {
r_i = random_position(); r_i = random_position();
} while (!is_inside(box, r_i)); } while (!is_inside(box, r_i));
Vector v_i = random_speed(r_i, m_i);
temp = new_star_vel(r_i, v_i, *v_null, m_i, 0.0); temp = new_star_vel(r_i, v_i, *v_null, m_i, 0.0);
......
...@@ -62,6 +62,7 @@ void resize_galaxy(Galaxy* galaxy); ...@@ -62,6 +62,7 @@ void resize_galaxy(Galaxy* galaxy);
// fait les tests de toutes les librairies // fait les tests de toutes les librairies
void tests(); void tests();
void tests_galaxy();
......
No preview for this file type
...@@ -20,6 +20,7 @@ typedef struct __quadtree { ...@@ -20,6 +20,7 @@ typedef struct __quadtree {
/* * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * *
* * * *
* --- PROTOTYPES --- * * --- PROTOTYPES --- *
......
No preview for this file type
...@@ -131,19 +131,17 @@ Star* super_star(Star* list_stars, int selection, int size_list) { ...@@ -131,19 +131,17 @@ Star* super_star(Star* list_stars, int selection, int size_list) {
} }
Vector* resultante(Vector* list_stars, int size_list) { Vector* resultante(Star** list_stars, int size_list) {
Vector* Fi = new_vec(0.0, 0.0); Vector* Fi = new_vec(0.0, 0.0);
for (int i = 0; i < size_list; i++) { for (int i = 0; i < size_list; i++) {
for (int j = 0; j < size_list; j++) { for (int j = 0; j < size_list; j++) {
if (j != i) { if (j != i) {
/*
Vector* rj_ri = sub_vec(&(list_stars[j] -> pos), &(list_stars[i] -> pos)); Vector* rj_ri = sub_vec(&(list_stars[j] -> pos), &(list_stars[i] -> pos));
int G_mi_mj = FORCE_GRAVITATION * list_stars[i] -> mass * list_stars[j] -> mass; int G_mi_mj = FORCE_GRAVITATION * list_stars[i] -> mass * list_stars[j] -> mass;
Vector* temp = mul_vec(rj_ri, G_mi_mj); Vector* temp = mul_vec(rj_ri, G_mi_mj);
Fi = add_vec(Fi, temp); Fi = add_vec(Fi, temp);
*/
} }
} }
} }
......
...@@ -48,7 +48,7 @@ void print_star(const Star* const star); ...@@ -48,7 +48,7 @@ void print_star(const Star* const star);
// retourne l'accélération d'une étoile d'après toutes les autres d'une liste // retourne l'accélération d'une étoile d'après toutes les autres d'une liste
Vector* resultante(Vector* list_stars, int size_list); Vector* resultante(Star** list_stars, int size_list);
// calcule la position de l'étoile après avoir subi la force résultante des autres vecteurs (deuxième loi de Newton) // calcule la position de l'étoile après avoir subi la force résultante des autres vecteurs (deuxième loi de Newton)
void new_position(Star* star, Vector resultante); void new_position(Star* star, Vector resultante);
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment