Changeset 5280


Ignore:
Timestamp:
08/16/10 11:35:46 (15 years ago)
Author:
Mathieu Morlighem
Message:

moved md.fit to md.cm_responses and 0-4 to enums

Location:
issm/trunk/src/mex/CostFunction
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/mex/CostFunction/CostFunction.cpp

    r4974 r5280  
    88
    99        /*input datasets: */
    10         Elements* elements=NULL;
    11         Loads* loads=NULL;
    12         Nodes* nodes=NULL;
    13         Vertices* vertices=NULL;
    14         Materials* materials=NULL;
    15         Parameters* parameters=NULL;
    16         bool process_units=false;
     10        Elements   *elements   = NULL;
     11        Loads      *loads      = NULL;
     12        Nodes      *nodes      = NULL;
     13        Vertices   *vertices   = NULL;
     14        Materials  *materials  = NULL;
     15        Parameters *parameters = NULL;
     16        int         response;
    1717
    1818        /* output datasets: */
     
    3232        FetchData((DataSet**)&materials,MATERIALS);
    3333        FetchParams(&parameters,PARAMETERS);
     34        FetchData(&response,RESPONSE);
    3435
    3536        /*configure: */
     
    3940
    4041        /*!Call core code: */
    41         CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters,process_units);
     42        CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters,response);
    4243
    4344        /*write output : */
     
    5960{
    6061        _printf_("\n");
    61         _printf_("   usage: [J] = %s(elements,nodes,vertices,loads, materials, parameters);\n",__FUNCT__);
     62        _printf_("   usage: [J] = %s(elements,nodes,vertices,loads, materials, parameters,response);\n",__FUNCT__);
    6263        _printf_("\n");
    6364}
  • issm/trunk/src/mex/CostFunction/CostFunction.h

    r4236 r5280  
    2323#define MATERIALS (mxArray*)prhs[4]
    2424#define PARAMETERS (mxArray*)prhs[5]
     25#define RESPONSE (mxArray*)prhs[6]
    2526
    2627/* serial output macros: */
     
    3132#define NLHS  1
    3233#undef NRHS
    33 #define NRHS  6
     34#define NRHS  7
    3435
    3536#endif  /* _COSTFUNCTION_H */
Note: See TracChangeset for help on using the changeset viewer.