From a9b56b3947cfcf5502ab3f7b1b995f0a2b915937 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 6 Aug 2021 16:59:44 -0400 Subject: [PATCH] Removed old cruft --- descriptionator.sh | 7 ---- param.restart.in | 0 ps_maker.py | 89 ---------------------------------------------- tp_maker.py | 59 ------------------------------ 4 files changed, 155 deletions(-) delete mode 100755 descriptionator.sh delete mode 100644 param.restart.in delete mode 100644 ps_maker.py delete mode 100644 tp_maker.py diff --git a/descriptionator.sh b/descriptionator.sh deleted file mode 100755 index 3d86c8f14..000000000 --- a/descriptionator.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -for file_out in */*.f90; do - file_in="../../swifter-omp/$file_out"; - desc=$(grep "Description" $file_in | sed "s/! Description : //") - sed -i "" "s/Compute Hill sphere radii of massive bodie/$desc/" $file_out -done - diff --git a/param.restart.in b/param.restart.in deleted file mode 100644 index e69de29bb..000000000 diff --git a/ps_maker.py b/ps_maker.py deleted file mode 100644 index 9297ab9a1..000000000 --- a/ps_maker.py +++ /dev/null @@ -1,89 +0,0 @@ -import rebound -import numpy as np - -def setupSimulation(): - sim = rebound.Simulation() - sim.units = ('AU', 'yr', 'Msun') - sim.integrator = "mercurius" - sim.dt = 0.008 - sim.testparticle_type = 1 - sim.move_to_com() - return sim - -sim = setupSimulation() -ps = sim.particles -G_auy = 4 * np.pi * np.pi #G in units of AU^3 year^-2 M_sun^-1 -M_Sun = 1 -M_Sun_to_g = 1.989e33 -M_Sun_to_kg = 1.989e30 -AU_cubed_to_cm_cubed = 3.348e39 -AU_cubed_to_km_cubed = 3.348e24 -year_to_seconds = 3.154e7 -Mtot_disk = 6.006e-6 #~3*M_earth - -OUTFILE = open('pl.in', 'w') - -sim.add( m=1.0, hash="sun") # SUN - Adds a particle of mass 1 - -N_fully = 2001 -N_semi = 0 - -d_bodies = 2.0 * AU_cubed_to_cm_cubed * (1/M_Sun_to_g) #Changes 2 g/cm^3 to 3366515.837 M_sun/AU^3 - -m_semi = Mtot_disk / (N_semi + 2*N_fully) -m_fully = 2 * m_semi - -r_semi = ((3*m_semi)/(4*np.pi*d_bodies))**(1/3) -r_fully = ((3*m_fully)/(4*np.pi*d_bodies))**(1/3) - -np.random.seed(1) - -def uniform(minimum, maximum): - return np.random.uniform()*(maximum-minimum)+minimum - -while sim.N < N_fully: - a_fully = uniform(0.5,1) - e_fully = uniform(0.0, 0.3) - inc_fully = uniform(0.0, 0.3) - O_fully = uniform(0,2*np.pi) - o_fully = uniform(0,2*np.pi) - M_fully = uniform(-np.pi, np.pi) - fully = rebound.Particle(simulation=sim,primary=sim.particles[0],m=m_fully, r=r_fully, a=a_fully, e=e_fully, inc=inc_fully, Omega=O_fully, omega=o_fully, M=M_fully) - sim.add(fully) - -while sim.N < (N_fully+N_semi): - a_semi = uniform(0.5,1) - e_semi = uniform(0.0, 0.3) - inc_semi = uniform(0.0, 0.3) - O_semi = uniform(0,2*np.pi) - o_semi = uniform(0,2*np.pi) - M_semi = uniform(-np.pi, np.pi) - semi = rebound.Particle(simulation=sim,primary=sim.particles[0],m=m_semi, r=r_semi, a=a_semi, e=e_semi, inc=inc_semi, Omega=O_semi, omega=o_semi, M=M_semi) - sim.add(semi) - -x = [ps[i].x for i in range(1, sim.N)] -y = [ps[i].y for i in range(1, sim.N)] -z = [ps[i].z for i in range(1, sim.N)] -vx = [ps[i].vx for i in range(1, sim.N)] -vy = [ps[i].vy for i in range(1, sim.N)] -vz = [ps[i].vz for i in range(1, sim.N)] -m = [ps[i].m for i in range(1, sim.N)] -r = [ps[i].r for i in range(1, sim.N)] -Rhill = [ps[i].a*((ps[i].m/(3*M_Sun))**(0.333333)) for i in range(1, sim.N)] - -with OUTFILE as output: - output.write("%s ! Solar System in unit system AU, M_sun, and years\n" %(sim.N)) - output.write("1 %s\n"%"{:10.8e}".format(M_Sun*G_auy)) - output.write(".0 .0 .0 ! x y z\n") - output.write(".0 .0 .0 !vx vy vz\n") - for i in range (0, (sim.N-1)): - output.write("%s %s %s ! ID / G*Mass / Rhill\n"%((i+2),"{:10.8e}".format(m[i]*G_auy),"{:10.8e}".format(Rhill[i]))) - output.write("%s ! Radius\n"%("{:10.8e}".format(r[i]))) - output.write("%s %s %s ! x y z\n"%("{:10.8e}".format(x[i]),"{:10.8e}".format(y[i]),"{:10.8e}".format(z[i]))) - output.write("%s %s %s ! vx vy vz\n"%("{:10.8e}".format(vx[i]),"{:10.8e}".format(vy[i]),"{:10.8e}".format(vz[i]))) - - - - - - diff --git a/tp_maker.py b/tp_maker.py deleted file mode 100644 index 900283375..000000000 --- a/tp_maker.py +++ /dev/null @@ -1,59 +0,0 @@ -import rebound -import numpy as np - -sim = rebound.Simulation() -sim.units = ('AU', 'yr', 'Msun') -sim.add(m=1.) -sim.move_to_com() -ps = sim.particles - -#!!!!!!! CHANGE THESE THINGS !!!!!!!!!!!!! - -sim.convert_particle_units('AU', 'd', 'Msun') - -N_tp = 3000 -N_ps = 2001 - -#TP_OUTFILE_SWIFT = open('Feb25_tp_2_swift.txt', 'w') -TP_OUTFILE_SWIFTER = open('tp.in', 'w') - -np.random.seed(2) - -#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -def uniform(minimum, maximum): - return np.random.uniform()*(maximum-minimum)+minimum - -while sim.N < (1+N_tp): - a_tp = uniform(1.7,2.0) - e_tp = uniform(0.0, 0.3) - inc_tp = uniform(0.0, 0.3) - O_tp = uniform(0,2*np.pi) - o_tp = uniform(0,2*np.pi) - M_tp = uniform(-np.pi, np.pi) - tp = rebound.Particle(simulation=sim,primary=sim.particles[0],m=0.0, r=0.0, a=a_tp, e=e_tp, inc=inc_tp, Omega=O_tp, omega=o_tp, M=M_tp) - sim.add(tp) - -x_tp = [ps[i].x for i in range(0, sim.N)] -y_tp = [ps[i].y for i in range(0, sim.N)] -z_tp = [ps[i].z for i in range(0, sim.N)] -vx_tp = [ps[i].vx for i in range(0, sim.N)] -vy_tp = [ps[i].vy for i in range(0, sim.N)] -vz_tp = [ps[i].vz for i in range(0, sim.N)] - -#with TP_OUTFILE_SWIFT as output: -# output.write("%s \n" %(N_tp)) #number of particles in the system -# for i in range (1, sim.N): -# output.write("%s %s %s \n" % ("{:10.8e}".format(x_tp[i]), "{:10.8e}".format(y_tp[i]), "{:10.8e}".format(z_tp[i]))) #x y z -# output.write("%s %s %s \n" % ("{:10.8e}".format(vx_tp[i]), "{:10.8e}".format(vy_tp[i]), "{:10.8e}".format(vz_tp[i]))) #vx vy vz -# output.write("0 0 0 0 0 0 0 0 0 0 0 0 0\n") #flags -# output.write("0.0d0 0.0d0 0.0d0 0.0d0 0.0d0\n") #flags -# output.write("0.0d0 0.0d0 0.0d0 0.0d0 0.0d0\n") #flags -# output.write("0.0d0 0.0d0 0.0d0\n") #flags - -with TP_OUTFILE_SWIFTER as output: - output.write("%s \n" %(N_tp)) #number of particles in the system - for i in range (1, sim.N): - output.write("%s \n" % ((i+N_ps) )) #ID - output.write("%s %s %s \n" % ("{:10.8e}".format(x_tp[i]), "{:10.8e}".format(y_tp[i]), "{:10.8e}".format(z_tp[i]))) #x y z - output.write("%s %s %s \n" % ("{:10.8e}".format(vx_tp[i]), "{:10.8e}".format(vy_tp[i]), "{:10.8e}".format(vz_tp[i]))) #vx vy vz \ No newline at end of file