Changeset 4687

Timestamp:

07/21/10 08:41:50 (15 years ago)

Author:

seroussi

Message:

arguments of InputeUpdateFrom Solution

Location:

issm/trunk/src/m

Files:

• solutions/adjoint_core.m (modified) (1 diff)
• solvers/solver_diagnostic_nonlinear.m (modified) (2 diffs)
• solvers/solver_linear.m (modified) (1 diff)
• solvers/solver_thermal_nonlinear.m (modified) (1 diff)

issm/trunk/src/m/solutions/adjoint_core.m

@@ -38 +38 @@
         end
 
-        femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,adjoint_g);
+        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,adjoint_g);
 
         displaystring(verbose,'\n%s',['      saving results...']);

issm/trunk/src/m/solvers/solver_diagnostic_nonlinear.m

@@ -21 +21 @@
 
         %Update the solution to make sure that vx and vxold are similar
-        femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
+        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
 
         while(~converged),
@@ -48 +48 @@
 
                 %Update inputs using new solution
-                femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
+                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
                 
                 displaystring(femmodel.parameters.Verbose,'%s','   penalty constraints');

issm/trunk/src/m/solvers/solver_linear.m

@@ -26 +26 @@
 
         %Update inputs using new solution
-        femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);
+        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);
 

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

@@ -40 +40 @@
 
                 displaystring(femmodel.parameters.Verbose,'%s',['   updating inputs']);
-                femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);
+                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);
         
                 %penalty constraints