Changeset 17864

Timestamp:

04/28/14 15:35:11 (11 years ago)

Author:

cborstad

Message:

CHG: better handling of input in paterson

File:

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

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

@@ -16 +16 @@
 
         if numpy.ndim(temperature)==2:
-                T = temperature.reshape(-1,)-273.15
+                #T = temperature.reshape(-1,)-273.15
+                T = temperature.flatten()-273.15
+        elif isinstance(temperature,float) or isinstance(temperature,int):
+                T = numpy.array([temperature])-273.15
         else:
-                T = numpy.array([temperature])-273.15
+                T = temperature-273.15
 
         #The routine below is equivalent to:
@@ -71 +74 @@
         pos=numpy.nonzero(rigidity<0)[0]
         if len(pos):
-                rigidity[pos]=1**6 
+                rigidity[pos]=1.e6 
 
         return rigidity