Changeset 26946

Timestamp:

04/05/22 12:48:09 (3 years ago)

Author:

aleahsommers

Message:

CHG:allow for negative melt rateas refreezing

File:

• issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp

@@ -384 +384 @@
 
         meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1])-PMPheat);
-                _assert_(meltrate>0.);
+//              _assert_(meltrate>0.);
+      //  if(meltrate<0.) meltrate = 0.;
 
                   for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*
@@ -632 +633 @@
 
                 meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1])-PMPheat);
-                _assert_(meltrate>0.);
+//              _assert_(meltrate>0.);
+//              if(meltrate<0.) meltrate = 0.;
 
                 newgap += gauss->weight*Jdet*(gap+dt*(