Changeset 20806

Timestamp:

06/24/16 14:04:19 (9 years ago)

Author:

ayfeng

Message:

FIX: Project3D not producing correct results for thickness, surface fields
CHG: Align extrude functions from multiple modules to be more in line with MATLAB's
CHG: Implement extrude functionality for initialization module

Location:

issm/trunk-jpl

Files:

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

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

@@ -27 +27 @@
       'lib/bin/inversion.js',
       'lib/bin/SMBforcing.js',
+      'lib/bin/initialization.js',
       'lib/bin/project3d.js',
       'lib/bin/model.js',

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

@@ -22 +22 @@
     this.extrude = function(md) {//{{{
         this.mass_balance=project3d(md,'vector',this.mass_balance,'type','node');
+        return this;
     }//}}}
     this.initialize = function(md) {// {{{

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

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

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

@@ -22 +22 @@
             this.base=project3d(md,'vector',this.base,'type','node');
             this.bed=project3d(md,'vector',this.bed,'type','node');
+            return this;
         }//}}}
                 this.classname = function () { //{{{

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

@@ -90 +90 @@
             this.max_parameters=project3d(md,'vector',this.max_parameters,'type','node');
         }
+        return this;
     }//}}}
         this.classname= function(){// {{{

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

@@ -329 +329 @@
 
                 md.geometry=md.geometry.extrude(md);
-                md.friction  = md.friction.extrude(md);
-                md.inversion = md.inversion.extrude(md);
-                md.smb = md.smb.extrude(md);
-                md.initialization = extrude(md.initialization,md);
+                md.friction=md.friction.extrude(md);
+                md.inversion=md.inversion.extrude(md);
+                md.smb=md.smb.extrude(md);
+                md.initialization=md.initialization.extrude(md);
 
                 md.flowequation=md.flowequation.extrude(md);

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

@@ -112 +112 @@
         console.error('project3d error message: unknown projection type');
     }
+
+    return projected_vector;
 };

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

@@ -22 +22 @@
     this.extrude = function(md) {//{{{
         this.mass_balance=project3d(md,'vector',this.mass_balance,'type','node');
+        return this;
     }//}}}
     this.initialize = function(md) {// {{{

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

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

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

@@ -22 +22 @@
             this.base=project3d(md,'vector',this.base,'type','node');
             this.bed=project3d(md,'vector',this.bed,'type','node');
+            return this;
         }//}}}
                 this.classname = function () { //{{{

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

@@ -24 +24 @@
 
         }// }}}
+    this.extrude = function(md) {//{{{
+        this.vx=project3d(md,'vector',this.vx,'type','node');
+        this.vy=project3d(md,'vector',this.vy,'type','node');
+        this.vz=project3d(md,'vector',this.vz,'type','node');
+        this.vel=project3d(md,'vector',this.vel,'type','node');
+        this.temperature=project3d(md,'vector',this.temperature,'type','node');
+        this.waterfraction=project3d(md,'vector',this.waterfraction,'type','node');
+        this.watercolumn=project3d(md,'vector',this.watercolumn,'type','node','layer',1);
+        this.sediment_head=project3d(md,'vector',this.sediment_head,'type','node','layer',1);
+        this.epl_head=project3d(md,'vector',this.epl_head,'type','node','layer',1);
+        this.epl_thickness=project3d(md,'vector',this.epl_thickness,'type','node','layer',1);
+
+        //Lithostatic pressure by default
+        this.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z);
+        return this;
+    }//}}}
                 this.checkconsistency = function(md,solution,analyses) { //{{{
                         if(ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)){

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

@@ -90 +90 @@
             this.max_parameters=project3d(md,'vector',this.max_parameters,'type','node');
         }
+        return this;
     }//}}}
         this.classname= function(){// {{{