Changeset 20812

Timestamp:

06/27/16 11:24:19 (9 years ago)

Author:

ayfeng

Message:

CHG: Implement extrude for masstransport, thermal
BUG: Fix invalid reference to md in stressbalance

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (1 diff)
• jenkins/javascript/karma/lib/bin/masstransport.js (added)
• jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js (modified) (1 diff)
• src/m/classes/masstransport.js (modified) (1 diff)
• src/m/classes/stressbalance.js (modified) (1 diff)
• src/m/classes/thermal.js (modified) (1 diff)

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

@@ -30 +30 @@
       'lib/bin/flowequation.js',
       'lib/bin/stressbalance.js',
+      'lib/bin/thermal.js',
+      'lib/bin/masstransport.js',
       'lib/bin/project3d.js',
       'lib/bin/model.js',
-      'scripts/specs/temp.spec.js'
+      //'scripts/specs/temp.spec.js'
+      'scripts/specs/issm-ajax.spec.js'
       //'scripts/specs/3.spec.js'
     ],

issm/trunk-jpl/jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js

@@ -13 +13 @@
     it("contains test101", function(done) {
         $.ajax({
-            url: 'http://localhost:8080/test188.js',
+            url: 'http://localhost:8080/test107.js',
             dataType: 'script',
             success: onAjaxSuccess,

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

@@ -41 +41 @@
                 return "masstransport";
         }// }}}
+    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/stressbalance.js

@@ -76 +76 @@
                 return "stressbalance";
         }// }}}
-    this.extrude = function() {//{{{
+    this.extrude = function(md) {//{{{
         this.spcvx=project3d(md,'vector',this.spcvx,'type','node');
         this.spcvy=project3d(md,'vector',this.spcvy,'type','node');

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

@@ -52 +52 @@
                 return "thermal";
         }// }}}
+    this.extrude = function(md) {//{{{
+        this.spctemperature=project3d(md,'vector',this.spctemperature,'type','node','layer',md.mesh.numberoflayers,'padding',NaN);
+        if (md.initialization.temperature.length===md.mesh.numberofvertices) {
+            this.spctemperature = ArrayFill2D(Create2DArray(md.mesh.numberofvertices, 1), NaN);
+            var pos=ArrayFindNot2D(md.mesh.vertexonsurface, 0);
+            pos.forEach(function(x) { // impose observed temperature on surface
+                this.spctemperature[x] = md.initialization.temperature[x];
+            });
+        }
+
+        return this;
+    }//}}}
         this.checkconsistency = function(md,solution,analyses){ // {{{