Changeset 17903

Timestamp:

04/30/14 19:33:04 (11 years ago)

Author:

cborstad

Message:

BUG: a couple minor fixes for damage calcs

Location:

issm/trunk-jpl/src/m/mech

Files:

• analyticaldamage.py (modified) (2 diffs)
• thomasparams.py (modified) (1 diff)

issm/trunk-jpl/src/m/mech/analyticaldamage.py

@@ -53 +53 @@
         assert len(kwargs)==0, 'error, unexpected or misspelled kwargs'
 
-        if len(sigmab)==1:
+        if isinstance(sigmab,(int,float)):
                 sigmab=sigmab*npy.ones((md.mesh.numberofvertices,))
 
@@ -83 +83 @@
         
         backstress=npy.zeros((md.mesh.numberofvertices,))
-        
+
         # backstress to bring D down to one 
         backstress[pos]=T[pos]-(1.-D[pos])*B[pos]*npy.sign(ex[pos])*(2.+a[pos])*npy.abs(ex[pos])**(1./n[pos])/(1.+a[pos]+a[pos]**2)**((n[pos]-1.)/2./n[pos])

issm/trunk-jpl/src/m/mech/thomasparams.py

@@ -134 +134 @@
         elif eq=='Weertman2D':
                 theta=1./9
-                a=npy.ones((md.mesh.numberofvertices,1))
+                a=npy.ones((md.mesh.numberofvertices,))
         elif eq=='Thomas':
                 theta=((1.+a+a**2+b**2)**((n-1.)/2.))/(npy.abs(2.+a)**n)