Changeset 4718

Timestamp:

07/22/10 08:59:46 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src

Files:

• c/solutions/transient2d_core.cpp (modified) (1 diff)
• c/solutions/transient3d_core.cpp (modified) (1 diff)
• m/solutions/transient2d_core.m (modified) (1 diff)
• m/solutions/transient3d_core.m (modified) (1 diff)

issm/trunk/src/c/solutions/transient2d_core.cpp

@@ -36 +36 @@
         while(time<finaltime){ //make sure we run up to finaltime.
         
-                _printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
-
-                /*Set step and time: */
+                /*Increment*/
                 time+=dt;
                 step+=1;
+
+                _printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
                 if(verbose)_printf_("%s\n","computing new velocity");

issm/trunk/src/c/solutions/transient3d_core.cpp

@@ -35 +35 @@
 
         while(time<finaltime){ //make sure we run up to finaltime.
-        
-                if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
+                /*Increment*/
                 step+=1;
                 time+=dt;
+
+                if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
                 if(verbose)_printf_("computing temperatures:\n");

issm/trunk/src/m/solutions/transient2d_core.m

@@ -17 +17 @@
         %Loop through time
         while time<ndt,
-                displaystring(verbose,'\n%s%g%s%i%s%g\n','time [yr]: ',time,' iteration number: ',step,'/',floor(ndt/dt));
+
+                %increment
                 step=step+1;
                 time=time+dt;
+
+                displaystring(verbose,'\n%s%g%s%i%s%g\n','time [yr]: ',time,' iteration number: ',step,'/',floor(ndt/dt));
 
                 displaystring(verbose,'\n%s',['computing new velocities...']);

issm/trunk/src/m/solutions/transient3d_core.m

@@ -17 +17 @@
         %Loop through time
         while time<ndt,
+
+                %Increment
                 step=step+1;
                 time=time+dt;
+
                 displaystring(verbose,'\n%s%g%s%i%s%g\n','time [yr] ',time,' iteration number: ',step,'/',floor(ndt/dt));