Index: sm/trunk-jpl/src/m/materials/DepthAvgTempCond.m
===================================================================
--- /issm/trunk-jpl/src/m/materials/DepthAvgTempCond.m	(revision 20107)
+++ 	(revision )
@@ -1,25 +1,0 @@
-function Tbar=DepthAvgTempCond(md)
-%DEPTHAVGTEMPCOND- compute conduction dependent temperature profile for an ice sheet. 
-%
-%   Usage:
-%   Tbar=DepthAvgTempCond(md)
-
-Tpmp=TMeltingPoint(md.materials.meltingpoint,0); %pressure melting point at 0 pressure.
-k=md.materials.thermalconductivity;
-G=md.basalforcings.geothermalflux; 
-H=md.geometry.thickness;
-Ts=md.initialization.temperature;
-alpha=G.*H/k;
-
-Tbar=zeros(md.mesh.numberofvertices,1);
-
-%find temperature average when we are below melting point: 
-pos=find( (Ts+alpha) <Tpmp);
-Tbar(pos)=Ts(pos)+alpha(pos)/2;
-
-pos=find( (Ts+alpha) >=Tpmp);
-Tbar(pos)=Tpmp+(Tpmp^2-Ts(pos).^2)/2./alpha(pos)+ Tpmp*(Ts(pos)-Tpmp)./alpha(pos);
-
-%on ice shelf, easier: 
-pos=find(md.mask.groundedice_levelset<=0);
-Tbar(pos)=(Ts(pos)+Tpmp)/2;
Index: sm/trunk-jpl/src/m/materials/DepthAvgTempCond.py
===================================================================
--- /issm/trunk-jpl/src/m/materials/DepthAvgTempCond.py	(revision 20107)
+++ 	(revision )
@@ -1,34 +1,0 @@
-import numpy as npy
-from TMeltingPoint  import TMeltingPoint
-
-def DepthAvgTempCond(md):
-   ''' compute conduction dependent temperature profile for an ice sheet. 
-   Usage:
-   Tbar=DepthAvgTempCond(md)
-   '''
-
-   Tpmp=TMeltingPoint(md.materials.meltingpoint,0) #pressure melting point at 0 pressure.
-
-   k=md.materials.thermalconductivity
-   G=md.basalforcings.geothermalflux
-   H=md.geometry.thickness
-   Ts=md.initialization.temperature
-   alpha=G*H/k
-
-   Tbar=npy.zeros(md.mesh.numberofvertices,)
-
-   #find temperature average when we are below melting point: 
-   pos=npy.nonzero( Ts+alpha < Tpmp)
-   if pos:
-	   Tbar[pos]=Ts[pos]+alpha[pos]/2 
-
-   pos=npy.nonzero( Ts+alpha>= Tpmp)
-   if pos:
-	   Tbar[pos]=Tpmp+(Tpmp**2-Ts[pos]**2)/2/alpha[pos]+ Tpmp*(Ts[pos]-Tpmp)/alpha[pos]
-   
-   #on ice shelf, easier: 
-   pos=npy.nonzero(md.mask.groundedice_levelset[0]<=0)
-   if pos:
-	   Tbar[pos]=(Ts[pos]+Tpmp)/2
-
-   return Tbar