Changeset 364


Ignore:
Timestamp:
05/12/09 15:05:41 (16 years ago)
Author:
Eric.Larour
Message:

analysis type is now taken from inputs, not from parameters

Location:
issm/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/solutions/cielo/diagnostic_core_linear.m

    r358 r364  
    1212       
    1313        %system matrices
    14         [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.loads,m.materials,m.parameters,inputs);
     14        [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.loads,m.materials,m.parameters,inputs,analysis_type);
    1515       
    1616        %Reduce tangent matrix from g size to f size

  • issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m

    r333 r364  
    3030               
    3131                %system matrices
    32                 [K_gg_nopenalty , p_g_nopenalty]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs);
     32                [K_gg_nopenalty , p_g_nopenalty]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type);
    3333               
    3434                %penalties
    35                 [K_gg , p_g]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,loads,m.materials,m.parameters,inputs);
     35                [K_gg , p_g]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type);
    3636
    3737

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

    r246 r364  
    2020        ParameterInputs* inputs=NULL;
    2121        int               analysis_type;
     22        char*             analysis_type_string=NULL;
    2223       
    2324        /*Boot module: */
    … …  
    3738        FetchData((void**)&kflag,NULL,NULL,mxGetField(PARAMETERS,0,"kflag"),"Integer",NULL);
    3839        FetchData((void**)&pflag,NULL,NULL,mxGetField(PARAMETERS,0,"pflag"),"Integer",NULL);
    39         FetchData((void**)&analysis_type,NULL,NULL,mxGetField(PARAMETERS,0,"analysis_type"),"Integer",NULL);
     40
     41        FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
     42        analysis_type=AnalysisTypeAsEnum(analysis_type_string);
     43
    4044
    4145        /*Fetch inputs: */
    … …  
    5862        MatFree(&Kgg);
    5963        VecFree(&pg);
     64        xfree((void**)&analysis_type_string);
    6065
    6166        /*end module: */

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

    r1 r364  
    2525#define PARAMETERS (mxArray*)prhs[6]
    2626#define INPUTS (mxArray*)prhs[7]
     27#define ANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3435#define NLHS  2
    3536#undef NRHS
    36 #define NRHS  8
     37#define NRHS  9
    3738
    3839

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

    r246 r364  
    1919        int         numberofdofspernode;
    2020        ParameterInputs* inputs=NULL;
     21        char*             analysis_type_string=NULL;
    2122        int               analysis_type;
    2223       
    … …  
    4142        FetchData((void**)&connectivity,NULL,NULL,mxGetField(PARAMETERS,0,"connectivity"),"Integer",NULL);
    4243        FetchData((void**)&numberofdofspernode,NULL,NULL,mxGetField(PARAMETERS,0,"numberofdofspernode"),"Integer",NULL);
    43         FetchData((void**)&analysis_type,NULL,NULL,mxGetField(PARAMETERS,0,"analysis_type"),"Integer",NULL);
     44
     45        FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
     46        analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    4447
    4548        /*Fetch inputs: */
    … …  
    5659       
    5760        /*Free ressources: */
     61        xfree((void**)&analysis_type_string);
    5862        delete elements;
    5963        delete nodes;

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

    r1 r364  
    2323#define PARAMETERS (mxArray*)prhs[4]
    2424#define INPUTS (mxArray*)prhs[5]
     25#define ANALYSIS (mxArray*)prhs[6]
    2526
    2627/* serial output macros: */
    … …  
    3233#define NLHS  2
    3334#undef NRHS
    34 #define NRHS  6
     35#define NRHS  7
    3536
    3637
Note: See TracChangeset for help on using the changeset viewer.