Changeset 4804


Ignore:
Timestamp:
07/26/10 09:46:03 (15 years ago)
Author:
Mathieu Morlighem
Message:

fixed CM B

Location:
issm/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r4797 r4804  
    10551055        /*Scale: */
    10561056        yinput->AXPY(xinput,scalar);
     1057
     1058        /*Move input to Material if required (needed if control method) TO BE IMPROVED*/
     1059        if (YEnum==RheologyBEnum){
     1060                this->matice->inputs->AddInput((Input*)yinput->copy());
     1061        }
    10571062}
    10581063/*}}}*/
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r4780 r4804  
    14341434        /*Scale: */
    14351435        yinput->AXPY(xinput,scalar);
     1436
     1437        /*Move input to Material if required (needed if control method) TO BE IMPROVED*/
     1438        if (YEnum==RheologyBEnum){
     1439                this->matice->inputs->AddInput((Input*)yinput->copy());
     1440        }
     1441
    14361442}
    14371443/*}}}*/
  • issm/trunk/src/m/solutions/control_core.m

    r4565 r4804  
    5757                scalar=search_scalar*optscal(n);
    5858                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ControlParameterEnum,control_type);
    59                 femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
     59                [femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
    6060
    6161                displaystring('\n%s',['      constraning the new distribution...']);
  • issm/trunk/src/m/solutions/objectivefunctionC.m

    r4561 r4804  
    2525%Use search scalar to shoot parameter in the gradient direction:
    2626scalar=search_scalar*optscal;
    27 femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
     27[femmodel.elements femmodel.materials]=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
    2828
    2929%Constrain:
  • issm/trunk/src/mex/InputAXPY/InputAXPY.cpp

    r4573 r4804  
    4545        /*write output : */
    4646        WriteData(ELEMENTSOUT,elements);
     47        WriteData(MATERIALSOUT,materials);
    4748
    4849        /*Free ressources: */
  • issm/trunk/src/mex/InputAXPY/InputAXPY.h

    r4694 r4804  
    2929/* serial output macros: */
    3030#define ELEMENTSOUT (mxArray**)&plhs[0]
     31#define MATERIALSOUT (mxArray**)&plhs[1]
    3132
    3233/* serial arg counts: */
    3334#undef NLHS
    34 #define NLHS  1
     35#define NLHS  2
    3536#undef NRHS
    3637#define NRHS  9
Note: See TracChangeset for help on using the changeset viewer.