Changeset 15396 for issm/trunk/src/m/classes/timestepping.m

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/timestepping.m (modified) (1 diff)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/m/classes/timestepping.m

@@ -47 +47 @@
                         disp(sprintf('   timestepping parameters:'));
 
-                        fielddisplay(obj,'start_time','simulation starting time [yrs]');
-                        fielddisplay(obj,'final_time','final time to stop the simulation [yrs]');
-                        fielddisplay(obj,'time_step','length of time steps [yrs]');
+                        fielddisplay(obj,'start_time','simulation starting time [yr]');
+                        fielddisplay(obj,'final_time','final time to stop the simulation [yr]');
+                        fielddisplay(obj,'time_step','length of time steps [yr]');
                         fielddisplay(obj,'time_adapt','use cfl condition to define time step ? (0 or 1) ');
                         fielddisplay(obj,'cfl_coefficient','coefficient applied to cfl condition');
 
                 end % }}}
-                function marshall(obj,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','start_time','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','final_time','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','time_step','format','Double');
+                function marshall(obj,md,fid) % {{{
+
+                        yts=365.0*24.0*3600.0;
+
+                        WriteData(fid,'object',obj,'fieldname','start_time','format','Double','scale',yts);
+                        WriteData(fid,'object',obj,'fieldname','final_time','format','Double','scale',yts);
+                        WriteData(fid,'object',obj,'fieldname','time_step','format','Double','scale',yts);
                         WriteData(fid,'object',obj,'fieldname','time_adapt','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','cfl_coefficient','format','Double');

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache