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

A few bugs & an extra feature #749

Closed
wants to merge 5 commits into from
Closed

A few bugs & an extra feature #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37ed3ef
ms_close retesting
Jan 30, 2024
00590fe
ms_close
Jan 30, 2024
3555ed6
accretion
Jan 31, 2024
d2b752a
Add Example Notebook
Feb 1, 2024
5b3b18f
tests fix
Feb 1, 2024
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
35 changes: 35 additions & 0 deletions examples/accretion/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
export OPENGL=0# Set this to 1 to enable OpenGL
export SERVER=1# Set this to 1 to enable the visualization web server
include ../../src/Makefile.defs

# CCPROBLEM is defined in Makefile.defs to allow for
# a compact cross platform Makefile
.PHONY: all librebound
all: problem.c librebound
@echo "Compiling $< ..."
$(CCPROBLEM)
@echo ""
@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
@echo ""

librebound:
@echo "Compiling shared library $(LIBREBOUND) ..."
$(MAKE) -C ../../src/
@-$(RM) $(LIBREBOUND)
@$(LINKORCOPYLIBREBOUND)
@echo ""

clean:
@echo "Cleaning up shared library $(LIBREBOUND) ..."
$(MAKE) -C ../../src/ clean
@echo "Cleaning up local directory ..."
@-$(RM) $(LIBREBOUND)
@-$(RM) $(EXEREBOUND)

rebound_webgl.html: problem.c
@echo "Compiling problem.c with emscripten (WebGL enabled)..."
emcc -O3 -I../../src/ ../../src/*.c problem.c -DSERVERHIDEWARNING -DOPENGL=1 -sSTACK_SIZE=655360 -s USE_GLFW=3 -s FULL_ES3=1 -sASYNCIFY -sSINGLE_FILE -sEXPORTED_RUNTIME_METHODS="callMain" --shell-file ../../web_client/shell_rebound_webgl.html -o rebound_webgl.html

rebound_console.html: problem.c
@echo "Compiling problem.c with emscripten (WebGL disabled)..."
emcc -O3 -I../../src/ ../../src/*.c problem.c -DSERVERHIDEWARNING -sSTACK_SIZE=655360 -sASYNCIFY -sSINGLE_FILE -sEXPORTED_RUNTIME_METHODS="callMain" --shell-file ../../web_client/shell_rebound_console.html -o rebound_console.html
189 changes: 189 additions & 0 deletions examples/accretion/problem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
#include <stdio.h>
#include <stdlib.h>
//#include <unistd.h>
#include <math.h>
#include <time.h>
#include "rebound.h"

void heartbeat(struct reb_simulation* r);

double e_init; // initial energy
int Nparticles = 1000;
double tmax = 6*M_PI;

char title[100] = "trace_nc_ns";
char title_remove[100] = "rm -rf trace_nc_ns";

char remove_snapshots[100] = "rm -rf *trace_snapshot_*";
char snapshot_1[100] = "trace_snapshot_1";
char snapshot_2[100] = "trace_snapshot_2";
char snapshot_3[100] = "trace_snapshot_3";
char snapshot_4[100] = "trace_final_orbit_snapshot_4";

double snap1_time = 0.0;
double snap2_time = 10.0 * 2 * M_PI;
double snap3_time = 500. * 2 * M_PI;
int snap1=1;
int snap2=1;
int snap3=1;

clock_t begin;
// accretion of the moon
int main(int argc, char* argv[]){
struct reb_simulation* r = reb_simulation_create();
r->integrator = REB_INTEGRATOR_TRACE;
//r->ri_ias15.adaptive_mode=2;

r->dt = 0.2;//0.003 / 10.56789;
//r->integrator = REB_INTEGRATOR_IAS15;
//r->softening = 3e-8;
//r->collision = REB_COLLISION_DIRECT;
//r->collision_resolve = reb_collision_resolve_merge;

// Initialize masses
struct reb_particle earth = {0};
earth.m = 1;
double earth_r = 1./2.9;//0.00592; // in units of Roche radius
earth.r = earth_r;
reb_simulation_add(r, earth);

r->rand_seed = 1;
r->heartbeat = heartbeat;

double lunar_mass = 0.0123;

double mtot = 0.;
double rad_tot = 0;
// Test particles
for (unsigned int i = 0; i < Nparticles; i++){
double m = reb_random_powerlaw(r, 3.2e-7, 3.2e-4, -1.);
mtot += m;
double rad = pow(m, 1./3.) * 1.185 * earth_r;
rad_tot += rad;
double a = reb_random_powerlaw(r, earth_r, 1.5, -1.);
double e = reb_random_uniform(r, 0., 0.95);
double inc = reb_random_uniform(r, 0, 50. * M_PI / 180.);
double Omega = reb_random_uniform(r, 0, 2 * M_PI);
double omega = reb_random_uniform(r, 0, 2 * M_PI);
double f = reb_random_uniform(r, 0, 2 * M_PI);
reb_simulation_add_fmt(r, "primary m r a e inc Omega omega f", earth, m, rad, a, e, inc, Omega, omega, f);
}
//printf("%f\n", mtot/lunar_mass);
//printf("%f\n", rad_tot/Nparticles);
system(title_remove);
//system(remove_snapshots);
//exit(1);

reb_simulation_move_to_com(r); // This makes sure the planetary systems stays within the computational domain and doesn't drift.

/*
FILE* f = fopen(snapshot_1,"a");
for (unsigned int i = 1; i < r->N; i++){
struct reb_particle* p = &r->particles[i];

double dx = p->x - e->x;
double dy = p->y - e->y;
double dz = p->z - e->z;

double r = sqrt(dx*dx+dy*dy);
fprintf(f, "%f,%f,%f\n",p->m,r,dz);
}
fclose(f);
*/

