Changeset 11823 for issm/trunk-jpl/src/m/solutions/enthalpy_core.m

Timestamp:

03/30/12 11:04:02 (13 years ago)

Author:

seroussi

Message:

removed loop in enthalpy -> use transient for transient enthalpy models

File:

• issm/trunk-jpl/src/m/solutions/enthalpy_core.m (modified) (1 diff)

issm/trunk-jpl/src/m/solutions/enthalpy_core.m ¶

@@ -6 +6 @@
 
         %recover parameters common to all solutions
-        ndt=femmodel.parameters.TimesteppingFinalTime;
-        dt=femmodel.parameters.TimesteppingTimeStep;
         control_analysis=femmodel.parameters.InversionIscontrol;
         solution_type=femmodel.parameters.SolutionType;
 
-        %Compute number of timesteps
-        if (dt==0 | ndt==0),
-                dt=0;
-                nsteps=1;
-        else
-                nsteps=floor(ndt/dt);
-        end
+        issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
+        femmodel=enthalpy_core_step(femmodel); 
 
-        %Loop through time
-        for i=1:nsteps,
-                issmprintf(VerboseSolution,'\n%s%i/%i\n','time step: ',i,nsteps);
-                time=(i+1)*dt;
-
-                femmodel=enthalpy_core_step(femmodel,i,time); 
-
-                if (solution_type==EnthalpySolutionEnum & ~control_analysis),
-                        issmprintf(VerboseSolution,'\n%s',['   saving results']);
-                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum,i,time);
-                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time);
-                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum,i,time);
-                end
+        if (solution_type==EnthalpySolutionEnum & ~control_analysis),
+                issmprintf(VerboseSolution,'\n%s',['   saving results']);
+                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum);
+                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum);
+                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum);
         end