Changeset 1720

Timestamp:

08/17/09 11:21:53 (16 years ago)

Author:

seroussi

Message:

changed cielo serial time step to yrs

Location:

issm/trunk/src/m/solutions/cielo

Files:

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

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

@@ -24 +24 @@
         inputs=add(inputs,'melting',models.p.parameters.m_g,'doublevec',1,models.p.parameters.numberofnodes);
         inputs=add(inputs,'accumulation',models.p.parameters.a_g,'doublevec',1,models.p.parameters.numberofnodes);
-        inputs=add(inputs,'dt',models.p.parameters.dt,'double');
+        inputs=add(inputs,'dt',models.p.parameters.dt*models.p.parameters.yts,'double');
 
         displaystring(md.debug,'\n%s',['call computational core:']);

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

@@ -25 +25 @@
         inputs=add(inputs,'velocity',models.t.parameters.u_g,'doublevec',3,models.t.parameters.numberofnodes);
         inputs=add(inputs,'pressure',models.t.parameters.p_g,'doublevec',1,models.t.parameters.numberofnodes);
-        inputs=add(inputs,'dt',models.t.parameters.dt,'double');
+        inputs=add(inputs,'dt',models.t.parameters.dt*models.t.parameters.yts,'double');
         
         %call core

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

@@ -44 +44 @@
 inputs=add(inputs,'melting',models.p.parameters.m_g,'doublevec',1,models.p.parameters.numberofnodes);
 inputs=add(inputs,'accumulation',models.p.parameters.a_g,'doublevec',1,models.p.parameters.numberofnodes);
-inputs=add(inputs,'dt',models.p.parameters.dt,'double');
+inputs=add(inputs,'dt',models.p.parameters.dt*models.p.parameters.yts,'double'); %change time from yrs to sec
 
 % figure out number of dof: just for information purposes.
@@ -58 +58 @@
 while  time<finaltime+dt, %make sure we run up to finaltime.
 
-        disp(sprintf('\n%s%g%s%g%s%g\n','time [yr]: ',time/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).step=n+1;

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

@@ -56 +56 @@
 inputs=add(inputs,'melting',results.m_g,'doublevec',1,models.p.parameters.numberofnodes);
 inputs=add(inputs,'accumulation',results.a_g,'doublevec',1,models.p.parameters.numberofnodes);
-inputs=add(inputs,'dt',models.p.parameters.dt,'double');
+inputs=add(inputs,'dt',models.p.parameters.dt*models.p.parameters.yts,'double');
 
 % figure out number of dof: just for information purposes.
@@ -70 +70 @@
 while  time<finaltime+dt, %make sure we run up to finaltime.
 
-        displaystring(md.debug,'\n%s%g%s%g%s%g\n','time [yr]: ',time/yts,'    iteration number: ',n,'/',floor(finaltime/dt));
+        displaystring(md.debug,'\n%s%g%s%g%s%g\n','time [yr]: ',time,'    iteration number: ',n,'/',floor(finaltime/dt));
 
         results(n+1).step=n+1;