Changeset 326

Timestamp:

05/08/09 15:58:10 (16 years ago)

Author:

seroussi

Message:

analysis_type in core_linear as in core_nonlinear

Location:

issm/trunk/src/m/solutions/cielo

Files:

• diagnostic_core.m (modified) (4 diffs)
• diagnostic_core_linear.m (modified) (1 diff)

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

@@ -16 +16 @@
 
         displaystring(debug,'\n%s',['computing surface slope (x and y derivatives)...']);
-        slopex=diagnostic_core_linear(m_ss,'surface_slope_compute_x',inputs);
-        slopey=diagnostic_core_linear(m_ss,'surface_slope_compute_y',inputs);
+        slopex=diagnostic_core_linear(m_ss,inputs,'surface_slope_compute_x');
+        slopey=diagnostic_core_linear(m_ss,inputs,'surface_slope_compute_y');
 
         if dim==3,
@@ -30 +30 @@
 
         displaystring(debug,'\n%s',['computing hutter velocities...']);
-        u_g=diagnostic_core_linear(m_dhu,'diagnostic_hutter',inputs);
+        u_g=diagnostic_core_linear(m_dhu,inputs,'diagnostic_hutter');
 
         displaystring(debug,'\n%s',['computing pressure according to MacAyeal...']);
@@ -59 +59 @@
         displaystring(debug,'\n%s',['computing vertical velocities...']);
         inputs=add(inputs,'velocity',u_g_horiz,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
-        u_g_vert=diagnostic_core_linear(m_dv,inputs);
+        u_g_vert=diagnostic_core_linear(m_dv,inputs,'diagnostic_vert');
 
         displaystring(debug,'\n%s',['combining horizontal and vertical velocities...']);
@@ -75 +75 @@
 
                 displaystring(debug,'\n%s',['computing bed slope (x and y derivatives)...']);
-                slopex=diagnostic_core_linear(m_bs,'bed_slope_compute_x',inputs);
-                slopey=diagnostic_core_linear(m_bs,'bed_slope_compute_y',inputs);
+                slopex=diagnostic_core_linear(m_bs,inputs,'bed_slope_compute_x');
+                slopey=diagnostic_core_linear(m_bs,inputs,'bed_slope_compute_y');
                 slopex=SlopeExtrude(m_bs.elements,m_bs.nodes,m_bs.loads,m_bs.materials,slopex);
                 slopey=SlopeExtrude(m_bs.elements,m_bs.nodes,m_bs.loads,m_bs.materials,slopey);

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

@@ -1 @@
-function u_g=diagnostic_core_linear(m,inputs)
+function u_g=diagnostic_core_linear(m,inputs,analysis_type)
 %DIAGNOSTIC_CORE_LINEAR - linear solution sequence
 %
 %   Usage:
-%      u_g=diagnostic_core_linear(m,inputs)
+%      u_g=diagnostic_core_linear(m,inputs,analysis_type)
 
         %stiffness and load generation only: