Robert Elder commited on
Commit
a8b8fe8
·
1 Parent(s): 2f46357

minor change

Browse files
data/db-polymer-properties-and-categories.xlsx CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:52672b90cfa19da89c958cdbdfd6121b3da9abe187e5aedaee0ea503dec05db8
3
- size 26083
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:2f335b64e7af6abee22c0bbca836fce0c2f178bab6555ce6cd2df360a701f871
3
+ size 26084
quantity_module/functions.py CHANGED
@@ -419,7 +419,6 @@ def Conservative(tau):
419
  (tau > 0.2) * (1. - (8. / (np.pi ** 2.)) * np.exp(-tau * np.pi ** 2. / 4.))
420
  return release
421
 
422
- ## XXX work out different alphas
423
  def multiEquilSwell(alpha, Kps, swell, iterations):
424
  # alpha is initial before swelling
425
  result = 1.-(Kps*(swell+alpha)/(Kps*(swell+alpha)+swell-1.))*(swell/(swell+alpha))**iterations
@@ -443,8 +442,6 @@ def get_M_dist(D_dist, M_expt, PolymerVolume, SurfaceArea, SolventVolume, Extrac
443
  if 1:
444
  alpha = (SolventVolume)/(PolymerVolume*K_expt) # without swelling; swelling is dealt with downstream
445
  M_M0 = Extraction(tau, alpha, Kps=K_expt, swell=Qv, iterations=iterations)
446
- #print('ITERATION TEST') # similar to PlaneSheetAnalytical for 1 iteration
447
- #print(np.quantile(M_M0, [0.05,0.25,0.5,0.75,0.95]))
448
  if 0:
449
  alpha = (SolventVolume-PolymerVolume*(Qv-1))/(Qv*PolymerVolume*K_expt) # with swelling
450
  M_M0 = PlaneSheetAnalytical(tau, alpha, nterms=5)
 
419
  (tau > 0.2) * (1. - (8. / (np.pi ** 2.)) * np.exp(-tau * np.pi ** 2. / 4.))
420
  return release
421
 
 
422
  def multiEquilSwell(alpha, Kps, swell, iterations):
423
  # alpha is initial before swelling
424
  result = 1.-(Kps*(swell+alpha)/(Kps*(swell+alpha)+swell-1.))*(swell/(swell+alpha))**iterations
 
442
  if 1:
443
  alpha = (SolventVolume)/(PolymerVolume*K_expt) # without swelling; swelling is dealt with downstream
444
  M_M0 = Extraction(tau, alpha, Kps=K_expt, swell=Qv, iterations=iterations)
 
 
445
  if 0:
446
  alpha = (SolventVolume-PolymerVolume*(Qv-1))/(Qv*PolymerVolume*K_expt) # with swelling
447
  M_M0 = PlaneSheetAnalytical(tau, alpha, nterms=5)