e_init = reb_simulation_energy(r);
//printf("Initial Energy: %e\n", e_init);
begin = clock();
reb_simulation_integrate(r, tmax);
//printf("Final Energy: %e\n", reb_tools_energy(r));
//printf("Conservation: %f\n", (reb_tools_energy(r) - e_init) / e_init);
//printf("Final N: %d\n", r->N);
//printf("Time Spent: %f\n", time_spent);
/*
FILE* f4 = fopen(snapshot_4,"a");
struct reb_particle* e = &r->particles[0];
for (unsigned int i = 1; i < r->N; i++){
struct reb_particle* p = &r->particles[i];
struct reb_orbit o = reb_tools_particle_to_orbit(r->G, *p, *e);

double dx = p->x - e->x;
double dy = p->y - e->y;
double dz = p->z - e->z;

double r = sqrt(dx*dx+dy*dy);
fprintf(f4, "%f,%f,%f,%f,%f,%f\n",p->m,r,dz,o.a,o.e,o.inc);
}
fclose(f4);
*/
reb_simulation_free(r);
}

void heartbeat(struct reb_simulation* r){
if (reb_simulation_output_check(r, 0.01*2.*M_PI)){
reb_simulation_output_timing(r, tmax);
}
/*
if (snap2 && r->t > snap2_time){
struct reb_particle* e = &r->particles[0];
snap2 = 0;
FILE* f = fopen(snapshot_2,"a");
for (unsigned int i = 1; i < r->N; i++){
struct reb_particle* p = &r->particles[i];

double dx = p->x - e->x;
double dy = p->y - e->y;
double dz = p->z - e->z;

double r = sqrt(dx*dx+dy*dy);
fprintf(f, "%f,%f,%f\n",p->m,r,dz);
}
fclose(f);
}

if (snap3 && r->t > snap3_time){
struct reb_particle* e = &r->particles[0];
snap3 = 0;
FILE* f = fopen(snapshot_3,"a");
for (unsigned int i = 1; i < r->N; i++){
struct reb_particle* p = &r->particles[i];

double dx = p->x - e->x;
double dy = p->y - e->y;
double dz = p->z - e->z;

double r = sqrt(dx*dx+dy*dy);
fprintf(f, "%f,%f,%f\n",p->m,r,dz);
}
fclose(f);
}
*/
//if (r->t < 10. * 2 * M_PI){

if (reb_simulation_output_check(r, 0.1)){
clock_t end = clock();
double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
FILE* f = fopen(title,"a");
fprintf(f, "%f,%e,%d,%e\n", r->t, fabs((reb_simulation_energy(r) - e_init) / e_init), r->N-1, time_spent);
//fprintf(f, "%f,%d\n", r->t, r->N-1);
fclose(f);
}

//}
/*
if (r->t > 10. * 2 * M_PI && r->t < 10. * 2 * M_PI){
if (reb_output_check(r, 10. * 2.*M_PI)){
FILE* f = fopen(title,"a");
fprintf(f, "%f,%e,%d\n", r->t, fabs((reb_tools_energy(r) - e_init) / e_init), r->N-1);
fclose(f);
}
}

if (r->t > 100. * 2 * M_PI){
if (reb_output_check(r, 100. * 2.*M_PI)){
FILE* f = fopen(title,"a");
fprintf(f, "%f,%e,%d\n", r->t, fabs((reb_tools_energy(r) - e_init) / e_init), r->N-1);
fclose(f);
}
}
*/
}
35 changes: 35 additions & 0 deletions examples/ms_close/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
export OPENGL=0# Set this to 1 to enable OpenGL
export SERVER=1# Set this to 1 to enable the visualization web server
include ../../src/Makefile.defs

# CCPROBLEM is defined in Makefile.defs to allow for
# a compact cross platform Makefile
.PHONY: all librebound
all: problem.c librebound
@echo "Compiling $< ..."
$(CCPROBLEM)
@echo ""
@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
@echo ""

librebound:
@echo "Compiling shared library $(LIBREBOUND) ..."
$(MAKE) -C ../../src/
@-$(RM) $(LIBREBOUND)
@$(LINKORCOPYLIBREBOUND)
@echo ""

clean:
@echo "Cleaning up shared library $(LIBREBOUND) ..."
$(MAKE) -C ../../src/ clean
@echo "Cleaning up local directory ..."
@-$(RM) $(LIBREBOUND)
@-$(RM) $(EXEREBOUND)

rebound_webgl.html: problem.c
@echo "Compiling problem.c with emscripten (WebGL enabled)..."
emcc -O3 -I../../src/ ../../src/*.c problem.c -DSERVERHIDEWARNING -DOPENGL=1 -sSTACK_SIZE=655360 -s USE_GLFW=3 -s FULL_ES3=1 -sASYNCIFY -sSINGLE_FILE -sEXPORTED_RUNTIME_METHODS="callMain" --shell-file ../../web_client/shell_rebound_webgl.html -o rebound_webgl.html

rebound_console.html: problem.c
@echo "Compiling problem.c with emscripten (WebGL disabled)..."
emcc -O3 -I../../src/ ../../src/*.c problem.c -DSERVERHIDEWARNING -sSTACK_SIZE=655360 -sASYNCIFY -sSINGLE_FILE -sEXPORTED_RUNTIME_METHODS="callMain" --shell-file ../../web_client/shell_rebound_console.html -o rebound_console.html
Loading
Loading