Changeset 4111


Ignore:
Timestamp:
06/21/10 17:05:50 (15 years ago)
Author:
Eric.Larour
Message:

minor debugging

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

Legend:

Unmodified
Added
Removed

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

    r3712 r4111  
    11/*\file UpdateGeometry.c
    2  *\brief: update geometry from new thickness computed by prognostic_core.
    3  */
     2*\brief: update geometry after prognostic computation of new thickness
     3*/
    44
    55#include "./UpdateGeometry.h"
    … …  
    77void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
    88
    9         /*diverse: */
    10         int   noerr=1;
     9/*diverse: */
     10int         noerr             = 1;
    1111
    12         /*input datasets: */
    13         DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
    15         DataSet* vertices=NULL;
    16         DataSet* loads=NULL;
    17         DataSet* materials=NULL;
    18         Parameters* parameters=NULL;
    19         Vec      newthickness=NULL;
    20         Vec      bed=NULL;
    21         Vec      surface=NULL;
     12/*input datasets: */
     13DataSet    *elements          = NULL;
     14DataSet    *nodes             = NULL;
     15DataSet    *vertices          = NULL;
     16DataSet    *loads             = NULL;
     17DataSet    *materials         = NULL;
     18Parameters *parameters        = NULL;
    2219
    23         /* output datasets: */
    24         Vec outbed=NULL;
    25         Vec outsurface=NULL;
    26         Vec outthickness=NULL;
     20/*Boot module: */
     21MODULEBOOT();
    2722
    28         /*Boot module: */
    29         MODULEBOOT();
     23/*checks on arguments on the matlab side: */
     24CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateGeometryUsage);
    3025
    31         /*checks on arguments on the matlab side: */
    32         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateGeometryUsage);
    33        
    34         /*Input datasets: */
    35         FetchData(&elements,ELEMENTS);
    36         FetchData(&nodes,NODES);
    37         FetchData(&vertices,VERTICES);
    38         FetchData(&loads,LOADS);
    39         FetchData(&materials,MATERIALS);
    40         FetchParams(&parameters,PARAMETERS);
    41        
    42         FetchData(&newthickness,NEWTHICKNESS);
    43         FetchData(&bed,BED);
    44         FetchData(&surface,SURFACE);
     26/*Input datasets: */
     27FetchData(&elements,ELEMENTSIN);
     28FetchData(&nodes,NODESIN);
     29FetchData(&vertices,VERTICESIN);
     30FetchData(&loads,LOADSIN);
     31FetchData(&materials,MATERIALSIN);
     32FetchParams(&parameters,PARAMETERSIN);
    4533
    46         /*!Generate internal degree of freedom numbers: */
    47         UpdateGeometryx(&outthickness,&outbed,&outsurface, elements, nodes,vertices,loads, materials, parameters,newthickness,bed,surface);
     34/*call "x" code layer*/
     35UpdateGeometryx(elements,nodes,vertices,loads, materials,parameters);
    4836
    49         /*write output data: */
    50         WriteData(OUTTHICKNESS,outthickness);
    51         WriteData(OUTBED,outbed);
    52         WriteData(OUTSURFACE,outsurface);
     37/*write output datasets: */
     38WriteData(ELEMENTS,elements);
     39WriteData(NODES,nodes);
     40WriteData(VERTICES,vertices);
     41WriteData(LOADS,loads);
     42WriteData(MATERIALS,materials);
     43WriteParams(PARAMETERS,parameters);
    5344
    54         /*Free ressources: */
    55         delete elements;
    56         delete nodes;
    57         delete vertices;
    58         delete loads;
    59         delete materials;
    60         delete parameters;
    61         VecFree(&newthickness);
    62         VecFree(&bed);
    63         VecFree(&surface);
    64         VecFree(&outbed);
    65         VecFree(&outthickness);
    66         VecFree(&outsurface);
     45/*Free ressources: */
     46delete elements;
     47delete nodes;
     48delete vertices;
     49delete loads;
     50delete materials;
     51delete parameters;
    6752
    68         /*end module: */
    69         MODULEEND();
     53/*end module: */
     54MODULEEND();
    7055}
    7156
    72 void UpdateGeometryUsage(void) {
     57void UpdateGeometryUsage(void)
     58{
    7359        _printf_("\n");
    74         _printf_("   usage: [outthickness,outbed,outsrface] = %s(elements, nodes, materials, parameters,newthickness,bed,surface);\n",__FUNCT__);
     60        _printf_("   usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,parameters);\n",__FUNCT__);
    7561        _printf_("\n");
    7662}

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

    r3913 r4111  
    1 
    21/*
    32        UpdateGeometry.h
    43*/
    5 
    64
    75#ifndef _UPDATEGEOMETRY_H
    … …  
    1412#include "../../c/DataSet/DataSet.h"
    1513#include "../../c/shared/shared.h"
     14#include "../../c/EnumDefinitions/EnumDefinitions.h"
    1615
    1716#undef __FUNCT__
    … …  
    1918
    2019/* serial input macros: */
    21 #define ELEMENTS (mxArray*)prhs[0]
    22 #define NODES (mxArray*)prhs[1]
    23 #define VERTICES (mxArray*)prhs[2]
    24 #define LOADS (mxArray*)prhs[3]
    25 #define MATERIALS (mxArray*)prhs[4]
    26 #define PARAMETERS (mxArray*)prhs[5]
    27 #define NEWTHICKNESS (mxArray*)prhs[6]
    28 #define BED (mxArray*)prhs[7]
    29 #define SURFACE (mxArray*)prhs[8]
     20#define ELEMENTSIN (mxArray*)prhs[0]
     21#define NODESIN (mxArray*)prhs[1]
     22#define VERTICESIN (mxArray*)prhs[2]
     23#define LOADSIN (mxArray*)prhs[3]
     24#define MATERIALSIN (mxArray*)prhs[4]
     25#define PARAMETERSIN (mxArray*)prhs[5]
    3026
    3127/* serial output macros: */
    32 #define OUTTHICKNESS (mxArray**)&plhs[0]
    33 #define OUTBED (mxArray**)&plhs[1]
    34 #define OUTSURFACE (mxArray**)&plhs[2]
     28#define ELEMENTS (mxArray**)&plhs[0]
     29#define NODES (mxArray**)&plhs[1]
     30#define VERTICES (mxArray**)&plhs[2]
     31#define LOADS (mxArray**)&plhs[3]
     32#define MATERIALS (mxArray**)&plhs[4]
     33#define PARAMETERS (mxArray**)&plhs[5]
    3534
    3635/* serial arg counts: */
    3736#undef NLHS
    38 #define NLHS  3
     37#define NLHS  6
    3938#undef NRHS
    40 #define NRHS  9
    41 
     39#define NRHS  6
    4240
    4341#endif  /* _UPDATEGEOMETRY_H */

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

    r3445 r4111  
    11/*\file UpdateVertexPositions.c
    2  *\brief: update vertex positions using new geometry defined by new bed and new thickness
    3  */
     2*\brief: update elements properties using an input  vector
     3*/
    44
    55#include "./UpdateVertexPositions.h"
    … …  
    77void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
    88
    9         /*diverse: */
    10         int   noerr=1;
     9/*diverse: */
     10int         noerr             = 1;
    1111
    12         /*input datasets: */
    13         DataSet* vertices=NULL;
    14         Vec      thickness=NULL;
    15         Vec      bed=NULL;
     12/*input datasets: */
     13DataSet    *elements          = NULL;
     14DataSet    *nodes             = NULL;
     15DataSet    *vertices          = NULL;
     16DataSet    *loads             = NULL;
     17DataSet    *materials         = NULL;
     18Parameters *parameters        = NULL;
    1619
    17         /*Boot module: */
    18         MODULEBOOT();
     20/*Boot module: */
     21MODULEBOOT();
    1922
    20         /*checks on arguments on the matlab side: */
    21         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateVertexPositionsUsage);
     23/*checks on arguments on the matlab side: */
     24CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateVertexPositionsUsage);
    2225
    23         /*Input datasets: */
    24         FetchData(&vertices,VERTICES);
    25         FetchData(&thickness,THICKNESS);
    26         FetchData(&bed,BED);
    27        
    28         /*!Generate internal degree of freedom numbers: */
    29         UpdateVertexPositionsx(vertices,thickness,bed);
     26/*Input datasets: */
     27FetchData(&elements,ELEMENTSIN);
     28FetchData(&nodes,NODESIN);
     29FetchData(&vertices,VERTICESIN);
     30FetchData(&loads,LOADSIN);
     31FetchData(&materials,MATERIALSIN);
     32FetchParams(&parameters,PARAMETERSIN);
    3033
    31         /*write output datasets: */
    32         WriteData(VERTICESOUT,vertices);
     34/*call "x" code layer*/
     35UpdateVertexPositionsx(elements,nodes,vertices,loads, materials,parameters);
    3336
    34         /*Free ressources: */
    35         delete vertices;
    36         VecFree(&thickness);
    37         VecFree(&bed);
     37/*write output datasets: */
     38WriteData(ELEMENTS,elements);
     39WriteData(NODES,nodes);
     40WriteData(VERTICES,vertices);
     41WriteData(LOADS,loads);
     42WriteData(MATERIALS,materials);
     43WriteParams(PARAMETERS,parameters);
    3844
    39         /*end module: */
    40         MODULEEND();
     45/*Free ressources: */
     46delete elements;
     47delete nodes;
     48delete vertices;
     49delete loads;
     50delete materials;
     51delete parameters;
     52
     53/*end module: */
     54MODULEEND();
    4155}
    4256
    … …  
    4458{
    4559        _printf_("\n");
    46         _printf_("   usage: [vertices] = %s(vertices, thickness, bed);\n",__FUNCT__);
     60        _printf_("   usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,parameters);\n",__FUNCT__);
    4761        _printf_("\n");
    4862}

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

    r3913 r4111  
    1 
    21/*
    32        UpdateVertexPositions.h
    43*/
    5 
    64
    75#ifndef _UPDATEVERTEXPOSITIONS_H
    … …  
    1412#include "../../c/DataSet/DataSet.h"
    1513#include "../../c/shared/shared.h"
     14#include "../../c/EnumDefinitions/EnumDefinitions.h"
    1615
    1716#undef __FUNCT__
    … …  
    1918
    2019/* serial input macros: */
    21 #define VERTICES (mxArray*)prhs[0]
    22 #define BED (mxArray*)prhs[1]
    23 #define THICKNESS (mxArray*)prhs[2]
    24        
     20#define ELEMENTSIN (mxArray*)prhs[0]
     21#define NODESIN (mxArray*)prhs[1]
     22#define VERTICESIN (mxArray*)prhs[2]
     23#define LOADSIN (mxArray*)prhs[3]
     24#define MATERIALSIN (mxArray*)prhs[4]
     25#define PARAMETERSIN (mxArray*)prhs[5]
     26
    2527/* serial output macros: */
    26 #define VERTICESOUT (mxArray**)&plhs[0]
     28#define ELEMENTS (mxArray**)&plhs[0]
     29#define NODES (mxArray**)&plhs[1]
     30#define VERTICES (mxArray**)&plhs[2]
     31#define LOADS (mxArray**)&plhs[3]
     32#define MATERIALS (mxArray**)&plhs[4]
     33#define PARAMETERS (mxArray**)&plhs[5]
    2734
    2835/* serial arg counts: */
    2936#undef NLHS
    30 #define NLHS  1
     37#define NLHS  6
    3138#undef NRHS
    32 #define NRHS  3
    33 
     39#define NRHS  6
    3440
    3541#endif  /* _UPDATEVERTEXPOSITIONS_H */
Note: See TracChangeset for help on using the changeset viewer.