Changeset 20799

Timestamp:

06/23/16 13:05:02 (9 years ago)

Author:

ayfeng

Message:

CHG: Implement extrude for friction module, fix issue with
allowing NaN comparison in project3d

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (1 diff)
• jenkins/javascript/karma/lib/bin/friction.js (added)
• jenkins/javascript/karma/lib/bin/model.js (modified) (1 diff)
• jenkins/javascript/karma/lib/bin/project3d.js (modified) (1 diff)
• src/m/classes/friction.js (modified) (1 diff)

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

@@ -23 +23 @@
       'lib/bin/mask.js',
       'lib/bin/geometry.js',
+      'lib/bin/friction.js',
       'lib/bin/project3d.js',
       'lib/bin/model.js',

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

@@ -336 +336 @@
             md.mesh.long=project3d(md,'vector',md.mesh.long,'type','node');
 
-            md.geometry=md.geometry.extrude(md);
-                md.friction  = extrude(md.friction,md);
+                md.geometry=md.geometry.extrude(md);
+                md.friction  = md.friction.extrude(md);
                 md.inversion = extrude(md.inversion,md);
                 md.smb = extrude(md.smb,md);

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

@@ -57 +57 @@
     paddingvalue = options.getfieldvalue('padding',0);  //0 by default
 
-    if (vector2d.length === 1) {
+    if (isNaN(vector2d) || vector2d.length === 1) { // NaN treated as length 1 in MATLAB
         projected_vector=vector2d;
     } else if (type.toLowerCase() === 'node') {

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

@@ -15 +15 @@
                 fielddisplay(this,'q','q exponent');
         } // }}}
+    this.extrude = function(md) {//{{{
+
+        console.log("coefficient");
+        console.log(self.coefficient);
+        console.log("p");
+        console.log(self.p);
+        console.log("q");
+        console.log(self.q);
+        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.classname= function (){// {{{
                 return "friction";