Robert Elder commited on
Commit ·
2f46357
1
Parent(s): 3b782bc
minor change
Browse files
quantity_module/functions.py
CHANGED
|
@@ -333,8 +333,8 @@ def get_D_dists_new(w,T,Polymer_Tg,Solvent_Name,Solvent_MW,Solute_MW,Solute_Vabc
|
|
| 333 |
def PlaneSheetAnalytical_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,nterms=5,Qv=1):
|
| 334 |
L = PolymerVolume/SurfaceArea #effective length scale of the component
|
| 335 |
T = D*ExtractionTime/L**2.
|
| 336 |
-
result = (T>0.05) *
|
| 337 |
-
(T<=0.05) *
|
| 338 |
return result
|
| 339 |
|
| 340 |
def PlaneSheetFiniteBathMass_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,nterms,Qv=1):
|
|
|
|
| 333 |
def PlaneSheetAnalytical_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,nterms=5,Qv=1):
|
| 334 |
L = PolymerVolume/SurfaceArea #effective length scale of the component
|
| 335 |
T = D*ExtractionTime/L**2.
|
| 336 |
+
result = (T>0.05) * PlaneSheetFiniteBathMass_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,nterms,Qv=Qv) + \
|
| 337 |
+
(T<=0.05) * PlaneSheetFiniteBathMassApprox_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,Qv=Qv)
|
| 338 |
return result
|
| 339 |
|
| 340 |
def PlaneSheetFiniteBathMass_old(M0,D,K,PolymerVolume,SurfaceArea,SolventVolume,ExtractionTime,nterms,Qv=1):
|