Changeset 4522

Timestamp:

07/12/10 10:19:02 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed solver_thermal: UpdateFromSolution needs to be called before Penalty constrain

Location:

issm/trunk/src

Files:

• c/solvers/solver_thermal_nonlinear.cpp (modified) (2 diffs)
• m/solvers/solver_thermal_nonlinear.m (modified) (1 diff)

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -83 +83 @@
                 MatFree(&Kgg);
         
+                /*!Reduce load from g to f size: */
                 if (verbose) _printf_("   reducing load from g to f set\n");
-                /*!Reduce load from g to f size: */
                 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
 
@@ -100 +100 @@
                 MatFree(&Kff);VecFree(&pf);VecFree(&tg);
 
+                //Merge back to g set
                 if (verbose) _printf_("   merging solution from f to g set\n");
-                //Merge back to g set
                 Mergesolutionfromftogx(&tg, tf,fem->Gmn,fem->ys,fem->nodesets);
+
+                //Update inputs using new solution:
+                if (verbose) _printf_("   updating inputs\n");
+                InputUpdateFromSolutionx(fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg);
 
                 //Deal with penalty loads
                 if (verbose) _printf_("   penalty constraints\n");
                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters);
-                
-                //Update inputs using new solution:
-                InputUpdateFromVectorx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg,TemperatureEnum,VertexEnum);
-                InputUpdateFromSolutionx(fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg);
 
                 if (!converged){

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

@@ -39 +39 @@
                 t_g= Mergesolutionfromftog( t_f, femmodel.Gmn, femmodel.ys, femmodel.nodesets ); 
 
-                displaystring(femmodel.parameters.Verbose,'%s',['   update inputs']);
+                displaystring(femmodel.parameters.Verbose,'%s',['   updating inputs']);
                 femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);