Changeset 15842

Timestamp:

08/19/13 16:26:25 (12 years ago)

Author:

cborstad

Message:

CHG: reshape temperature so that resulting rigidity is in the same shape (rank-1 array) as the other rheology components

File:

• issm/trunk-jpl/src/m/materials/paterson.py (modified) (2 diffs)

issm/trunk-jpl/src/m/materials/paterson.py

@@ -15 +15 @@
                 raise RuntimeError("input temperature should be in Kelvin (positive)")
         
-        T = temperature-273.15
+        T = temperature.reshape(-1,)-273.15
 
         #The routine below is equivalent to:
@@ -30 +30 @@
         # rigidity=fittedmodel(temperature);
 
-        rigidity=numpy.zeros((numpy.size(T,axis=0),1))
+        rigidity=numpy.zeros_like(T)
         pos1=numpy.nonzero(T<=-45)
         rigidity[pos1]=10**8*(-0.000292866376675*(T[pos1]+50)**3+ 0.011672640664130*(T[pos1]+50)**2  -0.325004442485481*(T[pos1]+50)+  6.524779401948101)