Changeset 4687


Ignore:
Timestamp:
07/21/10 08:41:50 (15 years ago)
Author:
seroussi
Message:

arguments of InputeUpdateFrom Solution

Location:
issm/trunk/src/m
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/solutions/adjoint_core.m

    r4535 r4687  
    3838        end
    3939
    40         femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,adjoint_g);
     40        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,adjoint_g);
    4141
    4242        displaystring(verbose,'\n%s',['      saving results...']);
  • issm/trunk/src/m/solvers/solver_diagnostic_nonlinear.m

    r4592 r4687  
    2121
    2222        %Update the solution to make sure that vx and vxold are similar
    23         femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
     23        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
    2424
    2525        while(~converged),
     
    4848
    4949                %Update inputs using new solution
    50                 femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
     50                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
    5151               
    5252                displaystring(femmodel.parameters.Verbose,'%s','   penalty constraints');
  • issm/trunk/src/m/solvers/solver_linear.m

    r4538 r4687  
    2626
    2727        %Update inputs using new solution
    28         femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);
     28        [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);
    2929
  • issm/trunk/src/m/solvers/solver_thermal_nonlinear.m

    r4522 r4687  
    4040
    4141                displaystring(femmodel.parameters.Verbose,'%s',['   updating inputs']);
    42                 femmodel.elements=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);
     42                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);
    4343       
    4444                %penalty constraints
Note: See TracChangeset for help on using the changeset viewer.