Changeset 20794

Timestamp:

06/22/16 16:09:37 (9 years ago)

Author:

ayfeng

Message:

Implement extrude functionality for geometry module

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (2 diffs)
• jenkins/javascript/karma/lib/bin/geometry.js (added)
• jenkins/javascript/karma/lib/bin/model.js (modified) (1 diff)
• jenkins/javascript/karma/package.json (modified) (1 diff)
• jenkins/javascript/karma/scripts/m2js.sh (modified) (4 diffs)
• src/m/classes/geometry.js (modified) (1 diff)

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

@@ -22 +22 @@
       'lib/bin/levelset.js',
       'lib/bin/mask.js',
+      'lib/bin/geometry.js',
+      'lib/bin/project3d.js',
       'lib/bin/model.js',
-      'scripts/specs/issm.spec.js'
+      'scripts/specs/temp.spec.js'
+      //'scripts/specs/3.spec.js'
     ],
 
@@ -65 +68 @@
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    //browsers: ['Chrome'],
     browsers: ['Chrome'],
 

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=extrude(md.geometry,md);
+            md.geometry=md.geometry.extrude(md);
                 md.friction  = extrude(md.friction,md);
                 md.inversion = extrude(md.inversion,md);

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

@@ -4 +4 @@
     "karma": "^0.13.22",
     "karma-chrome-launcher": "^1.0.1",
+    "karma-firefox-launcher": "^1.0.0",
     "karma-jasmine": "^1.0.2",
     "karma-jasmine-jquery": "^0.1.1",

issm/trunk-jpl/jenkins/javascript/karma/scripts/m2js.sh

@@ -11 +11 @@
     fi
 
+    if [[ $OUTFILE == test*.js ]]; then
+        sed -i '2s/^/var md = new model();\n/' $OUTFILE # initialize the model
+    fi
 
     OUTFILE=$(dirname $INFILE)/$(basename $INFILE .m).js
@@ -24 +27 @@
     fi
 
-    if [[ $OUTFILE == test*.js ]]; then
-        sed -i '2s/^/var md = new model();\n/' $OUTFILE # initialize the model
-    fi
-
 
     sed -i 's/.*setmask\(.*\)/setmask\1/' $OUTFILE # setmask
@@ -37 +36 @@
 
     sed -i 's/.*parameterize.*/parameterize(md);/' $OUTFILE # parameterize
-    sed -i 's/^\s*\(extrude\)\(.*\)/md\.\1\2/' $OUTFILE # extrude
+    sed -i 's/^.*\(extrude\)\(.*\)/md\.\1\2/' $OUTFILE # extrude
 
     sed -i '/.*solve.*/! s/^md\s*=\s*//' $OUTFILE # remove md= unless it calls solve
@@ -59 +58 @@
 
     if grep 'zeros(.*)' $OUTFILE; then
-        sed -i '2s/^/function zeros(...args) {\n\tvar array = [];\n\tfor (var i = 0; i < args[0]; ++i) {\n\t\tarray.push(args.length == 1 ? 0 : zeros(args.slice(1)));\n\t}\n\treturn array;\n}\n/' $OUTFILE
+        sed -i '2s/^/function zeros(...args) {\n\tvar array = [];\n\tfor (var i = 0; i < args[0]; ++i) {\n\t\tarray.push(args.length == 1 ? 0 : zeros(args.slice(1)));\n\t}\n\treturn array;\n}\nvar md = new model();\n/' $OUTFILE
     fi # include zeros function to generate matrices of zeros
 

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

@@ -16 +16 @@
                         fielddisplay(this,'bed','bed elevation [m]');
                 } //}}}
+        this.extrude = function(md) {//{{{
+            this.surface=project3d(md,'vector',this.surface,'type','node');
+            this.thickness=project3d(md,'vector',this.thickness,'type','node');
+            this.hydrostatic_ratio=project3d(md,'vector',this.hydrostatic_ratio,'type','node');
+            this.base=project3d(md,'vector',this.base,'type','node');
+            this.bed=project3d(md,'vector',this.bed,'type','node');
+        }//}}}
                 this.classname = function () { //{{{
                         return 'geometry';