Changeset 25499 for issm/trunk-jpl/src/m/geometry/GetAreas3DTria.m

Timestamp:

08/31/20 14:54:17 (5 years ago)

Author:

jdquinn

Message:

CHG: Committing changes in support of test2004.py (no longer failing, but still need to track down sources of large errors)

File:

• issm/trunk-jpl/src/m/geometry/GetAreas3DTria.m (modified) (2 diffs)

issm/trunk-jpl/src/m/geometry/GetAreas3DTria.m

@@ -2 +2 @@
 %GETAREAS3DTRIA - compute areas of triangles with 3D coordinates 
 %
-%   compute areas of trianguls with 3D coordinates 
+%   Compute areas of triangles with 3D coordinates 
 %
 %   Usage:
-%      areas  =GetAreas3DTria(index,x,y,z);
+%      areas=GetAreas3DTria(index,x,y,z);
 %
 %   Examples:
-%      areas  =GetAreas3DTria(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z);
+%      areas=GetAreas3DTria(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z);
 
 %get number of elements and number of nodes
-nels=size(index,1); 
-nods=length(x);  
+nels=size(index,1);
+nods=length(x);
 
 %some checks
 if nargout~=1 | (nargin~=3 & nargin~=4),
         help GetAreas3DTria
-        error('GetAreas error message: bad usage')
+        error('GetAreas3DTria error message: bad usage')
 end
 if ((length(y)~=nods) | (nargin==4 & length(z)~=nods)),
-        error('GetAreas3DTria error message: x,y and z do not have the same length')
+        error('GetAreas3DTria error message: x, y, and z do not have the same length')
 end
+
 if max(index(:))>nods,
         error(['GetAreas3DTria error message: index should not have values above ' num2str(nods) ])
 end
 if (nargin==4 & size(index,2)~=3),
-        error('GetAreas3DTria error message: index should have 3 columns for 2d meshes.')
+        error('GetAreas3DTria error message: index should have 3 columns for 2d meshes')
 end
 
@@ -37 +38 @@
 %compute the volume of each element
 if nargin==4,
-   % area of triangles with 3D coordinats
-   for j=1:nels
-                m1=[x1(j) x2(j) x3(j); y1(j) y2(j) y3(j); 1 1 1];
-           m2=[y1(j) y2(j) y3(j); z1(j) z2(j) z3(j); 1 1 1];
-           m3=[z1(j) z2(j) z3(j); x1(j) x2(j) x3(j); 1 1 1];
-      areas(j)=sqrt(det(m1)^2 + det(m2)^2 + det(m3)^2)/2;
-   end
-end 
-
-
+        % area of triangles with 3D coordinates
+        for i=1:nels
+                m1=[x1(i) x2(i) x3(i); y1(i) y2(i) y3(i); 1 1 1];
+                m2=[y1(i) y2(i) y3(i); z1(i) z2(i) z3(i); 1 1 1];
+                m3=[z1(i) z2(i) z3(i); x1(i) x2(i) x3(i); 1 1 1];
+                areas(i)=sqrt(det(m1)^2 + det(m2)^2 + det(m3)^2)/2;
+        end
+end