Compare commits

..

No commits in common. "de05d99c19d7856e5d7c0ddf6136142b4f91ebe4" and "723cdad5ade69b1949aecfc46246636e7da073a8" have entirely different histories.

View File

@ -125,6 +125,7 @@ def calcular_aceleracion(masa, anguloDisparo, fuerzaMagnetica):
def calcular_masa(diamFe, longFe): return np.pi * diamFe**2 / 4 * longFe * densidadHierro def calcular_masa(diamFe, longFe): return np.pi * diamFe**2 / 4 * longFe * densidadHierro
if __name__ == '__main__': if __name__ == '__main__':
from funcionesSimELectrica import * from funcionesSimELectrica import *
from scipy.integrate import cumulative_trapezoid from scipy.integrate import cumulative_trapezoid