aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hoffmann <volker@cheleb.net>2015-08-11 07:56:52 +0200
committerVolker Hoffmann <volker@cheleb.net>2015-08-11 07:56:52 +0200
commit30e5d1a8484c330c878b987a7ae08a97d0f7eb6d (patch)
tree9d177ece014084284eee36f7ae03818a4ce09aaf
parent340f1b5cb92f354c8bfe847f07db2414b688121e (diff)
feat: return impactor diameter in addition to mass
-rw-r--r--Helpers/impact_helpers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Helpers/impact_helpers.py b/Helpers/impact_helpers.py
index 956de95..30c3ea4 100644
--- a/Helpers/impact_helpers.py
+++ b/Helpers/impact_helpers.py
@@ -148,7 +148,7 @@ def impactor_mass(D, v_i, theta, rho_t=3.34, rho_i=2.00, grav=1.622):
M = 4.0/3.0 * np.pi * (L/2.0)**3.0 * rho_i/1000.0*(1000.0*100.0)**(3.0)
# Return [Float or Numpy Float Array; Same as D]
- return M
+ return M, L
def scale_production_function(crc_all):
@@ -179,7 +179,7 @@ def scale_production_function(crc_all):
# the total mass delivered over these impacts. This sets the mass of our
# simulation particles. Impact velocity and angle are median values
# taken from Test Particle simulations.
- M = impactor_mass(D, 12.0, 18.5 * C.d2r)
+ M, _ = impactor_mass(D, 12.0, 18.5 * C.d2r)
mscale = sp.integrate.simps((dNdD*M)[D>1.0], x=D[D>1.0])
mscale *= nscale
mscale *= C.Smoon * (C.Aearth/C.Amoon)