Changeset 1718

Timestamp:

08/17/09 11:21:09 (15 years ago)

Author:

seroussi

Message:

changed ice time step in years

Location:

issm/trunk/src/m/solutions/ice

Files:

• prognostic.m (modified) (1 diff)
• thermal.m (modified) (3 diffs)
• transient2d.m (modified) (2 diffs)
• transient3d.m (modified) (2 diffs)

issm/trunk/src/m/solutions/ice/prognostic.m

@@ -52 +52 @@
 %inputs=struct('thickness',thickness,'melting',melting,'accumulation',accumulation,...
 %'surface_vertical_velocity',ws,'basal_vertical_velocity',wb,'dt',md.dt,'velocity_average',velocity_average);
-inputs=struct('thickness',thickness,'melting',melting,'accumulation',accumulation,'dt',md.dt,'velocity_average',velocity_average);
+inputs=struct('thickness',thickness,'melting',melting,'accumulation',accumulation,'dt',md.dt*md.yts,'velocity_average',velocity_average);
 
 %Run core solution

issm/trunk/src/m/solutions/ice/thermal.m

@@ -33 +33 @@
         disp('   computing temperature...');
         gridset=m_t.gridset;
-        inputs=struct('pressure',pressure,'velocity',velocity,'dt',md.dt);
+        inputs=struct('pressure',pressure,'velocity',velocity,'dt',md.dt*md.yts);
         [t_g m_t.loads_t melting_offset]=thermal_core(m_t,analysis_type,inputs);
         
@@ -65 +65 @@
 
                 soln(n+1).time=(n)*md.dt;
-                disp(sprintf('\n%s%i/%i\n','time step: ',n,md.ndt/md.dt));
+                disp(sprintf('\n%s%i/%i\n','time step: ',n,floor(md.ndt/md.dt)));
 
                 %Call core thermal computation
                 disp('   computing temperature...');
                 gridset=m_t.gridset;
-                inputs=struct('pressure',pressure,'temperature',soln(n).t_g,'velocity',velocity,'dt',md.dt);
+                inputs=struct('pressure',pressure,'temperature',soln(n).t_g,'velocity',velocity,'dt',md.dt*md.yts);
                 [soln(n+1).t_g m_t.loads  melting_offset]=thermal_core(m_t,analysis_type,inputs);
 
@@ -76 +76 @@
                 disp('   computing melting...');
                 gridset=m_m.gridset;
-                inputs=struct('pressure',pressure,'temperature',soln(n+1).t_g,'melting_offset',melting_offset,'dt',md.dt);
+                inputs=struct('pressure',pressure,'temperature',soln(n+1).t_g,'melting_offset',melting_offset,'dt',md.dt*md.yts);
                 soln(n+1).m_g=melting_core(m_m,analysis_type,inputs);
                 

issm/trunk/src/m/solutions/ice/transient2d.m

@@ -46 +46 @@
 fem.inputs.accumulation=accumulation;
 fem.inputs.melting=melting;
-fem.inputs.dt=md.dt;
+fem.inputs.dt=md.dt*md.yts;
 
 %first time step is given by model. 
@@ -56 +56 @@
 while  time<finaltime+dt, %make sure we run up to finaltime.
 
-        disp(sprintf('\n%s%g%s%g%s%g\n','time [yr]: ',time/md.yts,'    iteration number: ',n,'/',floor(finaltime/dt)));
+        disp(sprintf('\n%s%g%s%g%s%g\n','time [yr]: ',time,'    iteration number: ',n,'/',floor(finaltime/dt)));
         
         solution(n+1).time=time;

issm/trunk/src/m/solutions/ice/transient3d.m

@@ -63 +63 @@
 fem.inputs.melting=zeros(fem.m_m.gridset.gsize,1); melting=ShiftLayers(md,md.melting,1,1); fem.inputs.melting(1:6:fem.m_m.gridset.gsize)=melting;
 fem.inputs.accumulation=zeros(fem.m_m.gridset.gsize,1); accumulation=ShiftLayers(md,md.accumulation,md.numlayers,1); fem.inputs.accumulation(1:6:fem.m_m.gridset.gsize)=accumulation;
-fem.inputs.dt=md.dt;
+fem.inputs.dt=md.dt*md.yts;
 
 %first time step is given by model. 
@@ -73 +73 @@
 while  time<finaltime+dt, %make sure we run up to finaltime.
 
-        disp(sprintf('\n%s%g%s%g%s%g\n','time [yr]: ',time/md.yts,'    iteration number: ',n,'/',floor(finaltime/dt)));
+        disp(sprintf('\n%s%g%s%g%s%g\n','time [yr]: ',time,'    iteration number: ',n,'/',floor(finaltime/dt)));
         
         solution(n+1).time=time;