Changeset 21341 for issm/trunk/src/m/classes/constants.m

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/constants.m (modified) (2 diffs)

issm/trunk/src/m/classes/constants.m

@@ -29 +29 @@
 
                         %converstion from year to seconds
-                        self.yts=365*24*3600;
+                        self.yts=365.*24.*3600.;
 
                         %the reference temperature for enthalpy model (cf Aschwanden)
@@ -52 +52 @@
 
                 end % }}}
-                function marshall(self,md,fid) % {{{
-                        WriteData(fid,'object',self,'fieldname','g','format','Double');
-                        WriteData(fid,'object',self,'fieldname','yts','format','Double');
-                        WriteData(fid,'object',self,'fieldname','referencetemperature','format','Double');
+                function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'object',self,'fieldname','g','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','yts','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','referencetemperature','format','Double');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{