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

Timestamp:

06/27/18 11:46:38 (7 years ago)

Author:

dlcheng

Message:

BUG (JS): Compilation error fixes for BAMG js integration. Resolving semantic translation issues from Matlab to JS. Adding BamgMesher.js to JS Makefile.

File:

• issm/trunk-jpl/src/m/mesh/bamg.js (modified) (4 diffs)

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

@@ -60 +60 @@
     //initialize the structures required as input of Bamg
     var bamg_options = {}
-    var bamg_geometry = bamggeom();
-    var bamg_mesh = bamgmesh();
+    var bamg_geometry = new bamggeom();
+    var bamg_mesh = new bamgmesh();
 
     var subdomain_ref = 1;
     var hole_ref = 1;
-    var vertices = [];
-    var edges = [];
-    var subdomains = [];
     // Bamg Geometry parameters {{{
     if (options.exist('domain')) {
@@ -134 +131 @@
             //Add all points to bamg_geometry
             for (var j = 0; j < nods; j++) {
-                vertices.push(domain[i].x[j]);
-                vertices.push(domain[i].y[j]);
-                vertices.push(1);
-            }
+                bamg_geometry.Vertices.push([domain[i].x[j], domain[i].y[j], 1]);
+            }
+            var edges1 = ArrayRange(count + 1, count + nods);
+            var edges2 = ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]);
             for (var j = 0; j < nods; j++) {
-                edges.push(ArrayRange(count + 1, count + nods));
-                edges.push(ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]));
-                edges.push(1);
-            }
-            subdomains.push([2, count + 1, 1, -subdomain_ref]);
-            subdomain_ref = subdomain_ref + 1;
-            bamg_geometry.Vertices = vertices;
-            bamg_geometry.Edges = edges;
-            bamg_geometry.SubDomains = subdomains;
+                bamg_geometry.Edges.push([edges1[j], edges2[j], 1]);
+            }
+            if (i > 1) {
+                bamg_geometry.SubDomains.push([2, count + 1, 1, -subdomain_ref]);
+                subdomain_ref = subdomain_ref + 1;
+            } else {
+                bamg_geometry.SubDomains.push([2, count + 1, 1, 0]);
+            }
 
             //update counter
@@ -183 +179 @@
             //Add all points to bamg_geometry
             for (var j = 0; j < nods; j++) {
-                vertices.push(holes[i].x[j]);
-                vertices.push(holes[i].y[j]);
-                vertices.push(1);
-            }
+                bamg_geometry.Vertices.push([holes[i].x[j], holes[i].y[j], 1]);
+            }
+            var edges1 = ArrayRange(count + 1, count + nods);
+            var edges2 = ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]);
             for (var j = 0; j < nods; j++) {
-                edges.push(ArrayRange(count + 1, count + nods));
-                edges.push(ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]));
-                edges.push(1);
-            }
-            subdomains.push([2, count + 1, 1, -hole_ref]);
+                bamg_geometry.Edges.push([edges1[j], edges2[j], 1]);
+            }
+            bamg_geometry.SubDomains.push([2, count + 1, 1, -hole_ref]);
             hole_ref = hole_ref + 1;
-            bamg_geometry.Vertices = vertices;
-            bamg_geometry.Edges = edges;
-            bamg_geometry.SubDomains = subdomains;
 
             //update counter
@@ -227 +218 @@
             //Add all points to bamg_geometry
             for (var j = 0; j < nods; j++) {
-                vertices.push(subdomains[i].x[j]);
-                vertices.push(subdomains[i].y[j]);
-                vertices.push(1);
-            }
+                bamg_geometry.Vertices.push([subdomains[i].x[j], subdomains[i].y[j], 1]);
+            }
+            var edges1 = ArrayRange(count + 1, count + nods);
+            var edges2 = ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]);
             for (var j = 0; j < nods; j++) {
-                edges.push(ArrayRange(count + 1, count + nods));
-                edges.push(ArrayConcat(ArrayRange(count + 2, count + nods), [count + 1]));
-                edges.push(1);
-            }
-            subdomains.push([2, count + 1, 1, subdomain_ref]);
+                bamg_geometry.Edges.push([edges1[j], edges2[j], 1]);
+            }
+            bamg_geometry.SubDomains.push([2, count + 1, 1, subdomain_ref]);
             subdomain_ref = subdomain_ref + 1;
-            bamg_geometry.Vertices = vertices;
-            bamg_geometry.Edges = edges;
-            bamg_geometry.SubDomains = subdomains;
 
             //update counter