Index: ../trunk-jpl/src/m/materials/paterson.py =================================================================== --- ../trunk-jpl/src/m/materials/paterson.py (revision 17863) +++ ../trunk-jpl/src/m/materials/paterson.py (revision 17864) @@ -15,9 +15,12 @@ raise RuntimeError("input temperature should be in Kelvin (positive)") 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: @@ -70,7 +73,7 @@ #Now make sure that rigidity is positive pos=numpy.nonzero(rigidity<0)[0] if len(pos): - rigidity[pos]=1**6 + rigidity[pos]=1.e6 return rigidity