Changeset 20824

Timestamp:

06/28/16 13:09:29 (9 years ago)

Author:

ayfeng

Message:

CHG: Implement extrude for qmu, basalforcings
CHG: Add 2D array find to matlab helper lib
CHG: Add mathjs for transposing matrices

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (2 diffs)
• jenkins/javascript/karma/lib/bin/basalforcings.js (added)
• jenkins/javascript/karma/lib/bin/matlabfunc.js (modified) (1 diff)
• jenkins/javascript/karma/lib/bin/model.js (modified) (3 diffs)
• jenkins/javascript/karma/lib/bin/qmu.js (added)
• jenkins/javascript/karma/package.json (modified) (1 diff)
• src/m/classes/basalforcings.js (modified) (1 diff)
• src/m/classes/model.js (modified) (3 diffs)
• src/m/classes/qmu.js (modified) (1 diff)

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

@@ -12 +12 @@
     // list of files / patterns to load in the browser
     files: [
+      'node_modules/mathjs/dist/math.min.js',
       'lib/bin/EnumDefinitions.js',
       'lib/bin/issm-binaries.js',
@@ -32 +33 @@
       'lib/bin/thermal.js',
       'lib/bin/masstransport.js',
+      'lib/bin/calving.js',
+      'lib/bin/hydrologyshreve.js',
+      'lib/bin/matice.js',
+      'lib/bin/damage.js',
+      'lib/bin/qmu.js',
+      'lib/bin/basalforcings.js',
       'lib/bin/project3d.js',
       'lib/bin/model.js',

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

@@ -41 +41 @@
     return indices;
 }
+
+function ArrayFind2D(array, value) {
+    var indices = [];
+
+    for (var i = 0; i < array.length; ++i) {
+        for (var j = 0; j < array[0].length; ++j) {
+            if (array[i][j] === value) {
+                indices.push(array[i][j]);
+            }
+        }
+    }
+
+    return indices;
+}
+
+function getMatrixWidth(matrix) {
+    return matrix.reduce(function (result, row) {
+        return Math.max(result, row.length);
+    }, 0);
+}

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

@@ -359 +359 @@
                     for (var i = 0; i < md.mesh.elementconnectivity.length; i++) {
                         if (md.mesh.elementconnectivity[i] == 0) {
-                            md.mesh.elementconnectivity[i] = null;
+                            md.mesh.elementconnectivity[i] = NaN;
                         }
                     };
@@ -371 +371 @@
                     };
 
-                    md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
-
-                    for (var i = 0; i < md.mesh.elementconnectivity.length; ++i) {
-                        if (md.mesh.elementconnectivity[i] === null || typeof md.mesh.elementconnectivity[i] === 'undefined') {
-                            md.mesh.elementconnectivity[i] = 0;
-                        }
-                    }
+                    md.mesh.elementconnectivity.map(function(x) { return (isNaN(x)) ? 0 : x; });
                 }
 
@@ -383 +377 @@
                 md.damage=md.damage.extrude(md);
                 md.mask=md.mask.extrude(md);
-                md.qmu=extrude(md.qmu,md);
-                md.basalforcings=extrude(md.basalforcings,md);
+                md.qmu=md.qmu.extrude(md);
+                md.basalforcings=md.basalforcings.extrude(md);
 
                 //increase connectivity if less than 25:

issm/trunk-jpl/jenkins/javascript/karma/package.json

@@ -9 +9 @@
     "karma-junit-reporter": "^1.0.0",
     "karma-requirejs": "^1.0.0",
+    "mathjs": "^3.2.1",
     "requirejs": "^2.2.0"
   }

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

@@ -17 +17 @@
 
         } // }}}
+    this.extrude = function(md) {//{{{
+        this.groundedice_melting_rate=project3d(md,'vector',this.groundedice_melting_rate,'type','node','layer',1); 
+        this.floatingice_melting_rate=project3d(md,'vector',this.floatingice_melting_rate,'type','node','layer',1); 
+        this.geothermalflux=project3d(md,'vector',this.geothermalflux,'type','node','layer',1); //bedrock only gets geothermal flux
+        return this;
+    }//}}}
         this.classname = function(){ // {{{
                 return "basalforcings";

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

@@ -359 +359 @@
                     for (var i = 0; i < md.mesh.elementconnectivity.length; i++) {
                         if (md.mesh.elementconnectivity[i] == 0) {
-                            md.mesh.elementconnectivity[i] = null;
+                            md.mesh.elementconnectivity[i] = NaN;
                         }
                     };
@@ -371 +371 @@
                     };
 
-                    md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
-
-                    for (var i = 0; i < md.mesh.elementconnectivity.length; ++i) {
-                        if (md.mesh.elementconnectivity[i] === null || typeof md.mesh.elementconnectivity[i] === 'undefined') {
-                            md.mesh.elementconnectivity[i] = 0;
-                        }
-                    }
+                    md.mesh.elementconnectivity.map(function(x) { return (isNaN(x)) ? 0 : x; });
                 }
 
@@ -383 +377 @@
                 md.damage=md.damage.extrude(md);
                 md.mask=md.mask.extrude(md);
-                md.qmu=extrude(md.qmu,md);
-                md.basalforcings=extrude(md.basalforcings,md);
+                md.qmu=md.qmu.extrude(md);
+                md.basalforcings=md.basalforcings.extrude(md);
 
                 //increase connectivity if less than 25:

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

@@ -90 +90 @@
 
         }// }}}
+    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;
+    }//}}}
         this.classname= function(){// {{{
                 return "qmu";