Changeset 20813

Timestamp:

06/27/16 11:29:35 (9 years ago)

Author:

ayfeng

Message:

CHG: Implement extrude for levelset

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/lib/bin/levelset.js (modified) (2 diffs)
• jenkins/javascript/karma/lib/bin/model.js (modified) (1 diff)
• src/m/classes/levelset.js (modified) (1 diff)

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

@@ -21 +21 @@
 
         }// }}}
+    this.extrude = function(md) {//{{{
+        this.spclevelset=project3d(md,'vector',this.spclevelset,'type','node');
+        return this;
+    }//}}}
         this.classname= function(){// {{{
                 return "levelset";
@@ -31 +35 @@
                 checkfield(md,'fieldname','levelset.stabilization','values',[0,1,2]);
         } //}}}
-                this.marshall=function(md,fid) { //{{{
-                        WriteData(fid,'object',this,'class','levelset','fieldname','stabilization','format','Integer');
-                        WriteData(fid,'enum',SpclevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
-                        WriteData(fid,'object',this,'class','levelset','fieldname','reinit_frequency','format','Integer');
+        this.marshall=function(md,prefix,fid) { //{{{
+                WriteData(fid,prefix,'object',this,'fieldname','stabilization','format','Integer');
+                WriteData(fid,prefix,'object',this,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
+                WriteData(fid,prefix,'object',this,'fieldname','reinit_frequency','format','Integer');
 
-                }//}}}
+        }//}}}
                 this.fix=function() { //{{{
                         this.spclevelset=NullFix(this.spclevelset,NaN);

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

@@ -338 +338 @@
                 md.thermal=md.thermal.extrude(md);
                 md.masstransport=md.masstransport.extrude(md);
-                md.levelset=extrude(md.levelset,md);
+                md.levelset=md.levelset.extrude(md);
                 md.calving=extrude(md.calving,md);
                 md.hydrology = extrude(md.hydrology,md);

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

@@ -21 +21 @@
 
         }// }}}
+    this.extrude = function(md) {//{{{
+        this.spclevelset=project3d(md,'vector',this.spclevelset,'type','node');
+        return this;
+    }//}}}
         this.classname= function(){// {{{
                 return "levelset";