Changeset 19857

Timestamp:

12/04/15 14:27:30 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no more time stepping in years (old from sea ice model)

Location:

issm/trunk-jpl/src/m/classes

Files:

• timestepping.js (modified) (4 diffs)
• timestepping.m (modified) (4 diffs)

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

@@ -19 +19 @@
                 //should we interpolate forcings between timesteps?
                 this.interp_forcings=1;
-
-                //In years by default
-                this.in_years = 1;
-
         }// }}}
         this.disp= function(){// {{{
                 console.log(sprintf('   timestepping parameters:'));
 
-                if(this.in_years) unit = 'yr';
-                else unit = 's';
+                unit = 'yr';
                 fielddisplay(this,'start_time','simulation starting time ['+ unit + ']');
                 fielddisplay(this,'final_time','final time to stop the simulation ['+ unit + ']');
@@ -35 +30 @@
                 fielddisplay(this,'cfl_coefficient','coefficient applied to cfl condition');
                 fielddisplay(this,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
-                fielddisplay(this,'in_years','time unit, 1: years, 0: seconds');
-
 
         }// }}}
@@ -58 +51 @@
 
                         var scale;
-                        if (this.in_years) scale = 365.0*24.0*3600.0;
-                        else scale = 1.;
+                        scale = 365.0*24.0*3600.0;
                         
                         WriteData(fid,'object',this,'fieldname','start_time','format','Double','scale',scale);
@@ -77 +69 @@
         this.cfl_coefficient = 0.;
         this.interp_forcings = 1;
-        this.in_years        = 1;
 
         this.setdefaultparameters();

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

@@ -12 +12 @@
                 cfl_coefficient = 0.;
                 interp_forcings = 1;
-                in_years        = 1;
         end
         methods
@@ -51 +50 @@
                         %should we interpolate forcings between timesteps?
                         self.interp_forcings=1;
-
-                        %In years by default
-                        self.in_years = 1;
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -70 +66 @@
                         disp(sprintf('   timestepping parameters:'));
 
-                        if(self.in_years)
-                                unit = 'yr';
-                        else
-                                unit = 's';
-                        end
+                        unit = 'yr';
                         fielddisplay(self,'start_time',['simulation starting time [' unit ']']);
                         fielddisplay(self,'final_time',['final time to stop the simulation [' unit ']']);
@@ -81 +73 @@
                         fielddisplay(self,'cfl_coefficient','coefficient applied to cfl condition');
                         fielddisplay(self,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
-                        fielddisplay(self,'in_years','time unit, 1: years, 0: seconds');
 
                 end % }}}
                 function marshall(self,md,fid) % {{{
 
-                        if self.in_years,
-                                scale = 365.0*24.0*3600.0;
-                        else
-                                scale = 1.;
-                        end
+                        scale = 365.0*24.0*3600.0;
                         WriteData(fid,'object',self,'fieldname','start_time','format','Double','scale',scale);
                         WriteData(fid,'object',self,'fieldname','final_time','format','Double','scale',scale);