Changeset 3445


Ignore:
Timestamp:
04/08/10 06:49:19 (15 years ago)
Author:
Eric.Larour
Message:

Updates for vertices on all modules.

Location:
issm/trunk/src/mex
Files:
3 added
1 deleted
31 edited

Legend:

Unmodified
Added
Removed

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

    r2333 r3445  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3132        FetchData(&elements,ELEMENTS);
    3233        FetchData(&nodes,NODES);
     34        FetchData(&vertices,VERTICES);
    3335        FetchData(&loads,LOADS);
    3436        FetchData(&materials,MATERIALS);
    … …  
    4042        inputs->Init(INPUTS);
    4143
    42         UpdateFromInputsx(elements,nodes,loads, materials,parameters,inputs);
     44        UpdateFromInputsx(elements,nodes,vertices,loads, materials,parameters,inputs);
    4345
    4446        /*!Generate internal degree of freedom numbers: */
    45         ComputePressurex(&p_g, elements,nodes,loads,materials,parameters);
     47        ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters);
    4648
    4749        /*write output datasets: */
    … …  
    5052        /*Free ressources: */
    5153        delete nodes;
     54        delete vertices;
    5255        delete elements;
    5356        delete materials;

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

    r2333 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (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

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

    r2333 r3445  
    1414        DataSet* loads=NULL;
    1515        DataSet* nodes=NULL;
     16        DataSet* vertices=NULL;
    1617        DataSet* materials=NULL;
    1718        DataSet* parameters=NULL;
    … …  
    2930        FetchData(&loads,LOADSIN);
    3031        FetchData(&nodes,NODES);
     32        FetchData(&vertices,VERTICES);
    3133        FetchData(&materials,MATERIALS);
    3234        FetchData(&parameters,PARAMETERS);
    3335
    3436        /*!Configure objects:*/
    35         ConfigureObjectsx(elements, loads, nodes, materials,parameters);
     37        ConfigureObjectsx(elements, loads, nodes, vertices,materials,parameters);
    3638
    3739        /*write output datasets: */
    … …  
    4547        delete loads;
    4648        delete nodes;
     49        delete vertices;
    4750        delete materials;
    4851        delete parameters;

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

    r2333 r3445  
    2020#define LOADSIN (mxArray*)prhs[1]
    2121#define NODES (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
     22#define VERTICES (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
    2425
    2526/* serial output macros: */
    … …  
    3334#define NLHS  4
    3435#undef NRHS
    35 #define NRHS  5
     36#define NRHS  6
    3637
    3738

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

    r3179 r3445  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
     14        DataSet* loads=NULL;
    1415        DataSet* nodes=NULL;
    15         DataSet* loads=NULL;
     16        DataSet* vertices=NULL;
    1617        DataSet* materials=NULL;
    1718        DataSet* parameters=NULL;
    … …  
    3233        FetchData(&elements,ELEMENTS);
    3334        FetchData(&nodes,NODES);
     35        FetchData(&vertices,VERTICES);
    3436        FetchData(&loads,LOADS);
    3537        FetchData(&materials,MATERIALS);
    … …  
    4345
    4446        /*!Call core code: */
    45         CostFunctionx(&J, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
     47        CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
    4648
    4749        /*write output : */
    … …  
    5153        delete elements;
    5254        delete nodes;
     55        delete vertices;
    5356        delete loads;
    5457        delete materials;

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

    r3179 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3334#define NLHS  1
    3435#undef NRHS
    35 #define NRHS  8
     36#define NRHS  9
    3637
    3738

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3334        FetchData(&elements,ELEMENTS);
    3435        FetchData(&nodes,NODES);
     36        FetchData(&vertices,VERTICES);
    3537        FetchData(&loads,LOADS);
    3638        FetchData(&materials,MATERIALS);
    … …  
    4446
    4547        /*!Call core code: */
    46         Dux(&du_g, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
     48        Dux(&du_g, elements,nodes,vertices, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
    4749
    4850        /*write output : */
    … …  
    5254        delete elements;
    5355        delete nodes;
     56        delete vertices;
    5457        delete loads;
    5558        delete materials;

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

    r1185 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3334#define NLHS  1
    3435#undef NRHS
    35 #define NRHS  8
     36#define NRHS  9
    3637
    3738

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

    r3372 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    2829        FetchData(&elements,ELEMENTS);
    2930        FetchData(&nodes,NODES);
     31        FetchData(&vertices,VERTICES);
    3032        FetchData(&loads,LOADS);
    3133        FetchData(&materials,MATERIALS);
    … …  
    3537
    3638        /*!Call core code: */
    37         FieldAverageOntoVerticesx(field,elements,nodes,loads,materials,parameters,fieldname);
     39        FieldAverageOntoVerticesx(field,elements,nodes,vertices,loads,materials,parameters,fieldname);
    3840
    3941        /*write output : */
    … …  
    4345        delete elements;
    4446        delete nodes;
     47        delete vertices;
    4548        delete loads;
    4649        delete materials;

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

    r3372 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define FIELD (mxArray*)prhs[5]
    25 #define FIELDNAME (mxArray*)prhs[6]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define FIELD (mxArray*)prhs[6]
     26#define FIELDNAME (mxArray*)prhs[7]
    2627
    2728/* serial output macros: */
    … …  
    3233#define NLHS  1
    3334#undef NRHS
    34 #define NRHS  7
     35#define NRHS  8
    3536
    3637

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    2829        FetchData(&elements,ELEMENTS);
    2930        FetchData(&nodes,NODES);
     31        FetchData(&vertices,VERTICES);
    3032        FetchData(&loads,LOADS);
    3133        FetchData(&materials,MATERIALS);
    … …  
    3537
    3638        /*!Call core code: */
    37         FieldDepthAveragex(field,elements,nodes,loads,materials,parameters,fieldname);
     39        FieldDepthAveragex(field,elements,nodes,vertices,loads,materials,parameters,fieldname);
    3840
    3941        /*write output : */
    … …  
    4345        delete elements;
    4446        delete nodes;
     47        delete vertices;
    4548        delete loads;
    4649        delete materials;

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

    r2333 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define FIELD (mxArray*)prhs[5]
    25 #define FIELDNAME (mxArray*)prhs[6]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define FIELD (mxArray*)prhs[6]
     26#define FIELDNAME (mxArray*)prhs[7]
    2627
    2728/* serial output macros: */
    … …  
    3233#define NLHS  1
    3334#undef NRHS
    34 #define NRHS  7
     35#define NRHS  8
    3536
    3637

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    2930        FetchData(&elements,ELEMENTS);
    3031        FetchData(&nodes,NODES);
     32        FetchData(&vertices,VERTICES);
    3133        FetchData(&loads,LOADS);
    3234        FetchData(&materials,MATERIALS);
    … …  
    3739
    3840        /*!Call core code: */
    39         FieldExtrudex(field,elements,nodes,loads,materials,parameters,field_name,collapse);
     41        FieldExtrudex(field,elements,nodes,vertices,loads,materials,parameters,field_name,collapse);
    4042
    4143        /*write output : */
    … …  
    4547        delete elements;
    4648        delete nodes;
     49        delete vertices;
    4750        delete loads;
    4851        delete materials;

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

    r2333 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define FIELD (mxArray*)prhs[5]
    25 #define FIELDNAME (mxArray*)prhs[6]
    26 #define COLLAPSE (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define FIELD (mxArray*)prhs[6]
     26#define FIELDNAME (mxArray*)prhs[7]
     27#define COLLAPSE (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3334#define NLHS  1
    3435#undef NRHS
    35 #define NRHS  8
     36#define NRHS  9
    3637
    3738

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3536        FetchData(&elements,ELEMENTS);
    3637        FetchData(&nodes,NODES);
     38        FetchData(&vertices,VERTICES);
    3739        FetchData(&loads,LOADS);
    3840        FetchData(&materials,MATERIALS);
    … …  
    4850
    4951        /*!Call core code: */
    50         Gradjx(&grad_g,numberofnodes,elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type,control_type);
     52        Gradjx(&grad_g,numberofnodes,elements,nodes,vertices,loads,materials,parameters,inputs,analysis_type,sub_analysis_type,control_type);
    5153
    5254        /*write output : */
    … …  
    5658        delete elements;
    5759        delete nodes;
     60        delete vertices;
    5861        delete loads;
    5962        delete materials;

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

    r1188 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3334#define NLHS  1
    3435#undef NRHS
    35 #define NRHS  8
     36#define NRHS  9
    3637
    3738

  • issm/trunk/src/mex/Makefile.am

    r3372 r3445  
    5858                                TriMeshRefine\
    5959                                UpdateFromInputs\
    60                                 UpdateNodePositions\
     60                                UpdateVertexPositions\
    6161                                UpdateGeometry
    6262
    … …  
    246246                          UpdateGeometry/UpdateGeometry.h
    247247
    248 UpdateNodePositions_SOURCES = UpdateNodePositions/UpdateNodePositions.cpp\
    249                           UpdateNodePositions/UpdateNodePositions.h
    250 
     248UpdateVertexPositions_SOURCES = UpdateVertexPositions/UpdateVertexPositions.cpp\
     249                          UpdateVertexPositions/UpdateVertexPositions.h
     250

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3334        FetchData(&elements,ELEMENTS);
    3435        FetchData(&nodes,NODES);
     36        FetchData(&vertices,VERTICES);
    3537        FetchData(&loads,LOADS);
    3638        FetchData(&materials,MATERIALS);
    … …  
    4244
    4345        /*!Compute mass flux along the profile: */
    44         MassFluxx(&mass_flux, elements,nodes,loads,materials,parameters,segments,num_segments,ug);
     46        MassFluxx(&mass_flux, elements,nodes,vertices,loads,materials,parameters,segments,num_segments,ug);
    4547
    4648        /*write output datasets: */
    … …  
    5052        delete elements;
    5153        delete nodes;
     54        delete vertices;
    5255        delete loads;
    5356        delete materials;

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

    r2112 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define UG (mxArray*)prhs[5]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define UG (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

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

    r3170 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3233        FetchData(&elements,ELEMENTS);
    3334        FetchData(&nodes,NODES);
     35        FetchData(&vertices,VERTICES);
    3436        FetchData(&loads,LOADS);
    3537        FetchData(&materials,MATERIALS);
    … …  
    4345
    4446        /*!Call core code: */
    45         Misfitx(&J, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
     47        Misfitx(&J, elements,nodes,vertices,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
    4648
    4749        /*write output : */
    … …  
    5153        delete elements;
    5254        delete nodes;
     55        delete vertices;
    5356        delete loads;
    5457        delete materials;

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

    r1185 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3334#define NLHS  1
    3435#undef NRHS
    35 #define NRHS  8
     36#define NRHS  9
    3637
    3738

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3334        FetchData(&elements,ELEMENTS);
    3435        FetchData(&nodes,NODES);
     36        FetchData(&vertices,VERTICES);
    3537        FetchData(&loads,LOADSIN);
    3638        FetchData(&materials,MATERIALS);
    … …  
    4648
    4749        /*!Generate internal degree of freedom numbers: */
    48         PenaltyConstraintsx(&converged, &num_unstable_constraints, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
     50        PenaltyConstraintsx(&converged, &num_unstable_constraints, elements,nodes,vertices, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
    4951
    5052        /*write output datasets: */
    … …  
    5759        delete elements;
    5860        delete nodes;
     61        delete vertices;
    5962        delete loads;
    6063        delete materials;

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

    r465 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADSIN (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADSIN (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3536#define NLHS  3
    3637#undef NRHS
    37 #define NRHS  8
     38#define NRHS  9
    3839
    3940#endif  /* _PENALTYCONSTRAINTS_H */

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

    r2333 r3445  
    1818        DataSet* elements=NULL;
    1919        DataSet* nodes=NULL;
     20        DataSet* vertices=NULL;
    2021        DataSet* loads=NULL;
    2122        DataSet* materials=NULL;
    … …  
    3738        FetchData(&elements,ELEMENTS);
    3839        FetchData(&nodes,NODES);
     40        FetchData(&vertices,VERTICES);
    3941        FetchData(&loads,LOADS);
    4042        FetchData(&materials,MATERIALS);
    … …  
    5254
    5355        /*!Generate stiffnesses from penalties: */
    54         PenaltySystemMatricesx(Kgg, pg,&kmax,elements,nodes,loads,materials,parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);
     56        PenaltySystemMatricesx(Kgg, pg,&kmax,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);
    5557
    5658        /*write output datasets: */
    … …  
    6264        delete elements;
    6365        delete nodes;
     66        delete vertices;
    6467        delete loads;
    6568        delete materials;

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

    r472 r3445  
    2121#define ELEMENTS (mxArray*)prhs[2]
    2222#define NODES (mxArray*)prhs[3]
    23 #define LOADS (mxArray*)prhs[4]
    24 #define MATERIALS (mxArray*)prhs[5]
    25 #define PARAMETERS (mxArray*)prhs[6]
    26 #define INPUTS (mxArray*)prhs[7]
    27 #define ANALYSIS (mxArray*)prhs[8]
    28 #define SUBANALYSIS (mxArray*)prhs[9]
     23#define VERTICES (mxArray*)prhs[4]
     24#define LOADS (mxArray*)prhs[5]
     25#define MATERIALS (mxArray*)prhs[6]
     26#define PARAMETERS (mxArray*)prhs[7]
     27#define INPUTS (mxArray*)prhs[8]
     28#define ANALYSIS (mxArray*)prhs[9]
     29#define SUBANALYSIS (mxArray*)prhs[10]
    2930
    3031/* serial output macros: */
    … …  
    3738#define NLHS  3
    3839#undef NRHS
    39 #define NRHS  10
     40#define NRHS  11
    4041
    4142

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3637        FetchData(&elements,ELEMENTS);
    3738        FetchData(&nodes,NODES);
     39        FetchData(&vertices,VERTICES);
    3840        FetchData(&loads,LOADS);
    3941        FetchData(&materials,MATERIALS);
    … …  
    5456
    5557        /*!Generate internal degree of freedom numbers: */
    56         SystemMatricesx(&Kgg, &pg,elements,nodes,loads,materials,parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);
     58        SystemMatricesx(&Kgg, &pg,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);
    5759
    5860        /*write output datasets: */
    … …  
    6466        delete elements;
    6567        delete nodes;
     68        delete vertices;
    6669        delete loads;
    6770        delete materials;

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

    r465 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
     26#define ANALYSIS (mxArray*)prhs[7]
     27#define SUBANALYSIS (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/UpdateFromInputs/UpdateFromInputs.cpp

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    2728        FetchData(&elements,ELEMENTSIN);
    2829        FetchData(&nodes,NODESIN);
     30        FetchData(&vertices,VERTICESIN);
    2931        FetchData(&loads,LOADSIN);
    3032        FetchData(&materials,MATERIALSIN);
    … …  
    3638       
    3739        /*!Generate internal degree of freedom numbers: */
    38         UpdateFromInputsx(elements,nodes,loads, materials,parameters,inputs);
     40        UpdateFromInputsx(elements,nodes,vertices,loads, materials,parameters,inputs);
    3941       
    4042        /*write output datasets: */
    4143        WriteData(ELEMENTS,elements);
    42         WriteData(NODES,nodes);
     44        WriteData(NODES,nodes);
     45        WriteData(VERTICES,vertices);
    4346        WriteData(LOADS,loads);
    4447        WriteData(MATERIALS,materials);
    … …  
    4851        delete elements;
    4952        delete nodes;
     53        delete vertices;
    5054        delete loads;
    5155        delete materials;

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

    r2333 r3445  
    1919#define ELEMENTSIN (mxArray*)prhs[0]
    2020#define NODESIN (mxArray*)prhs[1]
    21 #define LOADSIN (mxArray*)prhs[2]
    22 #define MATERIALSIN (mxArray*)prhs[3]
    23 #define PARAMETERSIN (mxArray*)prhs[4]
    24 #define INPUTS (mxArray*)prhs[5]
     21#define VERTICESIN (mxArray*)prhs[2]
     22#define LOADSIN (mxArray*)prhs[3]
     23#define MATERIALSIN (mxArray*)prhs[4]
     24#define PARAMETERSIN (mxArray*)prhs[5]
     25#define INPUTS (mxArray*)prhs[6]
    2526
    2627/* serial output macros: */
    2728#define ELEMENTS (mxArray**)&plhs[0]
    2829#define NODES (mxArray**)&plhs[1]
    29 #define LOADS (mxArray**)&plhs[2]
    30 #define MATERIALS (mxArray**)&plhs[3]
    31 #define PARAMETERS (mxArray**)&plhs[4]
     30#define VERTICES (mxArray**)&plhs[2]
     31#define LOADS (mxArray**)&plhs[3]
     32#define MATERIALS (mxArray**)&plhs[4]
     33#define PARAMETERS (mxArray**)&plhs[5]
    3234
    3335/* serial arg counts: */
    3436#undef NLHS
    35 #define NLHS  5
     37#define NLHS  6
    3638#undef NRHS
    37 #define NRHS  6
     39#define NRHS  7
    3840
    3941

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

    r2333 r3445  
    1313        DataSet* elements=NULL;
    1414        DataSet* nodes=NULL;
     15        DataSet* vertices=NULL;
    1516        DataSet* loads=NULL;
    1617        DataSet* materials=NULL;
    … …  
    3435        FetchData(&elements,ELEMENTS);
    3536        FetchData(&nodes,NODES);
     37        FetchData(&vertices,VERTICES);
    3638        FetchData(&loads,LOADS);
    3739        FetchData(&materials,MATERIALS);
    … …  
    4345
    4446        /*!Generate internal degree of freedom numbers: */
    45         UpdateGeometryx(&outthickness,&outbed,&outsurface, elements, nodes,loads, materials, parameters,newthickness,bed,surface);
     47        UpdateGeometryx(&outthickness,&outbed,&outsurface, elements, nodes,vertices,loads, materials, parameters,newthickness,bed,surface);
    4648
    4749        /*write output data: */
    … …  
    5355        delete elements;
    5456        delete nodes;
     57        delete vertices;
    5558        delete loads;
    5659        delete materials;

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

    r816 r3445  
    1919#define ELEMENTS (mxArray*)prhs[0]
    2020#define NODES (mxArray*)prhs[1]
    21 #define LOADS (mxArray*)prhs[2]
    22 #define MATERIALS (mxArray*)prhs[3]
    23 #define PARAMETERS (mxArray*)prhs[4]
    24 #define NEWTHICKNESS (mxArray*)prhs[5]
    25 #define BED (mxArray*)prhs[6]
    26 #define SURFACE (mxArray*)prhs[7]
     21#define VERTICES (mxArray*)prhs[2]
     22#define LOADS (mxArray*)prhs[3]
     23#define MATERIALS (mxArray*)prhs[4]
     24#define PARAMETERS (mxArray*)prhs[5]
     25#define NEWTHICKNESS (mxArray*)prhs[6]
     26#define BED (mxArray*)prhs[7]
     27#define SURFACE (mxArray*)prhs[8]
    2728
    2829/* serial output macros: */
    … …  
    3536#define NLHS  3
    3637#undef NRHS
    37 #define NRHS  8
     38#define NRHS  9
    3839
    3940
Note: See TracChangeset for help on using the changeset viewer.