Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp	(revision 15123)
+++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp	(revision 15124)
@@ -45,7 +45,4 @@
 	IssmDouble scale;
 	switch(type_enum){
-		case TimesteppingStartTimeEnum:              scale=1.0/yts;break; //yr
-		case TimesteppingFinalTimeEnum:              scale=1.0/yts;break; //yr
-		case TimesteppingTimeStepEnum:               scale=1.0/yts;break; //yr
 		case TimeEnum:                               scale=1.0/yts;break; //yr
 		case HydrologyWaterVxEnum:                   scale=yts;break;     //m/yr
Index: /issm/trunk-jpl/src/m/classes/timestepping.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.m	(revision 15123)
+++ /issm/trunk-jpl/src/m/classes/timestepping.m	(revision 15124)
@@ -55,7 +55,10 @@
 		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');
+
+			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');
Index: /issm/trunk-jpl/src/m/classes/timestepping.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 15123)
+++ /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 15124)
@@ -59,7 +59,10 @@
 	# }}}
 	def marshall(self,fid):    # {{{
-		WriteData(fid,'object',self,'fieldname','start_time','format','Double')
-		WriteData(fid,'object',self,'fieldname','final_time','format','Double')
-		WriteData(fid,'object',self,'fieldname','time_step','format','Double')
+
+		yts=365.0*24.0*3600.0;
+
+		WriteData(fid,'object',self,'fieldname','start_time','format','Double','scale',yts)
+		WriteData(fid,'object',self,'fieldname','final_time','format','Double','scale',yts)
+		WriteData(fid,'object',self,'fieldname','time_step','format','Double','scale',yts)
 		WriteData(fid,'object',self,'fieldname','time_adapt','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','cfl_coefficient','format','Double')