Changeset 20793

Timestamp:

06/22/16 14:50:37 (9 years ago)

Author:

ayfeng

Message:

Implement Project3D module, fix issue with undefined reference in model

Location:

issm/trunk-jpl/jenkins/javascript/karma/lib/bin

Files:

• model.js (modified) (8 diffs)
• project3d.js (added)

issm/trunk-jpl/jenkins/javascript/karma/lib/bin/model.js

@@ -5 +5 @@
 
 function model () {
+    function ones(...args) {
+        var array = [];
+        for (var i = 0; i < args[0]; ++i) {
+            array.push(args.length === 1 ? 1 : ones(args.slice(1)));
+        }
+        return array;
+    }
+
         //methods
                 this.disp = function() { //{{{
@@ -111 +119 @@
 
                 } //}}}
-        this.extrude = function(md, ...args) { //{{{
+        this.extrude = function(md) { //{{{
         //EXTRUDE - vertically extrude a 2d mesh
         //
@@ -134 +142 @@
 
         //some checks on list of arguments
-            var argc = args.length;
+            var argc = arguments.length;
 
             if ((argc > 4) | (argc < 2)) {
@@ -142 +150 @@
             //Extrude the mesh
             if (argc==2) { //list of coefficients
-                clist=args[0];
+                clist=arguments[0];
 
                 if (clist.some(function(x) { return x < 0; }) | clist.some(function(x) { return x > 1; }))
@@ -156 +164 @@
                 numlayers=extrusionlist.length;
             } else if (argc==3) { //one polynomial law
-                if (args[2]<=0) {
+                if (arguments[2]<=0) {
                     //help extrude;
                     throw 'extrusionexponent must be >=0';
                 }
-                numlayers=args[0];
+                numlayers=arguments[0];
 
                 extrusionlist = [];
 
                 for (var i = 0; i < numlayers; i++) {
-                    extrusionlist.push(Math.pow(i/(numlayers-1), args[2]));
+                    extrusionlist.push(Math.pow(i/(numlayers-1), arguments[2]));
                 };
 
             } else if (argc==4) { //two polynomial laws
-                numlayers=args[0];
-                lowerexp=args[1];
-                upperexp=args[2];
-
-                if (args[1]<=0 | args[2]<=0) {
+                numlayers=arguments[0];
+                lowerexp=arguments[1];
+                upperexp=arguments[2];
+
+                if (arguments[1]<=0 | args[2]<=0) {
                     throw 'lower and upper extrusionexponents must be >=0';
                 }
@@ -202 +210 @@
 
             if (numlayers<2) {
-                error('number of layers should be at least 2');
+                console.error('number of layers should be at least 2');
             }
 
             if (md.mesh.domaintype() !== '3D') {
-                error('Cannot extrude a 3d mesh (extrude cannot be called more than once)');
+                console.error('Cannot extrude a 3d mesh (extrude cannot be called more than once)');
             }
 
             //Initialize with the 2d mesh
             mesh2d = md.mesh;
-            md.mesh=mesh3dprisms();
+            md.mesh=new mesh3dprisms();
+
             md.mesh.x                           = mesh2d.x;
             md.mesh.y                           = mesh2d.y;
@@ -244 +253 @@
             };
 
-            number_nodes3d=size(x3d,1); //number of 3d nodes for the non extruded part of the mesh
-
-                //Extrude elements 
-                elements3d=[];
-                for (var i = 0; i < numlayers; i++) {
-                    elements3d.push(md.mesh.elements+(i-1)*md.mesh.numberofvertices, md.mesh.elements+i*md.mesh.numberofvertices); //Create the elements of the 3d mesh for the non extruded part
-                };
-
-                number_el3d=size(elements3d,1); //number of 3d nodes for the non extruded part of the mesh
-
-                function fillArray(value, len) {
-                    if (len == 0) return [];
-                    var a = [value];
-                    while (a.length * 2 <= len) a = a.concat(a);
-                    if (a.length < len) a = a.concat(a.slice(0, len - a.length));
-                    return a;
-                }
-
-                //Keep a trace of lower and upper nodes
-                //lowervertex=NaN*ones(number_nodes3d,1);
-                //uppervertex=NaN*ones(number_nodes3d,1);
-
-                lowervertex = fillArray(null, number_nodes3d);
-                uppervertex = fillArray(null, number_nodes3d);
-
-                //lowervertex(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices;
-                //uppervertex(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d;
-
-                for (var i = md.mesh.numberofvertices+1, k = 1; i < lowervertex.length && k <= (numlayers-1)*md.mesh.numberofvertices; i++, k++) {
-                    lowervertex[i] = k;
-                };
-
-                for (var i = 1, k = md.mesh.numberofvertices+1; i <= (numlayers-1)*md.mesh.numberofvertices && k <= number_nodes3d; i++, k++) {
-                    uppervertex[i] = k;
-                };
-
-                md.mesh.lowervertex=lowervertex;
-                md.mesh.uppervertex=uppervertex;
-
-                //same for lower and upper elements
-                lowerelements = fillArray(null, number_el3d);
-                upperelements = fillArray(null, number_el3d);
-                //lowerelements(md.mesh.numberofelements+1:end)=1:(numlayers-2)*md.mesh.numberofelements;
-                //upperelements(1:(numlayers-2)*md.mesh.numberofelements)=md.mesh.numberofelements+1:(numlayers-1)*md.mesh.numberofelements;
-
-                for (var i = md.mesh.numberofvertices+1, k = 1; i < lowerelements.length && k <= (numlayers-2)*md.mesh.numberofelements; i++, k++) {
-                    lowerelements[i] = k;
-                };
-
-                for (var i = 1, k = md.mesh.numberofelements + 1; i <= (numlayers-2)*md.mesh.numberofelements && k <= (numlayers-1)*md.mesh.numberofelements; i++, k++) {
-                    upperelements[i] = k;
-                };
-
-                md.mesh.lowerelements=lowerelements;
-                md.mesh.upperelements=upperelements;
-
-                //Save old mesh 
-                md.mesh.x2d=md.mesh.x;
-                md.mesh.y2d=md.mesh.y;
-                md.mesh.elements2d=md.mesh.elements;
-                md.mesh.numberofelements2d=md.mesh.numberofelements;
-                md.mesh.numberofvertices2d=md.mesh.numberofvertices;
-
-                //Build global 3d mesh 
-                md.mesh.elements=elements3d;
-                md.mesh.x=x3d;
-                md.mesh.y=y3d;
-                md.mesh.z=z3d;
-                md.mesh.numberofelements=number_el3d;
-                md.mesh.numberofvertices=number_nodes3d;
-                md.mesh.numberoflayers=numlayers;
-
-                //Ok, now deal with the other fields from the 2d mesh:
-
-                    //bedinfo and surface info
-                md.mesh.vertexonbase=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',1);
-                md.mesh.vertexonsurface=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',md.mesh.numberoflayers);
-                md.mesh.vertexonboundary=project3d(md,'vector',md.mesh.vertexonboundary,'type','node');
-
-                //lat long
-                md.mesh.lat=project3d(md,'vector',md.mesh.lat,'type','node');
-                md.mesh.long=project3d(md,'vector',md.mesh.long,'type','node');
-
-                md.geometry=extrude(md.geometry,md);
+            number_nodes3d=x3d.length; //number of 3d nodes for the non extruded part of the mesh
+
+            //Extrude elements 
+            elements3d=[];
+            for (var i = 0; i < numlayers; i++) {
+                elements3d.push(md.mesh.elements+(i-1)*md.mesh.numberofvertices, md.mesh.elements+i*md.mesh.numberofvertices); //Create the elements of the 3d mesh for the non extruded part
+            };
+
+            number_el3d=elements3d.length; //number of 3d nodes for the non extruded part of the mesh
+
+            function fillArray(value, len) {
+                if (len == 0) return [];
+                var a = [value];
+                while (a.length * 2 <= len) a = a.concat(a);
+                if (a.length < len) a = a.concat(a.slice(0, len - a.length));
+                return a;
+            }
+
+            //Keep a trace of lower and upper nodes
+            //lowervertex=NaN*ones(number_nodes3d,1);
+            //uppervertex=NaN*ones(number_nodes3d,1);
+
+            lowervertex = fillArray(null, number_nodes3d);
+            uppervertex = fillArray(null, number_nodes3d);
+
+            //lowervertex(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices;
+            //uppervertex(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d;
+
+            for (var i = md.mesh.numberofvertices+1, k = 1; i < lowervertex.length && k <= (numlayers-1)*md.mesh.numberofvertices; i++, k++) {
+                lowervertex[i] = k;
+            };
+
+            for (var i = 1, k = md.mesh.numberofvertices+1; i <= (numlayers-1)*md.mesh.numberofvertices && k <= number_nodes3d; i++, k++) {
+                uppervertex[i] = k;
+            };
+
+            md.mesh.lowervertex=lowervertex;
+            md.mesh.uppervertex=uppervertex;
+
+            //same for lower and upper elements
+            lowerelements = fillArray(null, number_el3d);
+            upperelements = fillArray(null, number_el3d);
+            //lowerelements(md.mesh.numberofelements+1:end)=1:(numlayers-2)*md.mesh.numberofelements;
+            //upperelements(1:(numlayers-2)*md.mesh.numberofelements)=md.mesh.numberofelements+1:(numlayers-1)*md.mesh.numberofelements;
+
+            for (var i = md.mesh.numberofvertices+1, k = 1; i < lowerelements.length && k <= (numlayers-2)*md.mesh.numberofelements; i++, k++) {
+                lowerelements[i] = k;
+            };
+
+            for (var i = 1, k = md.mesh.numberofelements + 1; i <= (numlayers-2)*md.mesh.numberofelements && k <= (numlayers-1)*md.mesh.numberofelements; i++, k++) {
+                upperelements[i] = k;
+            };
+
+            md.mesh.lowerelements=lowerelements;
+            md.mesh.upperelements=upperelements;
+
+            //Save old mesh 
+            md.mesh.x2d=md.mesh.x;
+            md.mesh.y2d=md.mesh.y;
+            md.mesh.elements2d=md.mesh.elements;
+            md.mesh.numberofelements2d=md.mesh.numberofelements;
+            md.mesh.numberofvertices2d=md.mesh.numberofvertices;
+
+            //Build global 3d mesh 
+            md.mesh.elements=elements3d;
+            md.mesh.x=x3d;
+            md.mesh.y=y3d;
+            md.mesh.z=z3d;
+            md.mesh.numberofelements=number_el3d;
+            md.mesh.numberofvertices=number_nodes3d;
+            md.mesh.numberoflayers=numlayers;
+
+            //Ok, now deal with the other fields from the 2d mesh:
+
+            //bedinfo and surface info
+            md.mesh.vertexonbase=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',1);
+            md.mesh.vertexonsurface=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',md.mesh.numberoflayers);
+            md.mesh.vertexonboundary=project3d(md,'vector',md.mesh.vertexonboundary,'type','node');
+
+            //lat long
+            md.mesh.lat=project3d(md,'vector',md.mesh.lat,'type','node');
+            md.mesh.long=project3d(md,'vector',md.mesh.long,'type','node');
+
+            md.geometry=extrude(md.geometry,md);
                 md.friction  = extrude(md.friction,md);
                 md.inversion = extrude(md.inversion,md);
@@ -373 +382 @@
 
                     for (var i = 0; i < md.mesh.elementconnectivity.length; ++i) {
-                        if (md.mesh.elementconnectivity[i] === null || typeof md.mesh.elementconectivity[i] === 'undefined') {
+                        if (md.mesh.elementconnectivity[i] === null || typeof md.mesh.elementconnectivity[i] === 'undefined') {
                             md.mesh.elementconnectivity[i] = 0;
                         }