Changeset 3481

Timestamp:

04/09/10 08:08:04 (15 years ago)

Author:

seroussi

Message:

wrong usage of FieldDepthAverage

Location:

issm/trunk/src/m/solutions/jpl

Files:

• prognostic2_core.m (modified) (1 diff)
• prognostic_core.m (modified) (1 diff)
• steadystate_core.m (modified) (1 diff)
• transient3d.m (modified) (2 diffs)

issm/trunk/src/m/solutions/jpl/prognostic2_core.m

@@ -14 +14 @@
         vx_g=get(inputs,'vx',1);
         vy_g=get(inputs,'vy',1);
-        vx_g=FieldDepthAverage(m.elements,m.nodes,m.loads,m.materials,m.parameters,vx_g,'vx');
-        vy_g=FieldDepthAverage(m.elements,m.nodes,m.loads,m.materials,m.parameters,vy_g,'vy');
+        vx_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,vx_g,'vx');
+        vy_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,vy_g,'vy');
         inputs=add(inputs,'vx_average',vx_g,'doublevec',1,m.parameters.numberofnodes);
         inputs=add(inputs,'vy_average',vy_g,'doublevec',1,m.parameters.numberofnodes);

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

@@ -13 +13 @@
         %Take only the first two dofs of m.parameters.u_g
         u_g=get(inputs,'velocity',[1 1 0 0]);
-        u_g=FieldDepthAverage(m.elements,m.nodes,m.loads,m.materials,m.parameters,u_g,'velocity');
+        u_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,u_g,'velocity');
         inputs=add(inputs,'velocity_average',u_g,'doublevec',2,m.parameters.numberofnodes);
 

issm/trunk/src/m/solutions/jpl/steadystate_core.m

@@ -46 +46 @@
         %add temperature to inputs.
         %Compute depth averaged temperature
-        temperature_average=FieldDepthAverage(m_t.elements,m_t.nodes,m_t.loads,m_t.materials,m_t.parameters,results_thermal.t_g,'temperature');
+        temperature_average=FieldDepthAverage(m_t.elements,m_t.nodes,m_t.vertices,m_t.loads,m_t.materials,m_t.parameters,results_thermal.t_g,'temperature');
         inputs=add(inputs,'temperature_average',temperature_average,'doublevec',1,m_t.parameters.numberofnodes);
         inputs=add(inputs,'temperature',results_thermal.t_g,'doublevec',1,m_t.parameters.numberofnodes);

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

@@ -1 @@
-function md=transient3d(md);
-%TRANSIENT2D - 3d transient solution
 %
 %   Usage:
@@ -93 +91 @@
 
         %Compute depth averaged temperature
-        temperature_average=FieldDepthAverage(models.t.elements,models.t.nodes,models.t.loads,models.t.materials,models.t.parameters,results(n+1).t_g,'temperature');
+        temperature_average=FieldDepthAverage(models.t.elements,models.t.nodes,models.t.vertices,models.t.loads,models.t.materials,models.t.parameters,results(n+1).t_g,'temperature');
         inputs=add(inputs,'temperature_average',temperature_average,'doublevec',1,models.t.parameters.numberofnodes);