Changeset 14103

Timestamp:

12/07/12 09:57:48 (12 years ago)

Author:

jschierm

Message:

FIX: Fix md.timestepping defaults.

Location:

issm/trunk-jpl/src/m/classes

Files:

• timestepping.m (modified) (2 diffs)
• timestepping.py (modified) (2 diffs)

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

@@ -6 +6 @@
 classdef timestepping
         properties (SetAccess=public) 
-                start_time      = 0;
-                final_time      = 0;
-                time_step       = 0;
+                start_time      = 0.;
+                final_time      = 0.;
+                time_step       = 0.;
                 time_adapt      = 0;
-                cfl_coefficient = 0;
+                cfl_coefficient = 0.;
         end
         methods
@@ -24 +24 @@
 
                         %time between 2 time steps
-                        obj.time_step=1/2;
+                        obj.time_step=1./2.;
 
                         %final time
-                        obj.final_time=10*obj.time_step;
+                        obj.final_time=10.*obj.time_step;
 
                         %time adaptation? 
                         obj.time_adapt=0;
-                        obj.cfl_coefficient=.5;
+                        obj.cfl_coefficient=0.5;
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{

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

@@ -16 +16 @@
         def __init__(self):
                 # {{{ Properties
-                self.start_time      = 0
-                self.final_time      = 0
-                self.time_step       = 0
+                self.start_time      = 0.
+                self.final_time      = 0.
+                self.time_step       = 0.
                 self.time_adapt      = 0
-                self.cfl_coefficient = 0
+                self.cfl_coefficient = 0.
                 
                 #set defaults
@@ -41 +41 @@
                 
                 #time between 2 time steps
-                self.time_step=1/2
+                self.time_step=1./2.
 
                 #final time
-                self.final_time=10*self.time_step
+                self.final_time=10.*self.time_step
 
                 #time adaptation? 
                 self.time_adapt=0
-                self.cfl_coefficient=.5
+                self.cfl_coefficient=0.5
 
                 return self