Changeset 987

Timestamp:

06/13/09 19:50:08 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed UpdateGridProsition

Location:

issm/trunk/src/m/solutions

Files:

• cielo/transient3d.m (modified) (1 diff)
• ice/UpdateGridPosition.m (modified) (1 diff)

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

@@ -124 +124 @@
         %update node positions
         displaystring(md.debug,'\n%s',['    updating node positions...']);
-        nodes_dh=UpdateNodePositions(models.dh.elements,models.dh.nodes,models.dh.loads,models.dh.materials,new_bed,new_thickness);
-        nodes_dv=UpdateNodePositions(models.dv.elements,models.dv.nodes,models.dv.loads,models.dv.materials,new_bed,new_thickness);
-        nodes_ds=UpdateNodePositions(models.ds.elements,models.ds.nodes,models.ds.loads,models.ds.materials,new_bed,new_thickness);
-        nodes_sl=UpdateNodePositions(models.sl.elements,models.sl.nodes,models.sl.loads,models.sl.materials,new_bed,new_thickness);
-        nodes_p=UpdateNodePositions(models.p.elements,models.p.nodes,models.p.loads,models.p.materials,new_bed,new_thickness);
-        nodes_t=UpdateNodePositions(models.t.elements,models.t.nodes,models.t.loads,models.t.materials,new_bed,new_thickness);
-        nodes_m=UpdateNodePositions(models.m.elements,models.m.nodes,models.m.loads,models.m.materials,new_bed,new_thickness);
+        models.dh.nodes=UpdateNodePositions(models.dh.elements,models.dh.nodes,models.dh.loads,models.dh.materials,new_bed,new_thickness);
+        models.dv.nodes=UpdateNodePositions(models.dv.elements,models.dv.nodes,models.dv.loads,models.dv.materials,new_bed,new_thickness);
+        models.ds.nodes=UpdateNodePositions(models.ds.elements,models.ds.nodes,models.ds.loads,models.ds.materials,new_bed,new_thickness);
+        models.sl.nodes=UpdateNodePositions(models.sl.elements,models.sl.nodes,models.sl.loads,models.sl.materials,new_bed,new_thickness);
+        models.p.nodes=UpdateNodePositions(models.p.elements,models.p.nodes,models.p.loads,models.p.materials,new_bed,new_thickness);
+        models.t.nodes=UpdateNodePositions(models.t.elements,models.t.nodes,models.t.loads,models.t.materials,new_bed,new_thickness);
+        models.m.nodes=UpdateNodePositions(models.m.elements,models.m.nodes,models.m.loads,models.m.materials,new_bed,new_thickness);
 
         %update time and counter

issm/trunk/src/m/solutions/ice/UpdateGridPosition.m

@@ -10 +10 @@
 count2d=[1:md.numberofgrids2d]';
 
-for i=1:md.numlayers,
-        count=count2d+(i-1)*md.numberofgrids2d;
-        for j=1:size(count,1),
-                grids(count(j)).grid.z=bed(count(j))+(i-1)/(md.numlayers-1)*(thickness(count(j)));
-        end
+%for i=1:md.numlayers,
+%       count=count2d+(i-1)*md.numberofgrids2d;
+%       for j=1:size(count,1),
+%               grids(count(j)).grid.z=bed(count(j))+(i-1)/(md.numlayers-1)*(thickness(count(j)));
+%       end
+%end
+
+%Only update the lower and upper layer.
+count=md.numberofgrids2d*(md.numlayers-1);
+for i=1:md.numberofgrids2d,
+        grids(i).grid.z=bed(i);
+        grids(count+i).grid.z=bed(i)+ thickness(i);
 end