Changeset 849

Timestamp:

06/08/09 15:52:51 (16 years ago)

Author:

Eric.Larour

Message:

transient3d serial solution

Location:

issm/trunk/src/m/solutions/cielo

Files:

• diagnostic_core.m (modified) (3 diffs)
• prognostic_core.m (modified) (2 diffs)
• thermal_core.m (modified) (1 diff)
• transient3d.m (added)

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

@@ -21 +21 @@
         if dim==3,
                 displaystring(debug,'\n%s',['extruding slopes in 3d...']);
-                slopex=SlopeExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopex);
-                slopey=SlopeExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey);
+                slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopex,"slopex",0);
+                slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey,"slopey",0);
         end
 
@@ -55 +55 @@
 
         displaystring(debug,'\n%s',['extruding horizontal velocities...']);
-        u_g_horiz=VelocityExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,u_g);
+        u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,u_g,"velocity",1);
 
         displaystring(debug,'\n%s',['computing vertical velocities...']);
@@ -77 +77 @@
                 slopex=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedx');
                 slopey=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedy');
-                slopex=SlopeExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopex);
-                slopey=SlopeExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey);
+                slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopex,"slopex",0);
+                slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey,"slopey",0);
 
                 inputs=add(inputs,'bedslopex',slopex,'doublevec',m_sl.parameters.numberofdofspernode,m_sl.parameters.numberofnodes);

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

@@ -8 +8 @@
         %Take only the first two dofs of m.parameters.u_g
         u_g=get(inputs,'velocity',[1 1 0 0]);
-        u_g=VelocityDepthAverage(m.elements,m.nodes,m.loads,m.materials,u_g);
+        u_g=FieldDepthAverage(m.elements,m.nodes,m.loads,m.materials,u_g,"velocity");
         inputs=add(inputs,'velocity_average',u_g,'doublevec',2,m.parameters.numberofnodes);
 
@@ -15 +15 @@
 
         displaystring(m.parameters.debug,'\n%s',['extrude computed thickness on all layers:']);
-        h_g=ThicknessExtrude(m.elements,m.nodes,m.loads,m.materials,h_g);
+        h_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,h_g,"thickness",0);
 
 end %end function

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

@@ -45 +45 @@
 
                 disp('   computing melting...');
-                inputs=add(inputs,'temperature',soln(n).t_g,'doublevec',1,m_t.parameters.numberofnodes);
+                inputs=add(inputs,'temperature',soln(n+1).t_g,'doublevec',1,m_t.parameters.numberofnodes);
                 inputs=add(inputs,'melting_offset',melting_offset,'double');
                 soln(n+1).m_g=diagnostic_core_linear(m_m,inputs,'melting','transient');