Index: /issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp	(revision 27011)
+++ /issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp	(revision 27012)
@@ -286,5 +286,5 @@
 	IssmDouble  lr,br,vx,vy,beta,lc;
 	IssmDouble  alpha2,frictionheat;
-   IssmDouble  PMPheat,dpressure_water[2],dbed[2];	
+   IssmDouble  PMPheat,dissipation,dpressure_water[2],dbed[2];	
 	IssmDouble* xyz_list = NULL;
 //        IssmDouble dgapxx; /***/
@@ -384,6 +384,4 @@
 
    	meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1])-PMPheat);
-//		_assert_(meltrate>0.);
-      //  if(meltrate<0.) meltrate = 0.;
 
                   for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*
@@ -550,5 +548,5 @@
 	IssmDouble  alpha2,frictionheat;
 	IssmDouble* xyz_list = NULL;
-   IssmDouble  dpressure_water[2],dbed[2],PMPheat;
+   IssmDouble  dpressure_water[2],dbed[2],PMPheat,dissipation;
 	IssmDouble q = 0.;
    IssmDouble channelization = 0.;
@@ -631,8 +629,13 @@
 		dpressure_water[1] = rho_water*g*(dh[1] - dbed[1]);
 		PMPheat=CT*CW*conductivity*rho_water*(dh[0]*dpressure_water[0]+dh[1]*dpressure_water[1]);
+		dissipation=rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1]);
 
 		meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1])-PMPheat);
-//		_assert_(meltrate>0.);
-//		if(meltrate<0.) meltrate = 0.;
+
+		element->AddInput(DummyEnum,&meltrate,P0Enum);
+		element->AddInput(EsaEmotionEnum,&frictionheat,P0Enum);
+		element->AddInput(EsaNmotionEnum,&dissipation,P0Enum);
+		element->AddInput(EsaUmotionEnum,&PMPheat,P0Enum);
+
 
 		newgap += gauss->weight*Jdet*(gap+dt*(
@@ -666,6 +669,8 @@
 
 	/*Limit gap height to grow to surface*/
-	if(newgap>thickness)
-	 newgap = thickness;
+//	if(newgap>thickness)
+//	 newgap = thickness;
+	if(newgap>1)
+	 newgap = 1;
 
 	/*Add new gap as an input*/