Changeset 8298 for issm/trunk/src/m/model/averaging.m

Timestamp:

05/16/11 15:01:42 (14 years ago)

Author:

seroussi

Message:

changed grid to node in matlab

File:

• issm/trunk/src/m/model/averaging.m (modified) (3 diffs)

issm/trunk/src/m/model/averaging.m

@@ -2 +2 @@
 %AVERAGING - smooths the input over the mesh
 %
-%   This routine takes a list over the elements or the grids in input
-%   and return a list over the grids.
+%   This routine takes a list over the elements or the nodes in input
+%   and return a list over the nodes.
 %   For each iterations it computes the average over each element (average 
-%   of the vertices values) and then computes the average over each grid
-%   by taking the average of the element around a grid weighted by the
+%   of the vertices values) and then computes the average over each node
+%   by taking the average of the element around a node weighted by the
 %   elements volume
 %
@@ -16 +16 @@
 %      pressure=averaging(md,md.pressure,0);
 
-if length(data)~=md.numberofelements & length(data)~=md.numberofgrids
+if length(data)~=md.numberofelements & length(data)~=md.numberofnodes
         error('averaging error message: data not supported yet');
 end
 
 %initialization
-weights=zeros(md.numberofgrids,1);
+weights=zeros(md.numberofnodes,1);
 data=data(:);
 
 %load some variables (it is much faster if the variab;es are loaded from md once for all)
 index=md.elements;
-numberofgrids=md.numberofgrids;
+numberofnodes=md.numberofnodes;
 numberofelements=md.numberofelements;
 
@@ -41 +41 @@
 linesize=rep*numberofelements;
 
-%update weights that holds the volume of all the element holding the grid i
-weights=sparse(line,ones(linesize,1),repmat(areas,rep,1),numberofgrids,1);
+%update weights that holds the volume of all the element holding the node i
+weights=sparse(line,ones(linesize,1),repmat(areas,rep,1),numberofnodes,1);
 
 %initialization
 if length(data)==numberofelements
-        average_grid=sparse(line,ones(linesize,1),repmat(areas.*data,rep,1),numberofgrids,1);
-        average_grid=average_grid./weights;
+        average_node=sparse(line,ones(linesize,1),repmat(areas.*data,rep,1),numberofnodes,1);
+        average_node=average_node./weights;
 else
-        average_grid=data;
+        average_node=data;
 end
 
 %loop over iteration
 for i=1:iterations
-        average_el=average_grid(index)*summation;
-        average_grid=sparse(line,ones(linesize,1),repmat(areas.*average_el,rep,1),numberofgrids,1);
-        average_grid=average_grid./weights;
+        average_el=average_node(index)*summation;
+        average_node=sparse(line,ones(linesize,1),repmat(areas.*average_el,rep,1),numberofnodes,1);
+        average_node=average_node./weights;
 end
 
 %return output as a full matrix (C code do not like sparse matrices)
-average=full(average_grid);
+average=full(average_node);