Changeset 13235


Ignore:
Timestamp:
09/04/12 11:58:25 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: preparing header files for python inclusion

Location:
issm/trunk-jpl/src/modules
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/modules/AverageFilter/AverageFilter.h

    r13214 r13235  
    3232/* serial input macros: */
    3333#define IMAGEIN prhs[0]
    34 #define SMOOTH prhs[1]
     34#define SMOOTH  prhs[1]
     35/* serial output macros: */
     36#define IMAGEOUT (mxArray**)&plhs[0]
     37#endif
    3538
     39#ifdef _HAVE_PYTHON_MODULES_
     40/* serial input macros: */
     41#define IMAGEIN PyTuple_GetItem(args,0)
     42#define SMOOTH  PyTuple_GetItem(args,1)
    3643/* serial output macros: */
    37 #define IMAGEOUT &plhs[0]
     44#define IMAGEOUT output,0
    3845#endif
    3946
  • issm/trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.h

    r13214 r13235  
    3232/* serial input macros: */
    3333#define INDEXHANDLE prhs[0]
    34 #define XHANDLE prhs[1]
    35 #define YHANDLE prhs[2]
    36 
     34#define XHANDLE     prhs[1]
     35#define YHANDLE     prhs[2]
    3736/* serial output macros: */
    3837#define BAMGMESHOUT    (mxArray**)&plhs[0]
    3938#define BAMGGEOMOUT    (mxArray**)&plhs[1]
     39#endif
     40
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* serial input macros: */
     43#define INDEXHANDLE PyTuple_GetItem(args,0)
     44#define XHANDLE     PyTuple_GetItem(args,1)
     45#define YHANDLE     PyTuple_GetItem(args,2)
     46/* serial output macros: */
     47#define BAMGMESHOUT    output,0
     48#define BAMGGEOMOUT    output,1
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/BamgMesher/BamgMesher.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define BAMGMESHIN  (mxArray*)prhs[0]
    34 #define BAMGGEOMIN  (mxArray*)prhs[1]
    35 #define BAMGOPTIONS (mxArray*)prhs[2]
     33#define BAMGMESHIN  prhs[0]
     34#define BAMGGEOMIN  prhs[1]
     35#define BAMGOPTIONS prhs[2]
     36/* serial output macros: */
     37#define BAMGMESHOUT (mxArray**)&plhs[0]
     38#define BAMGGEOMOUT (mxArray**)&plhs[1]
     39#endif
    3640
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* serial input macros: */
     43#define BAMGMESHIN  PyTuple_GetItem(args,0)
     44#define BAMGGEOMIN  PyTuple_GetItem(args,1)
     45#define BAMGOPTIONS PyTuple_GetItem(args,2)
    3746/* serial output macros: */
    38 #define BAMGMESHOUT    (mxArray**)&plhs[0]
    39 #define BAMGGEOMOUT    (mxArray**)&plhs[1]
     47#define BAMGMESHOUT output,0
     48#define BAMGGEOMOUT output,1
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.h

    r13214 r13235  
    3838#endif
    3939
     40#ifdef _HAVE_PYTHON_MODULES_
     41/* serial input macros: */
     42#define XHANDLE PyTuple_GetItem(args,0)
     43#define YHANDLE PyTuple_GetItem(args,1)
     44
     45/* serial output macros: */
     46#define INDEX output,0
     47#endif
     48
    4049/* serial arg counts: */
    4150#undef NLHS
  • issm/trunk-jpl/src/modules/Chaco/Chaco.h

    r13214 r13235  
    3535#ifdef _HAVE_MATLAB_MODULES_
    3636/* serial input macros: */
    37 #define A_IN (mxArray*)prhs[0]
    38 #define VWGTS_IN (mxArray*)prhs[1]
    39 #define EWGTS_IN (mxArray*)prhs[2]
    40 #define X_IN (mxArray*)prhs[3]
    41 #define Y_IN (mxArray*)prhs[4]
    42 #define Z_IN (mxArray*)prhs[5]
    43 #define OPTNS_IN (mxArray*)prhs[6]
    44 #define NPARTS_IN (mxArray*)prhs[7]
    45 #define GOAL_IN (mxArray*)prhs[8]
    46 
     37#define A_IN      prhs[0]
     38#define VWGTS_IN  prhs[1]
     39#define EWGTS_IN  prhs[2]
     40#define X_IN      prhs[3]
     41#define Y_IN      prhs[4]
     42#define Z_IN      prhs[5]
     43#define OPTNS_IN  prhs[6]
     44#define NPARTS_IN prhs[7]
     45#define GOAL_IN   prhs[8]
    4746/* serial output macros: */
    4847#define ASSGN_OUT (mxArray**)&plhs[0]
     48#endif
     49
     50#ifdef _HAVE_PYTHON_MODULES_
     51/* serial input macros: */
     52#define A_IN      PyTuple_GetItem(args,0)
     53#define VWGTS_IN  PyTuple_GetItem(args,1)
     54#define EWGTS_IN  PyTuple_GetItem(args,2)
     55#define X_IN      PyTuple_GetItem(args,3)
     56#define Y_IN      PyTuple_GetItem(args,4)
     57#define Z_IN      PyTuple_GetItem(args,5)
     58#define OPTNS_IN  PyTuple_GetItem(args,6)
     59#define NPARTS_IN PyTuple_GetItem(args,7)
     60#define GOAL_IN   PyTuple_GetItem(args,8)
     61/* serial output macros: */
     62#define ASSGN_OUT output,0
    4963#endif
    5064
  • issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h

    r13214 r13235  
    3333#ifdef _HAVE_MATLAB_MODULES_
    3434/* serial input macros: */
    35 #define INDEX (mxArray *)prhs[0]
    36 #define X (mxArray *)prhs[1]
    37 #define Y (mxArray *)prhs[2]
    38 #define CONTOURNAME (mxArray *)prhs[3]
    39 #define INTERPTYPE (mxArray *)prhs[4]
    40 #define EDGEVALUE (mxArray *)prhs[5]
     35#define INDEX       prhs[0]
     36#define X           prhs[1]
     37#define Y           prhs[2]
     38#define CONTOURNAME prhs[3]
     39#define INTERPTYPE  prhs[4]
     40#define EDGEVALUE   prhs[5]
    4141/* serial output macros: */
    4242#define PLHS0 (mxArray**)&plhs[0]
     
    4646#ifdef _HAVE_PYTHON_MODULES_
    4747/* serial input macros: */
    48 #define INDEX PyTuple_GetItem(args,0)
    49 #define X PyTuple_GetItem(args,1)
    50 #define Y PyTuple_GetItem(args,2)
     48#define INDEX       PyTuple_GetItem(args,0)
     49#define X           PyTuple_GetItem(args,1)
     50#define Y           PyTuple_GetItem(args,2)
    5151#define CONTOURNAME PyTuple_GetItem(args,3)
    52 #define INTERPTYPE PyTuple_GetItem(args,4)
    53 #define EDGEVALUE PyTuple_GetItem(args,5)
     52#define INTERPTYPE  PyTuple_GetItem(args,4)
     53#define EDGEVALUE   PyTuple_GetItem(args,5)
    5454/* serial output macros: */
    5555#define PLHS0 output,0
  • issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* input macros: */
    33 #define XHANDLE prhs[0]
    34 #define YHANDLE prhs[1]
    35 #define FILENAME prhs[2]
     33#define XHANDLE         prhs[0]
     34#define YHANDLE         prhs[1]
     35#define FILENAME        prhs[2]
    3636#define EDGEVALUEHANDLE prhs[3]
    3737
    3838/* serial output macros: */
    3939#define FLAGS (mxArray**)&plhs[0]
     40#endif
     41
     42#ifdef _HAVE_PYTHON_MODULES_
     43/* input macros: */
     44#define XHANDLE         PyTuple_GetItem(args,0)
     45#define YHANDLE         PyTuple_GetItem(args,1)
     46#define FILENAME        PyTuple_GetItem(args,2)
     47#define EDGEVALUEHANDLE PyTuple_GetItem(args,3)
     48
     49/* serial output macros: */
     50#define FLAGS output,0
    4051#endif
    4152
  • issm/trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.h

    r13214 r13235  
    3333#ifdef _HAVE_MATLAB_MODULES_
    3434/* serial input macros: */
    35 /* serial input macros: */
    36 #define ELEMENTS (mxArray*)prhs[0]
    37 #define NODECONNECTIVITY (mxArray*)prhs[1]
     35#define ELEMENTS         prhs[0]
     36#define NODECONNECTIVITY prhs[1]
    3837/* serial output macros: */
    3938#define ELEMENTCONNECTIVITY (mxArray**)&plhs[0]
     
    4241#ifdef _HAVE_PYTHON_MODULES_
    4342/* serial input macros: */
    44 /* serial input macros: */
    45 #define ELEMENTS PyTuple_GetItem(args,0)
     43#define ELEMENTS         PyTuple_GetItem(args,0)
    4644#define NODECONNECTIVITY PyTuple_GetItem(args,1)
    4745/* serial output macros: */
  • issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define EXP_IN    prhs[0]
    34 #define KML_IN    prhs[1]
    35 #define SGN_IN    prhs[2]
    36 
     33#define EXP_IN prhs[0]
     34#define KML_IN prhs[1]
     35#define SGN_IN prhs[2]
    3736/* serial output macros: */
    3837#define RET_OUT    (mxArray**)&plhs[0]
     38#endif
     39
     40#ifdef _HAVE_PYTHON_MODULES_
     41/* serial input macros: */
     42#define EXP_IN PyTuple_GetItem(args,0)
     43#define KML_IN PyTuple_GetItem(args,1)
     44#define SGN_IN PyTuple_GetItem(args,2)
     45/* serial output macros: */
     46#define RET_OUT    output,0
    3947#endif
    4048
  • issm/trunk-jpl/src/modules/HoleFiller/HoleFiller.h

    r13214 r13235  
    3232/* serial input macros: */
    3333#define IMAGEIN prhs[0]
    34 #define SMOOTH prhs[1]
     34#define SMOOTH  prhs[1]
     35/* serial output macros: */
     36#define IMAGEOUT (mxArray**)&plhs[0]
     37#endif
    3538
     39#ifdef _HAVE_PYTHON_MODULES_
     40/* serial input macros: */
     41#define IMAGEIN PyTuple_GetItem(args,0)
     42#define SMOOTH  PyTuple_GetItem(args,1)
    3643/* serial output macros: */
    37 #define IMAGEOUT &plhs[0]
     44#define IMAGEOUT output,0
    3845#endif
    3946
  • issm/trunk-jpl/src/modules/InternalFront/InternalFront.h

    r13214 r13235  
    3030#ifdef _HAVE_MATLAB_MODULES_
    3131/* serial input macros: */
    32 #define MODEL (mxArray*)prhs[0]
    33 
     32#define MODEL prhs[0]
    3433/* serial output macros: */
    3534#define FRONT (mxArray**)&plhs[0]
     35#endif
     36
     37#ifdef _HAVE_PYTHON_MODULES_
     38/* serial input macros: */
     39#define MODEL PyTuple_GetItem(args,0)
     40/* serial output macros: */
     41#define FRONT output,0]
    3642#endif
    3743
  • issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define XHANDLE prhs[0]
    34 #define YHANDLE prhs[1]
    35 #define DATAHANDLE prhs[2]
    36 #define XMESHHANDLE prhs[3]
    37 #define YMESHHANDLE prhs[4]
     33#define XHANDLE       prhs[0]
     34#define YHANDLE       prhs[1]
     35#define DATAHANDLE    prhs[2]
     36#define XMESHHANDLE   prhs[3]
     37#define YMESHHANDLE   prhs[4]
    3838#define DEFAULTHANDLE prhs[5]
    39 #define INTERPENUM prhs[6]
    40 
     39#define INTERPENUM    prhs[6]
    4140/* serial output macros: */
    4241#define DATAMESH (mxArray**)&plhs[0]
     42#endif
     43
     44#ifdef _HAVE_PYTHON_MODULES_
     45/* serial input macros: */
     46#define XHANDLE       PyTuple_GetItem(args,0)
     47#define YHANDLE       PyTuple_GetItem(args,1)
     48#define DATAHANDLE    PyTuple_GetItem(args,2)
     49#define XMESHHANDLE   PyTuple_GetItem(args,3)
     50#define YMESHHANDLE   PyTuple_GetItem(args,4)
     51#define DEFAULTHANDLE PyTuple_GetItem(args,5)
     52#define INTERPENUM    PyTuple_GetItem(args,6)
     53/* serial output macros: */
     54#define DATAMESH output,0
    4355#endif
    4456
  • issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define INDEXHANDLE prhs[0]
    34 #define XHANDLE prhs[1]
    35 #define YHANDLE prhs[2]
    36 #define DATAHANDLE prhs[3]
    37 #define XPRIMEHANDLE prhs[4]
    38 #define YPRIMEHANDLE prhs[5]
     33#define INDEXHANDLE   prhs[0]
     34#define XHANDLE       prhs[1]
     35#define YHANDLE       prhs[2]
     36#define DATAHANDLE    prhs[3]
     37#define XPRIMEHANDLE  prhs[4]
     38#define YPRIMEHANDLE  prhs[5]
    3939#define DEFAULTHANDLE prhs[6]
    40 #define FILENAME prhs[7]
    41 
     40#define FILENAME      prhs[7]
    4241/* serial output macros: */
    4342#define DATAPRIME (mxArray**)&plhs[0]
     43#endif
     44
     45#ifdef _HAVE_PYTHON_MODULES_
     46/* serial input macros: */
     47#define INDEXHANDLE   PyTuple_GetItem(args,0)
     48#define XHANDLE       PyTuple_GetItem(args,1)
     49#define YHANDLE       PyTuple_GetItem(args,2)
     50#define DATAHANDLE    PyTuple_GetItem(args,3)
     51#define XPRIMEHANDLE  PyTuple_GetItem(args,4)
     52#define YPRIMEHANDLE  PyTuple_GetItem(args,5)
     53#define DEFAULTHANDLE PyTuple_GetItem(args,6)
     54#define FILENAME      PyTuple_GetItem(args,7)
     55/* serial output macros: */
     56#define DATAPRIME output,0
    4457#endif
    4558
  • issm/trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define INDEX (mxArray*)prhs[0]
    34 #define X (mxArray*)prhs[1]
    35 #define Y (mxArray*)prhs[2]
    36 #define MESHDATA (mxArray*)prhs[3]
    37 #define XMIN (mxArray*)prhs[4]
    38 #define YMAX (mxArray*)prhs[5]
    39 #define XPOSTING (mxArray*)prhs[6]
    40 #define YPOSTING (mxArray*)prhs[7]
    41 #define NLINES (mxArray*)prhs[8]
    42 #define NCOLS (mxArray*)prhs[9]
    43 #define DEFAULTVALUE (mxArray*)prhs[10]
    44 
     33#define INDEX        prhs[0]
     34#define X            prhs[1]
     35#define Y            prhs[2]
     36#define MESHDATA     prhs[3]
     37#define XMIN         prhs[4]
     38#define YMAX         prhs[5]
     39#define XPOSTING     prhs[6]
     40#define YPOSTING     prhs[7]
     41#define NLINES       prhs[8]
     42#define NCOLS        prhs[9]
     43#define DEFAULTVALUE prhs[10]
    4544/* serial output macros: */
    4645#define XM (mxArray**)&plhs[0]
    4746#define YM (mxArray**)&plhs[1]
    4847#define GRIDDATA (mxArray**)&plhs[2]
     48#endif
     49
     50#ifdef _HAVE_PYTHON_MODULES_
     51/* serial input macros: */
     52#define INDEX        PyTuple_GetItem(args,0)
     53#define X            PyTuple_GetItem(args,1)
     54#define Y            PyTuple_GetItem(args,2)
     55#define MESHDATA     PyTuple_GetItem(args,3)
     56#define XMIN         PyTuple_GetItem(args,4)
     57#define YMAX         PyTuple_GetItem(args,5)
     58#define XPOSTING     PyTuple_GetItem(args,6)
     59#define YPOSTING     PyTuple_GetItem(args,7)
     60#define NLINES       PyTuple_GetItem(args,8)
     61#define NCOLS        PyTuple_GetItem(args,9)
     62#define DEFAULTVALUE PyTuple_GetItem(args,10)
     63/* serial output macros: */
     64#define XM output,0
     65#define YM output,1
     66#define GRIDDATA output,2
    4967#endif
    5068
  • issm/trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

    r13213 r13235  
    3636#ifdef _HAVE_MATLAB_MODULES_
    3737/* serial input macros: */
    38 #define INDEX prhs[0]
    39 #define X prhs[1]
    40 #define Y prhs[2]
    41 #define DATA prhs[3]
    42 #define XINTERP prhs[4]
    43 #define YINTERP prhs[5]
    44 #define ARGUMENTS prhs
    45 
     38#define INDEX     prhs[0]
     39#define X         prhs[1]
     40#define Y         prhs[2]
     41#define DATA      prhs[3]
     42#define XINTERP   prhs[4]
     43#define YINTERP   prhs[5]
     44#define ARGUMENTS prhs
    4645/* serial output macros: */
    4746#define DATAINTERP (mxArray**)&plhs[0]
     
    5049#ifdef _HAVE_PYTHON_MODULES_
    5150/* serial input macros: */
    52 #define INDEX PyTuple_GetItem(args,0)
    53 #define X PyTuple_GetItem(args,1)
    54 #define Y PyTuple_GetItem(args,2)
    55 #define DATA PyTuple_GetItem(args,3)
    56 #define XINTERP PyTuple_GetItem(args,4)
    57 #define YINTERP PyTuple_GetItem(args,5)
     51#define INDEX          PyTuple_GetItem(args,0)
     52#define X              PyTuple_GetItem(args,1)
     53#define Y              PyTuple_GetItem(args,2)
     54#define DATA           PyTuple_GetItem(args,3)
     55#define XINTERP        PyTuple_GetItem(args,4)
     56#define YINTERP        PyTuple_GetItem(args,5)
    5857#define ARGUMENTS args
    59 
    6058/* serial output macros: */
    6159#define DATAINTERP output,0
  • issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define INDEXHANDLE prhs[0]
    34 #define XHANDLE prhs[1]
    35 #define YHANDLE prhs[2]
    36 #define ZHANDLE prhs[3]
    37 #define DATAHANDLE prhs[4]
    38 #define XPRIMEHANDLE prhs[5]
    39 #define YPRIMEHANDLE prhs[6]
    40 #define ZPRIMEHANDLE prhs[7]
     33#define INDEXHANDLE   prhs[0]
     34#define XHANDLE       prhs[1]
     35#define YHANDLE       prhs[2]
     36#define ZHANDLE       prhs[3]
     37#define DATAHANDLE    prhs[4]
     38#define XPRIMEHANDLE  prhs[5]
     39#define YPRIMEHANDLE  prhs[6]
     40#define ZPRIMEHANDLE  prhs[7]
    4141#define DEFAULTHANDLE prhs[8]
    42 
    4342/* serial output macros: */
    4443#define DATAPRIME (mxArray**)&plhs[0]
     44#endif
     45
     46#ifdef _HAVE_PYTHON_MODULES_
     47/* serial input macros: */
     48#define INDEXHANDLE   PyTuple_GetItem(args,0)
     49#define XHANDLE       PyTuple_GetItem(args,1)
     50#define YHANDLE       PyTuple_GetItem(args,2)
     51#define ZHANDLE       PyTuple_GetItem(args,3)
     52#define DATAHANDLE    PyTuple_GetItem(args,4)
     53#define XPRIMEHANDLE  PyTuple_GetItem(args,5)
     54#define YPRIMEHANDLE  PyTuple_GetItem(args,6)
     55#define ZPRIMEHANDLE  PyTuple_GetItem(args,7)
     56#define DEFAULTHANDLE PyTuple_GetItem(args,8)
     57/* serial output macros: */
     58#define DATAPRIME output,0
    4559#endif
    4660
  • issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define FILENAME      prhs[0]
    34 
     33#define FILENAME prhs[0]
    3534/* serial output macros: */
    3635#define ERRORFLAG (mxArray**)&plhs[0]
     36#endif
     37
     38#ifdef _HAVE_PYTHON_MODULES_
     39/* serial input macros: */
     40#define FILENAME PyTuple_GetItem(args,0)
     41/* serial output macros: */
     42#define ERRORFLAG output,0
    3743#endif
    3844
  • issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.h

    r13214 r13235  
    4141#define CMAPHANDLE    prhs[8]
    4242#define FILENAME      prhs[9]
    43 
    4443/* serial output macros: */
    4544#define ERRORFLAG (mxArray**)&plhs[0]
     45#endif
     46
     47#ifdef _HAVE_PYTHON_MODULES_
     48/* serial input macros: */
     49#define NAME          PyTuple_GetItem(args,0)
     50#define NOTES         PyTuple_GetItem(args,1)
     51#define ELEMHANDLE    PyTuple_GetItem(args,2)
     52#define NODECONHANDLE PyTuple_GetItem(args,3)
     53#define LATHANDLE     PyTuple_GetItem(args,4)
     54#define LNGHANDLE     PyTuple_GetItem(args,5)
     55#define PARTHANDLE    PyTuple_GetItem(args,6)
     56#define DATAHANDLE    PyTuple_GetItem(args,7)
     57#define CMAPHANDLE    PyTuple_GetItem(args,8)
     58#define FILENAME      PyTuple_GetItem(args,9)
     59/* serial output macros: */
     60#define ERRORFLAG output,0
    4661#endif
    4762
  • issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define FILENAME      prhs[0]
    34 
     33#define FILENAME  prhs[0]
    3534/* serial output macros: */
    3635#define ERRORFLAG (mxArray**)&plhs[0]
     36#endif
     37
     38#ifdef _HAVE_PYTHON_MODULES_
     39/* serial input macros: */
     40#define FILENAME  PyTuple_GetItem(args,0)
     41/* serial output macros: */
     42#define ERRORFLAG output,0
    3743#endif
    3844
  • issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define KML_IN    prhs[0]
    34 #define EXP_IN    prhs[1]
    35 #define SGN_IN    prhs[2]
    36 
     33#define KML_IN prhs[0]
     34#define EXP_IN prhs[1]
     35#define SGN_IN prhs[2]
    3736/* serial output macros: */
    3837#define RET_OUT    (mxArray**)&plhs[0]
     38#endif
     39
     40#ifdef _HAVE_PYTHON_MODULES_
     41/* serial input macros: */
     42#define KML_IN PyTuple_GetItem(args,0)
     43#define EXP_IN PyTuple_GetItem(args,1)
     44#define SGN_IN PyTuple_GetItem(args,2)
     45/* serial output macros: */
     46#define RET_OUT    output,0
    3947#endif
    4048
  • issm/trunk-jpl/src/modules/Kriging/Kriging.h

    r13214 r13235  
    3030#ifdef _HAVE_MATLAB_MODULES_
    3131/* serial input macros: */
    32 #define X            (mxArray *)prhs[0]
    33 #define Y            (mxArray *)prhs[1]
    34 #define OBSERVATIONS (mxArray *)prhs[2]
    35 #define XINTERP      (mxArray *)prhs[3]
    36 #define YINTERP      (mxArray *)prhs[4]
     32#define X            prhs[0]
     33#define Y            prhs[1]
     34#define OBSERVATIONS prhs[2]
     35#define XINTERP      prhs[3]
     36#define YINTERP      prhs[4]
    3737
    3838/* serial output macros: */
    3939#define PREDICTIONS (mxArray**)&plhs[0]
    4040#define ERROR       (mxArray**)&plhs[1]
     41#endif
     42
     43#ifdef _HAVE_PYTHON_MODULES_
     44/* serial input macros: */
     45#define X            PyTuple_GetItem(args,0)
     46#define Y            PyTuple_GetItem(args,1)
     47#define OBSERVATIONS PyTuple_GetItem(args,2)
     48#define XINTERP      PyTuple_GetItem(args,3)
     49#define YINTERP      PyTuple_GetItem(args,4)
     50
     51/* serial output macros: */
     52#define PREDICTIONS output,0
     53#define ERROR       output,1
    4154#endif
    4255
  • issm/trunk-jpl/src/modules/Ll2xy/Ll2xy.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define LAT_IN    prhs[0]
    34 #define LON_IN    prhs[1]
    35 #define SGN_IN    prhs[2]
     33#define LAT_IN prhs[0]
     34#define LON_IN prhs[1]
     35#define SGN_IN prhs[2]
     36/* serial output macros: */
     37#define X_OUT (mxArray**)&plhs[0]
     38#define Y_OUT (mxArray**)&plhs[1]
     39#endif
    3640
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* serial input macros: */
     43#define LAT_IN PyTuple_GetItem(args,0)
     44#define LON_IN PyTuple_GetItem(args,1)
     45#define SGN_IN PyTuple_GetItem(args,2)
    3746/* serial output macros: */
    38 #define X_OUT    (mxArray**)&plhs[0]
    39 #define Y_OUT    (mxArray**)&plhs[1]
     47#define X_OUT output,0
     48#define Y_OUT output,1
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/MeshPartition/MeshPartition.h

    r13214 r13235  
    3434#ifdef _HAVE_MATLAB_MODULES_
    3535/* serial input macros: */
    36 #define MODEL (mxArray*)prhs[0]
    37 #define NUMAREAS (mxArray*)prhs[1]
    38 
     36#define MODEL    prhs[0]
     37#define NUMAREAS prhs[1]
    3938/* serial output macros: */
    4039#define ELEMENTPARTITIONING (mxArray**)&plhs[0]
    4140#define NODEPARTITIONING (mxArray**)&plhs[1]
     41#endif
     42
     43#ifdef _HAVE_PYTHON_MODULES_
     44/* serial input macros: */
     45#define MODEL    PyTuple_GetItem(args,0)
     46#define NUMAREAS PyTuple_GetItem(args,1)
     47/* serial output macros: */
     48#define ELEMENTPARTITIONING output,0
     49#define NODEPARTITIONING output,1
    4250#endif
    4351
  • issm/trunk-jpl/src/modules/MeshProfileIntersection/MeshProfileIntersection.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* input macros: */
    33 #define INDEX prhs[0]
    34 #define X prhs[1]
    35 #define Y prhs[2]
     33#define INDEX    prhs[0]
     34#define X        prhs[1]
     35#define Y        prhs[2]
    3636#define FILENAME prhs[3]
    37 
    3837/* serial output macros: */
    3938#define SEGMENTS (mxArray**)&plhs[0]
     39#endif
     40
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* input macros: */
     43#define INDEX    PyTuple_GetItem(args,0)
     44#define X        PyTuple_GetItem(args,1)
     45#define Y        PyTuple_GetItem(args,2)
     46#define FILENAME PyTuple_GetItem(args,3)
     47/* serial output macros: */
     48#define SEGMENTS output,0
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/NodeConnectivity/NodeConnectivity.h

    r13213 r13235  
    3030#ifdef _HAVE_MATLAB_MODULES_
    3131/* serial input macros: */
    32 #define ELEMENTS (mxArray*)prhs[0]
    33 #define NUMNODES (mxArray*)prhs[1]
     32#define ELEMENTS prhs[0]
     33#define NUMNODES prhs[1]
    3434/* serial output macros: */
    3535#define CONNECTIVITY (mxArray**)&plhs[0]
  • issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* input macros: */
    33 #define XHANDLE prhs[0]
    34 #define YHANDLE prhs[1]
     33#define XHANDLE     prhs[0]
     34#define YHANDLE     prhs[1]
    3535#define MINDISTANCE prhs[2]
    3636#define MULTITHREAD prhs[3]
    37 
    3837/* serial output macros: */
    3938#define FLAGS (mxArray**)&plhs[0]
     39#endif
     40
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* input macros: */
     43#define XHANDLE     PyTuple_GetItem(args,0)
     44#define YHANDLE     PyTuple_GetItem(args,1)
     45#define MINDISTANCE PyTuple_GetItem(args,2)
     46#define MULTITHREAD PyTuple_GetItem(args,3)
     47/* serial output macros: */
     48#define FLAGS output,0
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define CONNECTIVITY (mxArray*)prhs[0]
    34 #define POOL (mxArray*)prhs[1]
    35 #define INDEX (mxArray*)prhs[2]
    36 #define FLAGS (mxArray*)prhs[3]
    37 
     33#define CONNECTIVITY prhs[0]
     34#define POOL         prhs[1]
     35#define INDEX        prhs[2]
     36#define FLAGS        prhs[3]
    3837/* serial output macros: */
    3938#define POOLOUT (mxArray**)&plhs[0]
     39#endif
     40
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* serial input macros: */
     43#define CONNECTIVITY PyTuple_GetItem(args,0)
     44#define POOL         PyTuple_GetItem(args,1)
     45#define INDEX        PyTuple_GetItem(args,2)
     46#define FLAGS        PyTuple_GetItem(args,3)
     47/* serial output macros: */
     48#define POOLOUT output,0
    4049#endif
    4150
  • issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define SHP_IN    prhs[0]
    34 #define KML_IN    prhs[1]
    35 #define SGN_IN    prhs[2]
     33#define SHP_IN  prhs[0]
     34#define KML_IN  prhs[1]
     35#define SGN_IN  prhs[2]
     36/* serial output macros: */
     37#define RET_OUT (mxArray**)&plhs[0]
     38#endif
    3639
     40#ifdef _HAVE_PYTHON_MODULES_
     41/* serial input macros: */
     42#define SHP_IN PyTuple_GetItem(args,0)
     43#define KML_IN PyTuple_GetItem(args,1)
     44#define SGN_IN PyTuple_GetItem(args,2)
    3745/* serial output macros: */
    38 #define RET_OUT    (mxArray**)&plhs[0]
     46#define RET_OUT output,0
    3947#endif
    4048
  • issm/trunk-jpl/src/modules/TriMesh/TriMesh.h

    r13214 r13235  
    3333#ifdef _HAVE_MATLAB_MODULES_
    3434/* serial input macros: */
    35 #define DOMAINOUTLINE  (mxArray *)prhs[0]
    36 #define RIFTSOUTLINE   (mxArray *)prhs[1]
    37 #define AREA           (mxArray *)prhs[2]
     35#define DOMAINOUTLINE  prhs[0]
     36#define RIFTSOUTLINE   prhs[1]
     37#define AREA           prhs[2]
    3838/* serial output macros: */
    3939#define INDEX             (mxArray**)&plhs[0]
  • issm/trunk-jpl/src/modules/TriaSearch/TriaSearch.h

    r13214 r13235  
    3131/* serial input macros: */
    3232#define INDEXHANDLE prhs[0]
    33 #define XHANDLE prhs[1]
    34 #define YHANDLE prhs[2]
    35 #define X0HANDLE prhs[3]
    36 #define Y0HANDLE prhs[4]
     33#define XHANDLE     prhs[1]
     34#define YHANDLE     prhs[2]
     35#define X0HANDLE    prhs[3]
     36#define Y0HANDLE    prhs[4]
    3737
    3838/* serial output macros: */
    3939#define TRIA (mxArray**)&plhs[0]
     40#endif
     41
     42#ifdef _HAVE_PYTHON_MODULES_
     43/* serial input macros: */
     44#define INDEXHANDLE PyTuple _GetItem(args,0)
     45#define XHANDLE     PyTuple _GetItem(args,1)
     46#define YHANDLE     PyTuple _GetItem(args,2)
     47#define X0HANDLE    PyTuple _GetItem(args,3)
     48#define Y0HANDLE    PyTuple _GetItem(args,4)
     49
     50/* serial output macros: */
     51#define TRIA output,0
    4052#endif
    4153
  • issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.h

    r13214 r13235  
    3131#ifdef _HAVE_MATLAB_MODULES_
    3232/* serial input macros: */
    33 #define X_IN      prhs[0]
    34 #define Y_IN      prhs[1]
    35 #define SGN_IN    prhs[2]
     33#define X_IN   prhs[0]
     34#define Y_IN   prhs[1]
     35#define SGN_IN prhs[2]
     36/* serial output macros: */
     37#define LAT_OUT (mxArray**)&plhs[0]
     38#define LON_OUT (mxArray**)&plhs[1]
     39#endif
    3640
     41#ifdef _HAVE_PYTHON_MODULES_
     42/* serial input macros: */
     43#define X_IN   PyTuple_GetItem(args,0)
     44#define Y_IN   PyTuple_GetItem(args,1)
     45#define SGN_IN PyTuple_GetItem(args,2)
    3746/* serial output macros: */
    38 #define LAT_OUT    (mxArray**)&plhs[0]
    39 #define LON_OUT    (mxArray**)&plhs[1]
     47#define LAT_OUT output,0
     48#define LON_OUT output,1
    4049#endif
    4150
Note: See TracChangeset for help on using the changeset viewer.