Changeset 1236 for issm/trunk/src/m/classes/public/mesh/meshadaptation.m

Timestamp:

07/06/09 11:12:27 (15 years ago)

Author:

Mathieu Morlighem

Message:

use GetNodalFunctionsCoeff and GetArea now

File:

• issm/trunk/src/m/classes/public/mesh/meshadaptation.m (modified) (2 diffs)

issm/trunk/src/m/classes/public/mesh/meshadaptation.m

@@ -22 +22 @@
 disp(sprintf('      metric computation') )
 
-%load some variables (it is much faster if the variab;es are loaded from md once for all) 
+%initialization
+index=md.elements;
+numberofgrids=md.numberofgrids;
 numberofelements=md.numberofelements;
-numberofgrids=md.numberofgrids;
-index=md.elements;
-x=md.x; y=md.y; z=md.z;
-
-%initialization
-alpha=zeros(md.numberofelements,3);
-beta=zeros(md.numberofelements,3);
-gradx=zeros(md.numberofgrids,1);
-grady=zeros(md.numberofgrids,1);
-metric=zeros(md.numberofelements,1);
+gradx=zeros(numberofgrids,1);
+grady=zeros(numberofgrids,1);
+metric=zeros(numberofelements,1);
 
 %build some usefull variables
@@ -40 +35 @@
 summation=1/3*ones(3,1);
 linesize=3*numberofelements;
-x1=x(index(:,1)); x2=x(index(:,2)); x3=x(index(:,3)); y1=y(index(:,1)); y2=y(index(:,2)); y3=y(index(:,3));
 
-%compute nodal functions coefficients N(x,y)=alpha x + beta y + gamma
-invdet=1./(x1.*(y2-y3)-x2.*(y1-y3)+x3.*(y1-y2));
-alpha=[invdet.*(y2-y3) invdet.*(y3-y1) invdet.*(y1-y2)];
-beta=[invdet.*(x3-x2) invdet.*(x1-x3) invdet.*(x2-x1)];
+%get areas and  nodal functions coefficients N(x,y)=alpha x + beta y + gamma 
+[alpha beta]=GetNodalFunctionsCoeff(index,md.x,md.y);
+areas=Getareas(index,md.x,md.y);
 
 %Compute gradient for each element
 grad_elx=sum(field(index).*alpha,2); 
 grad_ely=sum(field(index).*beta,2);
-
-%compute the volume of each element
-areas=area(md);
 
 %update weights that holds the volume of all the element holding the grid i