Changeset 20800

Timestamp:

06/23/16 14:45:55 (9 years ago)

Author:

ayfeng

Message:

CHG: Implement extrude for inversion module, consolidate matlab helper functions

Location:

issm/trunk-jpl

Files:

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

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

@@ -15 +15 @@
       'lib/bin/issm-binaries.js',
       'lib/bin/issm-extlibraries.js',
+      'lib/bin/matlabfunc.js',
       'lib/Exp/Square.js',
       'lib/Par/SquareShelfConstrained.js',
@@ -24 +25 @@
       'lib/bin/geometry.js',
       'lib/bin/friction.js',
+      'lib/bin/inversion.js',
       'lib/bin/project3d.js',
       'lib/bin/model.js',

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

@@ -5 +5 @@
 
 function model () {
-    function ones(...args) {
-        var array = [];
-        for (var i = 0; i < args[0]; ++i) {
-            array.push(args.length === 1 ? 1 : ones(args.slice(1)));
-        }
-        return array;
-    }
-
         //methods
                 this.disp = function() { //{{{
@@ -338 +330 @@
                 md.geometry=md.geometry.extrude(md);
                 md.friction  = md.friction.extrude(md);
-                md.inversion = extrude(md.inversion,md);
-                md.smb = extrude(md.smb,md);
+                md.inversion = md.inversion.extrude(md);
+                md.smb = md.smb.extrude(md);
                 md.initialization = extrude(md.initialization,md);
 

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

@@ -20 +20 @@
     //some regular checks
     
-
-    function ones(...args) {
-        var array = [];
-        for (var i = 0; i < args[0]; ++i) {
-            array.push(args.length === 1 ? 1 : ones(args.slice(1)));
-        }
-        return array;
-    }
-
     function remove_first_n(start, arglist) { // Using slice() on arguments is discouraged because it prevents optimizations in engines such as V8
         var args = [];

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

@@ -75 +75 @@
 
         }// }}}
+    this.extrude = function(md) {//{{{
+        this.vx_obs=project3d(md, 'vector', this.vx_obs, 'type', 'node');
+        this.vy_obs=project3d(md,'vector',this.vy_obs,'type','node');
+        this.vel_obs=project3d(md,'vector',this.vel_obs,'type','node');
+        this.thickness_obs=project3d(md,'vector',this.thickness_obs,'type','node');
+
+        if (numel(this.cost_functions_coefficients)>1) {
+            this.cost_functions_coefficients=project3d(md,'vector',this.cost_functions_coefficients,'type','node');
+        }                       
+        if (numel(this.min_parameters)>1) {
+            this.min_parameters=project3d(md,'vector',this.min_parameters,'type','node');
+        }
+        if (numel(this.max_parameters)>1) {
+            this.max_parameters=project3d(md,'vector',this.max_parameters,'type','node');
+        }
+    }//}}}
         this.classname= function(){// {{{
                 return "inversion";