Changeset 20628

Timestamp:

05/19/16 09:37:15 (9 years ago)

Author:

jbondzio

Message:

CHG: let cuffey return rigidity in size of input temperature

Location:

issm/trunk-jpl/src/m/materials

Files:

• cuffey.m (modified) (1 diff)
• cuffey.py (modified) (1 diff)
• cuffeytemperate.m (modified) (1 diff)
• cuffeytemperate.py (modified) (1 diff)

issm/trunk-jpl/src/m/materials/cuffey.m

@@ -25 +25 @@
 % rigidity=fittedmodel(temperature);
 
-rigidity=zeros(length(T),1);
+rigidity=zeros(size(T));
 pos=find(T<=-45);         rigidity(pos)=10^8*(-0.000396645116301*(T(pos)+50).^3+ 0.013345579471334*(T(pos)+50).^2  -0.356868703259105*(T(pos)+50)+7.272363035371383);
 pos=find(-45<=T & T<-40); rigidity(pos)=10^8*(-0.000396645116301*(T(pos)+45).^3+ 0.007395902726819*(T(pos)+45).^2  -0.253161292268336*(T(pos)+45)+5.772078366321591);

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

@@ -16 +16 @@
                 raise RuntimeError("input temperature should be in Kelvin (positive)")
         
-        T = temperature.reshape(-1,)-273.15
+        T = temperature-273.15
 
         rigidity=numpy.zeros_like(T)

issm/trunk-jpl/src/m/materials/cuffeytemperate.m

@@ -19 +19 @@
 end
 
-rigidity=reshape(cuffey(temperature), size(temperature)).*(1+181.25*max(0., min(0.01, waterfraction))).^(-1/stressexp);
+rigidity=cuffey(temperature).*(1+181.25*max(0., min(0.01, waterfraction))).^(-1/stressexp);

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

@@ -25 +25 @@
         end
 
-        rigidity=numpy.multiply(cuffey(temperature).reshape(temperature.shape), (1*numpy.ones(waterfraction.shape)+181.25*numpy.maximum(numpy.zeros(waterfraction.shape), numpy.minimum(0.01*numpy.ones(waterfraction.shape), waterfraction)))**(-1/stressexp));
+        rigidity=numpy.multiply(cuffey(temperature), (1*numpy.ones(waterfraction.shape)+181.25*numpy.maximum(numpy.zeros(waterfraction.shape), numpy.minimum(0.01*numpy.ones(waterfraction.shape), waterfraction)))**(-1/stressexp));
 
         return rigidity