no globals

.ipynb_checkpoints/app-checkpoint.py

@@ -388,10 +388,6 @@ def Plv(volume, Emax, Emin, t, Tc, Vd):
 def Elastance(Emax,Emin, t, Tc):
     t = t-int(t/Tc)*Tc #can remove this if only want 1st ED (and the 1st ES before)
     tn = t/(0.2+0.15*Tc)
-    print(tn)
-    print(Emax)
-    print(Emin)
-    print(Tc)
     return (Emax-Emin)*1.55*(tn/0.7)**1.9/((tn/0.7)**1.9+1.0)*1.0/((tn/1.17)**21.9+1.0) + Emin
 
 def solve_ODE_for_volume(Rm, Ra, Emax, Emin, Vd, Tc, start_v, t):
@@ -550,11 +546,10 @@ def lvad_ode(y, t, Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emax, Emin, Tc, Vd, ratew):
     return dydt
 
 #returns pv loop and ef when there is no lvad:
-def f_nolvad(Tc, start_v, Emax, showpvloop):
+def f_nolvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, showpvloop):
 
     N = 20
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
-
+    
     start_pla = float(start_v*Elastance(Emax, Emin, 0.0, Tc))
     start_pao = 75.
     start_pa = start_pao
@@ -585,10 +580,10 @@ def f_nolvad(Tc, start_v, Emax, showpvloop):
     return ef, pao_ed, pao_es, ((ved - ves) * 60/Tc ) / 1000, sol[19*60000, 0], sol[19*60000, 1], sol[19*60000, 2], sol[19*60000, 3], sol[19*60000, 4], result_Vlv[18*60000:20*60000], result_Plv[18*60000:20*60000]
 
 #returns the w at which suction occurs: (i.e. for which the slope of the envelopes of x6 becomes negative)
-def get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #slope is slope0 for w
+def get_suctionw(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #slope is slope0 for w
 
     N = 70
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
+
 
     start_pla = float(start_v*Elastance(Emax, Emin, 0.0, Tc))
     start_pao = 75.
@@ -657,10 +652,9 @@ def get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #s
 
     return suction_w
 
-def f_lvad(Tc, start_v, Emax, c, slope, w0, x60, y00, y01, y02, y03, y04): #slope is slope0 for w
+def f_lvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, c, slope, w0, x60, y00, y01, y02, y03, y04): #slope is slope0 for w
 
     N = 70
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
 
     y0 = [y00, y01, y02, y03, y04, x60, w0]
 
@@ -793,7 +787,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     Ls=0.0005
     
     #get values for periodic loops:
-    ef_nolvad, pao_ed, pao_es, co_nolvad, y00, y01, y02, y03, y04, Vlv0, Plv0 = f_nolvad(Tc, start_v, Emax, 0.0)
+    ef_nolvad, pao_ed, pao_es, co_nolvad, y00, y01, y02, y03, y04, Vlv0, Plv0 = f_nolvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd,Tc, start_v, Emax, 0.0)
     #pao_eds = [pao_ed]
     #pao_ess = [pao_es]
     
@@ -801,7 +795,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     w0 = 5000.
     ratew = 400.
     x60 = 0.
-    suctionw = get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew)
+    suctionw = get_suctionw(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew)
     
     #gamma = 1.8
     c = 0.065 #(in simaan2008dynamical: 0.67, but too fast -> 0.061 gives better shape)
@@ -809,7 +803,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     w0 = suctionw / gamma  #if doesn't work (x6 negative), change gamma down to 1.4 or up to 2.1
     
     #compute new pv loops and ef with lvad added:
-    new_ef, pao_ed, pao_es, CO, MAP, Vlvs, Plvs = f_lvad(Tc, start_v, Emax, c, slope0, w0, x60, y00, y01, y02, y03, y04)
+    new_ef, pao_ed, pao_es, CO, MAP, Vlvs, Plvs = f_lvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, c, slope0, w0, x60, y00, y01, y02, y03, y04)
       
     print("\nParameters: Tc, start_v, Emax:", Tc, start_v, Emax)
     print("Suction speed:", suctionw)

app.py

