Changeset 20893

Timestamp:

07/13/16 11:06:29 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: syncing deltathickness size

Location:

issm/trunk-jpl/src/m/classes

Files:

• slr.js (modified) (3 diffs)
• slr.m (modified) (1 diff)
• slr.py (modified) (2 diffs)

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

@@ -60 +60 @@
                         return ['Sealevel'];
                 }//}}}
-        this.classname= function(){// {{{
-                return "slr";
-        }// }}}
+                this.classname= function(){// {{{
+                        return "slr";
+                }// }}}
                 this.disp= function(){// {{{
                         
@@ -83 +83 @@
                 fielddisplay(this,'requested_outputs','additional outputs requested');
                 } //}}}
-                        this.marshall=function(md,prefix,fid) { //{{{
+                this.marshall=function(md,prefix,fid) { //{{{
 
                         WriteData(fid,prefix,'object',this,'fieldname','deltathickness','format','DoubleMat','mattype',2);
@@ -99 +99 @@
                         WriteData(fid,prefix,'object',this,'fieldname','degacc','format','Double');
                         WriteData(fid,prefix,'object',this,'fieldname','transitions','format','MatArray');
-                        
+
                         //process requested outputs
                         var outputs = this.requested_outputs;

issm/trunk-jpl/src/m/classes/slr.m

@@ -63 +63 @@
                         if ~ismember(SealevelriseAnalysisEnum(),analyses), return; end
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
-                        %md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);

issm/trunk-jpl/src/m/classes/slr.py

@@ -91 +91 @@
                         return md
 
-                md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
+                md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements,1])
                 md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
                 md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1)
@@ -113 +113 @@
         # }}}
         def marshall(self,prefix,md,fid): # {{{
-                WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',1)
+                WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2)
                 WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1)
                 WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double')