Changeset 4469

Timestamp:

07/08/10 14:40:51 (15 years ago)

Author:

seroussi

Message:

fixed problem in thermal serial

Location:

issm/trunk/src/m

Files:

• solutions/thermal_core_step.m (modified) (2 diffs)
• solvers/solver_thermal_nonlinear.m (modified) (3 diffs)

issm/trunk/src/m/solutions/thermal_core_step.m

@@ -1 @@
-function femmodel=thermal_core_step(femmodel)
+function femmodel=thermal_core_step(femmodel,step,time)
 %THERMAL_CORE_STEP - core of the thermal solution for one step 
 %
 %   Usage:
-%      femmodel=thermal_core_step(femmodel)
+%      femmodel=thermal_core_step(femmodel,step,time)
 
         %recover parameters common to all solutions
@@ -10 +10 @@
         displaystring(verbose,'\n%s',['computing temperature...']);
         femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
-        femmodel=solver_thermal_nonlineat(femmodel);
+        femmodel=solver_thermal_nonlinear(femmodel);
 
         displaystring(verbose,'\n%s',['compute melting...']);
-        femmodel=SetCurrentConfiguraton(femmodel,MeltingAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,MeltingAnalysisEnum);
         femmodel=solver_linear(femmodel);
         

issm/trunk/src/m/solvers/solver_thermal_nonlinear.m

@@ -22 +22 @@
                 if count==1
                         displaystring(femmodel.parameters.Verbose,'%s',['   system matrices']);
-                        [K_gg_nopenalty, p_g_nopenalty]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,analysis_type,sub_analysis_type);
+                        [K_gg_nopenalty, p_g_nopenalty]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
                 end
                 displaystring(femmodel.parameters.Verbose,'%s',['   penalty system matrices']);
-                [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,analysis_type,sub_analysis_type);
+                [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
 
                 %Reduce tangent matrix from g size to f size
@@ -44 +44 @@
                 %penalty constraints
                 displaystring(femmodel.parameters.Verbose,'%s',['   penalty constraints']);
-                [femmodel.loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,analysis_type,sub_analysis_type);
+                [femmodel.loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters);
         
                 if ~converged,
@@ -57 +57 @@
         end
 
+        %add melting_offset  into inputs
+        [femmodel.elements femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,melting_offset,MeltingOffsetEnum);
 end
+