@@ -388,10 +388,6 @@ def Plv(volume, Emax, Emin, t, Tc, Vd):
 def Elastance(Emax,Emin, t, Tc):
     t = t-int(t/Tc)*Tc #can remove this if only want 1st ED (and the 1st ES before)
     tn = t/(0.2+0.15*Tc)
-    print(tn)
-    print(Emax)
-    print(Emin)
-    print(Tc)
     return (Emax-Emin)*1.55*(tn/0.7)**1.9/((tn/0.7)**1.9+1.0)*1.0/((tn/1.17)**21.9+1.0) + Emin
 
 def solve_ODE_for_volume(Rm, Ra, Emax, Emin, Vd, Tc, start_v, t):
@@ -550,11 +546,10 @@ def lvad_ode(y, t, Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emax, Emin, Tc, Vd, ratew):
     return dydt
 
 #returns pv loop and ef when there is no lvad:
-def f_nolvad(Tc, start_v, Emax, showpvloop):
+def f_nolvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, showpvloop):
 
     N = 20
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
-
+    
     start_pla = float(start_v*Elastance(Emax, Emin, 0.0, Tc))
     start_pao = 75.
     start_pa = start_pao
@@ -585,10 +580,10 @@ def f_nolvad(Tc, start_v, Emax, showpvloop):
     return ef, pao_ed, pao_es, ((ved - ves) * 60/Tc ) / 1000, sol[19*60000, 0], sol[19*60000, 1], sol[19*60000, 2], sol[19*60000, 3], sol[19*60000, 4], result_Vlv[18*60000:20*60000], result_Plv[18*60000:20*60000]
 
 #returns the w at which suction occurs: (i.e. for which the slope of the envelopes of x6 becomes negative)
-def get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #slope is slope0 for w
+def get_suctionw(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #slope is slope0 for w
 
     N = 70
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
+
 
     start_pla = float(start_v*Elastance(Emax, Emin, 0.0, Tc))
     start_pao = 75.
@@ -657,10 +652,9 @@ def get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew): #s
 
     return suction_w
 
-def f_lvad(Tc, start_v, Emax, c, slope, w0, x60, y00, y01, y02, y03, y04): #slope is slope0 for w
+def f_lvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, c, slope, w0, x60, y00, y01, y02, y03, y04): #slope is slope0 for w
 
     N = 70
-    global Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd
 
     y0 = [y00, y01, y02, y03, y04, x60, w0]
 
@@ -793,7 +787,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     Ls=0.0005
     
     #get values for periodic loops:
-    ef_nolvad, pao_ed, pao_es, co_nolvad, y00, y01, y02, y03, y04, Vlv0, Plv0 = f_nolvad(Tc, start_v, Emax, 0.0)
+    ef_nolvad, pao_ed, pao_es, co_nolvad, y00, y01, y02, y03, y04, Vlv0, Plv0 = f_nolvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd,Tc, start_v, Emax, 0.0)
     #pao_eds = [pao_ed]
     #pao_ess = [pao_es]
     
@@ -801,7 +795,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     w0 = 5000.
     ratew = 400.
     x60 = 0.
-    suctionw = get_suctionw(Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew)
+    suctionw = get_suctionw(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, y00, y01, y02, y03, y04, w0, x60, ratew)
     
     #gamma = 1.8
     c = 0.065 #(in simaan2008dynamical: 0.67, but too fast -> 0.061 gives better shape)
@@ -809,7 +803,7 @@ def lvad_plots(Rm, Ra, Emax, Emin, Vd, Tc, start_v, gamma):
     w0 = suctionw / gamma  #if doesn't work (x6 negative), change gamma down to 1.4 or up to 2.1
     
     #compute new pv loops and ef with lvad added:
-    new_ef, pao_ed, pao_es, CO, MAP, Vlvs, Plvs = f_lvad(Tc, start_v, Emax, c, slope0, w0, x60, y00, y01, y02, y03, y04)
+    new_ef, pao_ed, pao_es, CO, MAP, Vlvs, Plvs = f_lvad(Rs, Rm, Ra, Rc, Ca, Cs, Cr, Ls, Emin, Vd, Tc, start_v, Emax, c, slope0, w0, x60, y00, y01, y02, y03, y04)
       
     print("\nParameters: Tc, start_v, Emax:", Tc, start_v, Emax)
     print("Suction speed:", suctionw)