Changeset 20832

Timestamp:

06/29/16 12:37:20 (9 years ago)

Author:

ayfeng

Message:

FIX: Revert change to marshall in mask class (add prefix argument)
CHG: Ported mesh3dprisms and project3d to javascript

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/karma.conf.js (modified) (1 diff)
• src/m/classes/mask.js (modified) (1 diff)
• src/m/classes/mesh3dprisms.js (added)
• src/m/extrusion/project3d.js (added)

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

@@ -12 +12 @@
     // list of files / patterns to load in the browser
     files: [
+      'node_modules/jquery/dist/jquery.min.js',
       'node_modules/mathjs/dist/math.min.js',
       'lib/bin/EnumDefinitions.js',

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

@@ -56 +56 @@
                         }
                 } // }}}
-                this.marshall=function(md,fid) { //{{{
-            WriteData(fid,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
-            WriteData(fid,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
+                this.marshall=function(md,prefix,fid) { //{{{
+            WriteData(fid,prefix,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+            WriteData(fid,prefix,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 }//}}}
                 this.fix=function() { //{{{