Changeset 15124

Timestamp:

05/28/13 08:52:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: first test: removed moved timstepping conversion from Core to object

Location:

issm/trunk-jpl/src

Files:

• c/shared/Numerics/UnitConversion.cpp (modified) (1 diff)
• m/classes/timestepping.m (modified) (1 diff)
• m/classes/timestepping.py (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp ¶

@@ -45 +45 @@
         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

issm/trunk-jpl/src/m/classes/timestepping.m ¶

@@ -55 +55 @@
                 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');

issm/trunk-jpl/src/m/classes/timestepping.py ¶

@@ -59 +59 @@
         # }}}
         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')