Changeset 19711 for issm/trunk-jpl/src/m/mesh

Timestamp:

11/12/15 15:21:59 (10 years ago)

Author:

Eric.Larour

Message:

CHG: implemented NodeConnectivity module in javascript.

Location:

issm/trunk-jpl/src/m/mesh

Files:

• triangle.js (modified) (2 diffs)
• triangle.m (modified) (1 diff)

issm/trunk-jpl/src/m/mesh/triangle.js

@@ -1 @@
-function triangle(md,domain, rifts, resolution){
+function triangle(md){
 //TRIANGLE - create model mesh using the triangle package
 //
@@ -15 +15 @@
 //      triangle(md,domain, rifts, 1500);
 
+        if (!(arguments.length==3 | arguments.length==4)){
+                console.log('triangle usage error.');
+        }
+        
+        var md=arguments[0];
+        var domain=arguments[1];
+
+        if (arguments.length==3){
+                var resolution=arguments[2];
+                var rifts=[];
+        }
+        if (arguments.length==4){
+                var rifts=arguments[2];
+                var resolution=arguments[3];
+        }
+
+        //Figure out a characteristic area. Resolution is a node oriented concept (ex a 1000m  resolution node would 
+        //be made of 1000*1000 area squares). 
         var area=Math.pow(resolution,2);
 
         //Call mesher: 
-        var array = TriMesh(md, domain, rifts, area); 
+        var return_array=TriMesh(md, domain, rifts, area); 
 
+        //Plug into md:
+        md.mesh.elements=return_array[0];
+        md.mesh.x=return_array[1];
+        md.mesh.y=return_array[2];
+        md.mesh.segments=return_array[3];
+        md.mesh.segmentmarkers=return_array[4];
+        
         //Fill in rest of fields:
-        //md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+        md.mesh.numberofelements=md.mesh.elements.length;
+        md.mesh.numberofvertices=md.mesh.x.length;
+        md.mesh.vertexonboundary=new Float64Array(md.mesh.numberofvertices); 
+
+        for (i=0;i<md.mesh.segments.length;i++) for(j=0;j<2;j++) md.mesh.vertexonboundary[md.mesh.segments[i][j]-1]=1;
 
         //Now, build the connectivity tables for this mesh.
-        //md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
-        //md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity);
+        md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
+        //md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity); 
 
 }

issm/trunk-jpl/src/m/mesh/triangle.m

@@ -1 @@
-function md=triangle(md,domainname,varargin)
+function md=triangle(md)
 %TRIANGLE - create model mesh using the triangle package
 %