Changeset 952

Timestamp:

06/12/09 13:33:28 (16 years ago)

Author:

Mathieu Morlighem

Message:

use new temperature in input to compute melting

File:

• issm/trunk/src/m/solutions/ice/thermal.m (modified) (3 diffs)

issm/trunk/src/m/solutions/ice/thermal.m

@@ -60 +60 @@
         melting(1:6:gridset.gsize)=md.melting/md.yts; %in m/s
         soln.t_g=temperature;
-        soln.melting_g=melting;
+        soln.m_g=melting;
         soln.time=0;
 
@@ -77 +77 @@
                 disp('   computing melting...');
                 gridset=m_m.gridset;
-                inputs=struct('pressure',pressure,'temperature',soln(n).t_g,'melting_offset',melting_offset,'dt',md.dt);
-                soln(n+1).melting_g=melting_core(m_m,analysis_type,inputs);
+                inputs=struct('pressure',pressure,'temperature',soln(n+1).t_g,'melting_offset',melting_offset,'dt',md.dt);
+                soln(n+1).m_g=melting_core(m_m,analysis_type,inputs);
+                any(soln(n+1).m_g)
                 
         end
@@ -90 +91 @@
                 solution(n).step=n;
                 solution(n).temperature=soln(n).t_g(indx);
-                solution(n).melting=soln(n).melting_g(indx)*md.yts; %in m/a
+                solution(n).melting=soln(n).m_g(indx)*md.yts; %in m/a
                 solution(n).time=soln(n).time/md.yts; %in year
         end