Changeset 20843

Timestamp:

07/01/16 22:19:24 (9 years ago)

Author:

ayfeng

Message:

FIX: mesh3dprisms not having marshall defined within the class,
support folding for mesh3dprisms

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBforcing.js (modified) (1 diff)
• mesh3dprisms.js (modified) (7 diffs)

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

@@ -65 +65 @@
     }//}}}
         //properties 
+    // {{{
         this.mass_balance = NaN;
         this.requested_outputs      = [];
         this.setdefaultparameters();
+    // }}}
 }

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

@@ -5 +5 @@
 
 function mesh3dprisms() {
-                this.setdefaultparameters = function() { // [[[)
+                this.setdefaultparameters = function() { //{{{
 
                         //the connectivity is the averaged number of nodes linked to a
@@ -13 +13 @@
                         //trunk/test/Miscellaneous/runme.m
                         this.average_vertex_connectivity=25;
-                } // ]]]
+                } // }}}
 
-                this.checkconsistency = function(md,solution,analyses) { // [[[)
+                this.checkconsistency = function(md,solution,analyses) { // {{{
 
                         checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
@@ -35 +35 @@
                         checkfield(md,'fieldname','mesh.z','<=',md.geometry.surface+Math.pow(10, -10),'message','\'mesh.z\' higher than surface elevation');
                         checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',24,'message','\'mesh.average_vertex_connectivity\' should be at least 24 in 3d');
-                } // ]]]
-                function disp() { // [[[
+                } // }}}
+                this.disp = function() { // {{{
                         console.log(sprintf('   3D prism Mesh:')); 
 
@@ -76 +76 @@
                         fielddisplay(this,'long','vertices longitude [degrees]');
                         fielddisplay(this,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
-                } // ]]]
-                function marshall(md,prefix,fid) { // [[[
+                } // }}}
+                this.marshall = function(md,prefix,fid) { // {{{
                         WriteData(fid,prefix,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain' + this.domaintype()]),'format','Integer');
                         WriteData(fid,prefix,'enum',DomainDimensionEnum(),'data',this.dimension(),'format','Integer');
@@ -96 +96 @@
                         WriteData(fid,prefix,'object',this,'class','mesh','fieldname','numberofvertices2d','format','Integer');
                         WriteData(fid,prefix,'object',this,'class','mesh','fieldname','numberofelements2d','format','Integer');
-                } // ]]]
+                } // }}}
         this.fix=function() { //{{{
             //Transform objects into Float64Arrays:
@@ -111 +111 @@
             this.long=NaNFix(this.long,NaN);
         }//}}}
-                this.domaintype = function() { // [[[)
+                this.domaintype = function() { // {{{
                         return '3D';
-                } // ]]]
-                this.dimension = function() { // [[[)
+                } // }}}
+                this.dimension = function() { // {{{
                         return 3;
-                } // ]]]
-                this.elementtype = function() { // [[[)
+                } // }}}
+                this.elementtype = function() { // {{{
                         return 'Penta';
-                } // ]]]
+                } // }}}
         this.classname = function () { //{{{
             return "mesh3dprisms";
         } //}}}
 
-        //properties (SetAccess=public) 
+        //properties
+        //{{{
         this.x                           = NaN;
         this.y                           = NaN;
@@ -157 +158 @@
         this.extractedvertices           = NaN;
         this.extractedelements           = NaN;
+        //}}}
 }