Changeset 20838

Timestamp:

07/01/16 11:55:41 (9 years ago)

Author:

ayfeng

Message:

FIX: model overwriting global mesh2d, shadowing constructor in tests following any call to md.extrude
FIX: project3d handling edge case inputs incorrectly
FIX: translate model.transient (matlab) -> model.trans (js)
FIX: friction class extrude variable assignments

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (2 diffs)
• jenkins/javascript/karma/scripts/test102.js (modified) (2 diffs)
• jenkins/javascript/karma/scripts/test109.js (modified) (1 diff)
• src/m/classes/flowequation.js (modified) (2 diffs)
• src/m/classes/friction.js (modified) (1 diff)
• src/m/classes/masstransport.js (modified) (1 diff)
• src/m/classes/matice.js (modified) (1 diff)
• src/m/classes/model.js (modified) (2 diffs)
• src/m/classes/qmu.js (modified) (1 diff)
• src/m/extrusion/project3d.js (modified) (1 diff)

issm/trunk-jpl/jenkins/javascript/karma/karma.conf.js

@@ -42 +42 @@
       'lib/bin/project3d.js',
       'lib/bin/model.js',
-      //'scripts/specs/temp.spec.js'
-      'scripts/specs/issm-ajax.spec.js'
+      //'scripts/specs/issm.spec.js'
+      'scripts/specs/temp.spec.js'
       //'scripts/specs/3.spec.js'
     ],
@@ -92 +92 @@
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true,
+    singleRun: false,
 
     // Concurrency level

issm/trunk-jpl/jenkins/javascript/karma/scripts/test102.js

@@ -2 +2 @@
 var md = new model();
 
-console.log(md.results);
 triangle(md,square[0],180000.);
+
 setmask(md,'all','');
 parameterize(md);
@@ -9 +9 @@
 md.extrude(md,3,2.);
 setflowequation(md,'SSA','all');
-console.log(md.results);
 //md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,StressbalanceSolutionEnum());

issm/trunk-jpl/jenkins/javascript/karma/scripts/test109.js

@@ -7 +7 @@
 setflowequation(md,'SSA','all');
 //md.cluster=generic('name',oshostname(),'np',3);
-md.transient.isstressbalance=0;
-md.transient.ismasstransport=0;
-md.transient.issmb=1;
-md.transient.isthermal=1;
-md.transient.isgroundingline=0;
+md.trans.isstressbalance=0;
+md.trans.ismasstransport=0;
+md.trans.issmb=1;
+md.trans.isthermal=1;
+md.trans.isgroundingline=0;
 md=solve(md,TransientSolutionEnum());
 

issm/trunk-jpl/src/m/classes/flowequation.js

@@ -38 +38 @@
 
         }// }}}
-    this.extrude = function(md) {
+    this.extrude = function(md) {//{{{
         this.element_equation=project3d(md,'vector',this.element_equation,'type','element');
         this.vertex_equation=project3d(md,'vector',this.vertex_equation,'type','node');
@@ -45 +45 @@
         this.borderFS=project3d(md,'vector',this.borderFS,'type','node');
         return this;
-    }
+    }//}}}
                 this.checkconsistency = function(md,solution,analyses) {//{{{
 

issm/trunk-jpl/src/m/classes/friction.js

@@ -16 +16 @@
         } // }}}
     this.extrude = function(md) {//{{{
-        self.coefficient = project3d(md, 'vector', self.coefficient, 'type', 'node', 'layer', 1);
-        self.p = project3d(md, 'vector', self.p, 'type', 'element');
-        self.q = project3d(md, 'vector', self.q, 'type', 'element');
+        this.coefficient = project3d(md, 'vector', this.coefficient, 'type', 'node', 'layer', 1);
+        this.p = project3d(md, 'vector', this.p, 'type', 'element');
+        this.q = project3d(md, 'vector', this.q, 'type', 'element');
         return this;
     }//}}}

issm/trunk-jpl/src/m/classes/masstransport.js

@@ -41 +41 @@
                 return "masstransport";
         }// }}}
-    this.extrude = function(md) {
+    this.extrude = function(md) {//{{{
         this.spcthickness=project3d(md,'vector',this.spcthickness,'type','node');
         return this;
-    }
+    }//}}}
                 this.checkconsistency = function (md,solution,analyses){  // {{{
 

issm/trunk-jpl/src/m/classes/matice.js

@@ -84 +84 @@
 
                 } // }}}
-        this.extrude = function(md) {
+        this.extrude = function(md) {//{{{
             this.rheology_B=project3d(md,'vector',this.rheology_B,'type','node');
             this.rheology_n=project3d(md,'vector',this.rheology_n,'type','element');
             return this;
-        }
+        }//}}}
                 this.classname = function() {// {{{
                         return "matice";

issm/trunk-jpl/src/m/classes/model.js

@@ -152 +152 @@
                 }).sort();
 
-                console.log("extrusionlist is " + extrusionlist) //@REMOVE
-
                 numlayers=extrusionlist.length;
             } else if (argc==3) { //one polynomial law
@@ -210 +208 @@
 
             //Initialize with the 2d mesh
-            mesh2d = md.mesh;
+            var mesh2d = md.mesh;
             md.mesh=new mesh3dprisms();
 

issm/trunk-jpl/src/m/classes/qmu.js

@@ -91 +91 @@
         }// }}}
     this.extrude = function(md) {//{{{
-        console.log("ORIGINAL");
-        console.log(this.partition);
-        console.log("TRANSPOSE");
-        console.log(math.transpose(this.partition));
         this.partition=project3d(md,'vector',math.transpose(this.partition),'type','node');
         return this;

issm/trunk-jpl/src/m/extrusion/project3d.js

@@ -48 +48 @@
     paddingvalue = options.getfieldvalue('padding',0);  //0 by default
 
-    if (isNaN(vector2d) || vector2d.length === 1) { // NaN treated as length 1 in MATLAB
+    if (isNaN(vector2d) || vector2d === 0 || vector2d.length === 1) { // NaN treated as length 1 in MATLAB
         projected_vector=vector2d;
     } else if (type.toLowerCase() === 'node') {
 
         //Initialize 3d vector
-        console.log(vector2d.length + " " + md.mesh.numberofvertices2d);
         if (vector2d.length===md.mesh.numberofvertices2d) {
                 projected_vector=ones(md.mesh.numberofvertices,  vector2d[0].length).map(function(arr) { return arr.fill(paddingvalue); });