Changeset 954

Timestamp:

06/12/09 14:36:37 (16 years ago)

Author:

seroussi

Message:

fixed transient3d with new results

File:

• issm/trunk/src/m/solutions/cielo/transient3d.m (modified) (3 diffs)

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

@@ -52 +52 @@
 inputs=inputlist;
 inputs=add(inputs,'velocity',solution.u_g,'doublevec',3,models.p.parameters.numberofnodes);
-inputs=add(inputs,'melting',solution_g,'doublevec',1,models.p.parameters.numberofnodes);
+inputs=add(inputs,'melting',solution.m_g,'doublevec',1,models.p.parameters.numberofnodes);
 inputs=add(inputs,'accumulation',solution.a_g,'doublevec',1,models.p.parameters.numberofnodes);
 inputs=add(inputs,'dt',models.p.parameters.dt,'double');
@@ -83 +83 @@
         %Deal with temperature first 
         displaystring(md.debug,'\n%s',['    computing temperatures...']);
-        [solution(n+1).t_g models.t.loads melting_offset]=thermal_core_nonlinear(models,inputs,'thermal','transient');
+        [solution(n+1).t_g models.t.loads melting_offset]=thermal_core_nonlinear(models.m,inputs,'thermal','transient');
         inputs=add(inputs,'temperature',solution(n+1).t_g,'doublevec',1,models.t.parameters.numberofnodes);
         
@@ -101 +101 @@
         displaystring(md.debug,'\n%s',['    computing new thickness...']);
         inputs=add(inputs,'velocity',solution(n+1).u_g,'doublevec',3,models.p.parameters.numberofnodes);
-        new_thickness=prognostic_core(models.p,inputs,'prognostic','');
+        rawresults=prognostic_core(models,inputs,'prognostic','');
+        new_thickness=rawresults.h_g;
 
         %update surface and bed using the new thickness