Changeset 1810


Ignore:
Timestamp:
08/24/09 17:37:24 (16 years ago)
Author:
Eric.Larour
Message:

Brachning back from issm.controlstatic, by hand

Location:
issm/trunk/src/mex
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp

    r1184 r1810  
    2424
    2525        /*arguments to objectivefunctionC: */
    26         mxArray* m=NULL;
     26        mxArray* models=NULL;
    2727        mxArray* pg=NULL;
    2828        mxArray* grad_g=NULL;
    … …  
    4343
    4444        optargs.function_name=function_name;
    45         optargs.m=MODEL;
     45        optargs.models=MODELS;
    4646        optargs.param_g=PG;
    4747        optargs.inputs=INPUTS;

  • issm/trunk/src/mex/ControlOptimization/ControlOptimization.h

    r1184 r1810  
    2121#define XMAX (mxArray*)prhs[2]
    2222#define OPTIONS (mxArray*)prhs[3]
    23 #define MODEL (mxArray*)prhs[4]
     23#define MODELS (mxArray*)prhs[4]
    2424#define INPUTS (mxArray*)prhs[5]
    2525#define PG (mxArray*)prhs[6]

  • issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp

    r1629 r1810  
    2020
    2121        /*input model: */
    22         Model* model=NULL;
     22        IoModel* iomodel=NULL;
    2323
    2424        /*Boot module: */
    … …  
    2828        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ModelProcessorUsage);
    2929
    30         /*Fill model with matlab workspace data: */
    31         ModelInit(&model,MODEL); //this routine goes through the entire MODEL matlab class, and starts filling the corresponding "c" code model object.
     30        /*Fill iomodel with matlab workspace data: */
     31        IoModelInit(&iomodel,MODEL); //this routine goes through the entire MODEL matlab class, and starts filling the corresponding "c" code model object.
    3232
    3333        /*Create elements, nodes and materials: */
    34         CreateDataSets(&elements,&nodes,&materials,&constraints, &loads, &parameters, model,MODEL);
     34        CreateDataSets(&elements,&nodes,&materials,&constraints, &loads, &parameters, iomodel,MODEL);
    3535       
    3636        /*Write output data: */
    … …  
    4444
    4545        /*Free ressources: */
    46         DeleteModel(&model);
     46        DeleteIoModel(&iomodel);
    4747        delete elements;
    4848        delete nodes;
Note: See TracChangeset for help on using the changeset viewer.