Changeset 6130 for issm/trunk/src/c/solutions/transient3d_core.cpp

Timestamp:

10/04/10 00:01:17 (14 years ago)

Author:

Eric.Larour

Message:

New time stepping, using CFL criterion. Just set time_adapt=1, and set cfl_coefficient (usually 1/2),
and off we go computing new time steps at every iteration.

File:

• issm/trunk/src/c/solutions/transient3d_core.cpp (modified) (3 diffs)

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

@@ -20 +20 @@
         double dt,yts;
         bool control_analysis;
+        bool   time_adapt=false;
         int    solution_type;
         int    output_frequency;
@@ -35 +36 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
+        femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
 
         /*initialize: */
@@ -43 +45 @@
 
                 /*Increment*/
+                if(time_adapt) TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
                 step+=1;
                 time+=dt;
 
-                if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
+                _printf_("%s%g%s%i%s%g%s%g\n","time [yr]: ",time/yts,"    iteration number: ",step,"/",floor(finaltime/dt)," dt [yr]: ",dt/yts);
 
                 if(verbose)_printf_("computing temperatures:\n");