Changeset 17624

Timestamp:

04/01/14 20:09:03 (11 years ago)

Author:

cborstad

Message:

BUG: fixed problem for vector vs. array in damage calcs

File:

• issm/trunk-jpl/src/m/mech/damagefrominversion.py (modified) (1 diff)

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

@@ -24 +24 @@
         if any(md.flowequation.element_equation!=2):
                 raise StandardError('Warning: the model has some non-SSA elements.  These will be treated like SSA elements')
+        if npy.ndim(md.results.StressbalanceSolution.MaterialsRheologyBbar)==2:
+                Bi=md.results.StressbalanceSolution.MaterialsRheologyBbar.reshape(-1,)
+        else:
+                Bi=md.results.StressbalanceSolution.MaterialsRheologyBbar
+        if npy.ndim(md.materials.rheology_B)==2:
+                BT=md.materials.rheology_B.reshape(-1,)
+        else:
+                BT=md.materials.rheology_B
 
-        damage=npy.zeros((md.mesh.numberofvertices,))
+        damage=npy.zeros_like(Bi)
+
         # Damage where Bi softer than B(T)
-        pos=npy.nonzero(md.results.StressbalanceSolution.MaterialsRheologyBbar<md.materials.rheology_B)
-        damage[pos]=1.-md.results.StressbalanceSolution.MaterialsRheologyBbar[pos]/md.materials.rheology_B[pos]
+        pos=npy.nonzero(Bi<BT)[0]
+        damage[pos]=1.-Bi[pos]/BT[pos]
+        
+        pos=npy.nonzero(damage<0)
+        damage[pos]=0
 
         return damage