Changeset 553

Timestamp:

05/21/09 09:06:04 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved melting_g tp m_g

File:

• issm/trunk/src/m/solutions/cielo/thermal.m (modified) (4 diffs)

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

@@ -33 +33 @@
                 inputs=add(inputs,'melting_offset',melting_offset,'double');
                 inputs=add(inputs,'temperature',t_g,'doublevec',1,m_t.parameters.numberofnodes);
-                melting_g=diagnostic_core_linear(m_m,inputs,'melting','steady');
+                m_g=diagnostic_core_linear(m_m,inputs,'melting','steady');
                 
                 displaystring(md.debug,'\n%s',['load results...']);
                 md.temperature=t_g;
-                md.melting=melting_g*md.yts; %from m/s to m/a
+                md.melting=m_g*md.yts; %from m/s to m/a
 
         else
@@ -43 +43 @@
                 %initialize temperature and melting
                 t_g=m_t.parameters.t_g;
-                melting_g=m_t.parameters.melting_g;
+                m_g=m_t.parameters.m_g;
                 nsteps=m_t.parameters.ndt/m_t.parameters.dt;
 
                 %initialize temperature and melting
                 soln.t_g=t_g;
-                soln.melting_g=melting_g;
+                soln.m_g=m_g;
                 soln.time=0;
 
@@ -63 +63 @@
                         inputs=add(inputs,'temperature',soln(n).t_g,'doublevec',1,m_t.parameters.numberofnodes);
                         inputs=add(inputs,'melting_offset',melting_offset,'double');
-                        soln(n+1).melting_g=diagnostic_core_linear(m_m,inputs,'melting','transient');
+                        soln(n+1).m_g=diagnostic_core_linear(m_m,inputs,'melting','transient');
                         
                 end
@@ -71 +71 @@
                 for n=1:nsteps+1,
                         solution(n).temperature=soln(n).t_g;
-                        solution(n).melting=soln(n).melting_g*md.yts; %in m/year
+                        solution(n).melting=soln(n).m_g*md.yts; %in m/year
                         solution(n).time=soln(n).time/md.yts;         %in years
                 end