Changeset 13214
- Timestamp:
- 08/31/12 10:47:36 (13 years ago)
- Location:
- issm/trunk-jpl/src/modules
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/modules/AverageFilter/AverageFilter.h
r13213 r13214 29 29 #define __FUNCT__ "AverageFilter" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define IMAGEIN prhs[0] … … 36 36 /* serial output macros: */ 37 37 #define IMAGEOUT &plhs[0] 38 #endif 38 39 39 40 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.h
r13213 r13214 29 29 #define __FUNCT__ "BamgConvertMesh" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define INDEXHANDLE prhs[0] … … 38 38 #define BAMGMESHOUT (mxArray**)&plhs[0] 39 39 #define BAMGGEOMOUT (mxArray**)&plhs[1] 40 #endif 40 41 41 42 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/BamgMesher/BamgMesher.h
r13213 r13214 28 28 #undef __FUNCT__ 29 29 #define __FUNCT__ "BamgMesher" 30 30 31 #ifdef _HAVE_MATLAB_MODULES_ 31 32 /* serial input macros: */ 32 33 #define BAMGMESHIN (mxArray*)prhs[0] … … 37 38 #define BAMGMESHOUT (mxArray**)&plhs[0] 38 39 #define BAMGGEOMOUT (mxArray**)&plhs[1] 40 #endif 39 41 40 42 /* serial arg counts: */ … … 45 47 46 48 #endif /* _BAMG_MESHER_H_ */ 47 -
issm/trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.h
r13213 r13214 29 29 #define __FUNCT__ "BamgTriangulate" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define XHANDLE prhs[0] … … 36 36 /* serial output macros: */ 37 37 #define INDEX (mxArray**)&plhs[0] 38 #endif 38 39 39 40 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/Chaco/Chaco.h
r13213 r13214 17 17 #endif 18 18 19 /* local prototypes: */20 void ChacoUsage(void);21 22 19 /*headers*/ 23 20 #include <stdio.h> … … 29 26 #include "../../c/shared/shared.h" 30 27 #include "../../c/issm-binding.h" 31 28 29 /* local prototypes: */ 30 void ChacoUsage(void); 31 32 #undef __FUNCT__ 33 #define __FUNCT__ "Chaco" 34 35 #ifdef _HAVE_MATLAB_MODULES_ 32 36 /* serial input macros: */ 33 37 #define A_IN (mxArray*)prhs[0] … … 43 47 /* serial output macros: */ 44 48 #define ASSGN_OUT (mxArray**)&plhs[0] 49 #endif 45 50 46 51 /* serial arg counts: */ … … 50 55 #define NRHS 9 51 56 52 #undef __FUNCT__53 #define __FUNCT__ "Chaco"54 55 57 #endif /* _CHACO_H */ -
issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h
r13213 r13214 28 28 #include "../../c/EnumDefinitions/EnumDefinitions.h" 29 29 30 #undef __FUNCT__ 31 #define __FUNCT__ "ContourToMesh" 32 30 33 #ifdef _HAVE_MATLAB_MODULES_ 31 34 /* serial input macros: */ … … 54 57 #endif 55 58 56 #undef __FUNCT__57 #define __FUNCT__ "ContourToMesh"58 59 59 /* serial arg counts: */ 60 60 #undef NLHS -
issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.h
r13213 r13214 29 29 #define __FUNCT__ "ContourToNodes" 30 30 31 32 #ifndef ALL 33 #define ALL 0 34 #endif 35 31 #ifdef _HAVE_MATLAB_MODULES_ 36 32 /* input macros: */ 37 33 #define XHANDLE prhs[0] … … 42 38 /* serial output macros: */ 43 39 #define FLAGS (mxArray**)&plhs[0] 40 #endif 44 41 45 42 /* serial arg counts: */ … … 49 46 #define NRHS 4 50 47 51 52 48 #endif /* _CONTOURTONODES_H */ 53 49 -
issm/trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.h
r13213 r13214 28 28 #include "../../c/EnumDefinitions/EnumDefinitions.h" 29 29 30 #undef __FUNCT__ 31 #define __FUNCT__ "ElementConnectivity" 32 30 33 #ifdef _HAVE_MATLAB_MODULES_ 31 34 /* serial input macros: */ … … 46 49 #endif 47 50 48 #undef __FUNCT__49 #define __FUNCT__ "ElementConnectivity"50 51 51 /* serial arg counts: */ 52 52 #undef NLHS -
issm/trunk-jpl/src/modules/EnumToString/EnumToString.cpp
r13034 r13214 29 29 } 30 30 31 void EnumToStringUsage(void) 32 { 31 void EnumToStringUsage(void){ 33 32 _pprintLine_(""); 34 33 _pprintLine_(" usage: " << __FUNCT__ << "string = EnumToString(enum);"); -
issm/trunk-jpl/src/modules/EnumToString/EnumToString.h
r13213 r13214 23 23 #include "../../c/shared/shared.h" 24 24 #include "../../c/issm-binding.h" 25 25 26 #undef __FUNCT__ 27 #define __FUNCT__ "EnumToString" 28 26 29 #ifdef _HAVE_MATLAB_MODULES_ 27 30 /* serial input macros: */ … … 44 47 #define NRHS 1 45 48 46 #undef __FUNCT__47 #define __FUNCT__ "EnumToString"48 49 49 /* local prototypes: */ 50 50 void EnumToStringUsage(void); -
issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.h
r13213 r13214 29 29 #define __FUNCT__ "Exp2Kml" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define EXP_IN prhs[0] … … 37 37 /* serial output macros: */ 38 38 #define RET_OUT (mxArray**)&plhs[0] 39 #endif 39 40 40 41 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/HoleFiller/HoleFiller.h
r13213 r13214 29 29 #define __FUNCT__ "HoleFiller" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define IMAGEIN prhs[0] … … 36 36 /* serial output macros: */ 37 37 #define IMAGEOUT &plhs[0] 38 #endif 38 39 39 40 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/InternalFront/InternalFront.h
r13213 r13214 28 28 #define __FUNCT__ "InternalFront" 29 29 30 #ifdef _HAVE_MATLAB_MODULES_ 30 31 /* serial input macros: */ 31 32 #define MODEL (mxArray*)prhs[0] … … 33 34 /* serial output macros: */ 34 35 #define FRONT (mxArray**)&plhs[0] 36 #endif 35 37 36 38 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.h
r13213 r13214 29 29 #define __FUNCT__ "InterpFromGridToMesh" 30 30 31 #undef CLEANUP 32 #define CLEANUP InterpFromGridToMeshLocalCleanup(); 33 34 31 #ifdef _HAVE_MATLAB_MODULES_ 35 32 /* serial input macros: */ 36 33 #define XHANDLE prhs[0] … … 44 41 /* serial output macros: */ 45 42 #define DATAMESH (mxArray**)&plhs[0] 43 #endif 46 44 47 45 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.h
r13213 r13214 29 29 #define __FUNCT__ "InterpFromMesh2d" 30 30 31 #undef CLEANUP 32 #define CLEANUP InterpFromMesh2dLocalCleanup(); 33 31 #ifdef _HAVE_MATLAB_MODULES_ 34 32 /* serial input macros: */ 35 33 #define INDEXHANDLE prhs[0] … … 44 42 /* serial output macros: */ 45 43 #define DATAPRIME (mxArray**)&plhs[0] 44 #endif 46 45 47 46 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.h
r13213 r13214 29 29 #define __FUNCT__ "InterpFromMeshToGrid" 30 30 31 #ifdef _HAVE_MATLAB_MODULES_ 31 32 /* serial input macros: */ 32 33 #define INDEX (mxArray*)prhs[0] … … 46 47 #define YM (mxArray**)&plhs[1] 47 48 #define GRIDDATA (mxArray**)&plhs[2] 49 #endif 48 50 49 51 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
r13213 r13214 29 29 #define __FUNCT__ "InterpFromMeshToMesh3d" 30 30 31 #undef CLEANUP 32 #define CLEANUP InterpFromMeshToMesh3dLocalCleanup(); 33 34 31 #ifdef _HAVE_MATLAB_MODULES_ 35 32 /* serial input macros: */ 36 33 #define INDEXHANDLE prhs[0] … … 46 43 /* serial output macros: */ 47 44 #define DATAPRIME (mxArray**)&plhs[0] 45 #endif 48 46 49 47 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.h
r13213 r13214 29 29 #define __FUNCT__ "KMLFileRead" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define FILENAME prhs[0] … … 35 35 /* serial output macros: */ 36 36 #define ERRORFLAG (mxArray**)&plhs[0] 37 #endif 37 38 38 39 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.h
r13213 r13214 29 29 #define __FUNCT__ "KMLMeshWrite" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define NAME prhs[0] … … 44 44 /* serial output macros: */ 45 45 #define ERRORFLAG (mxArray**)&plhs[0] 46 #endif 46 47 47 48 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.h
r13213 r13214 29 29 #define __FUNCT__ "KMLOverlay" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define FILENAME prhs[0] … … 35 35 /* serial output macros: */ 36 36 #define ERRORFLAG (mxArray**)&plhs[0] 37 #endif 37 38 38 39 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.h
r13213 r13214 29 29 #define __FUNCT__ "Kml2Exp" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define KML_IN prhs[0] … … 37 37 /* serial output macros: */ 38 38 #define RET_OUT (mxArray**)&plhs[0] 39 #endif 39 40 40 41 /* serial arg counts: */ … … 45 46 46 47 #endif 47 -
issm/trunk-jpl/src/modules/Kriging/Kriging.h
r13213 r13214 27 27 #undef __FUNCT__ 28 28 #define __FUNCT__ "Kriging" 29 29 30 #ifdef _HAVE_MATLAB_MODULES_ 30 31 /* serial input macros: */ 31 32 #define X (mxArray *)prhs[0] … … 38 39 #define PREDICTIONS (mxArray**)&plhs[0] 39 40 #define ERROR (mxArray**)&plhs[1] 41 #endif 40 42 41 43 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/Ll2xy/Ll2xy.h
r13213 r13214 29 29 #define __FUNCT__ "Ll2xy" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define LAT_IN prhs[0] … … 38 38 #define X_OUT (mxArray**)&plhs[0] 39 39 #define Y_OUT (mxArray**)&plhs[1] 40 #endif 40 41 41 42 /* serial arg counts: */ … … 46 47 47 48 #endif 48 -
issm/trunk-jpl/src/modules/MeshPartition/MeshPartition.h
r13213 r13214 32 32 #define __FUNCT__ "MeshPartition" 33 33 34 #ifdef _HAVE_MATLAB_MODULES_ 34 35 /* serial input macros: */ 35 36 #define MODEL (mxArray*)prhs[0] … … 39 40 #define ELEMENTPARTITIONING (mxArray**)&plhs[0] 40 41 #define NODEPARTITIONING (mxArray**)&plhs[1] 42 #endif 41 43 42 44 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/MeshProfileIntersection/MeshProfileIntersection.h
r13213 r13214 29 29 #define __FUNCT__ "MeshProfileIntersection" 30 30 31 #ifdef _HAVE_MATLAB_MODULES_ 31 32 /* input macros: */ 32 33 #define INDEX prhs[0] … … 37 38 /* serial output macros: */ 38 39 #define SEGMENTS (mxArray**)&plhs[0] 40 #endif 39 41 40 42 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.h
r13213 r13214 29 29 #define __FUNCT__ "PointCloudFindNeighbors" 30 30 31 32 #ifndef ALL 33 #define ALL 0 34 #endif 35 31 #ifdef _HAVE_MATLAB_MODULES_ 36 32 /* input macros: */ 37 33 #define XHANDLE prhs[0] … … 42 38 /* serial output macros: */ 43 39 #define FLAGS (mxArray**)&plhs[0] 40 #endif 44 41 45 42 /* serial arg counts: */ … … 49 46 #define NRHS 4 50 47 51 52 48 #endif /* _POINTCLOUDFINDNEIGHBORS_H */ 53 -
issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
r13213 r13214 29 29 #define __FUNCT__ "PropagateFlagsFromConnectivity" 30 30 31 #ifdef _HAVE_MATLAB_MODULES_ 31 32 /* serial input macros: */ 32 33 #define CONNECTIVITY (mxArray*)prhs[0] … … 37 38 /* serial output macros: */ 38 39 #define POOLOUT (mxArray**)&plhs[0] 40 #endif 39 41 40 42 /* serial arg counts: */ … … 44 46 #define NRHS 4 45 47 46 47 48 #endif /* _PROPAGATEFLAGSFROMCONNECTIVITY_H */ 48 49 -
issm/trunk-jpl/src/modules/Scotch/Scotch.h
r13213 r13214 5 5 #ifndef _SCOTCH_H 6 6 #define _SCOTCH_H 7 8 #ifdef HAVE_CONFIG_H9 #include <config.h>10 #else11 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"12 #endif13 14 /*For python modules: needs to come before header files inclusion*/15 #ifdef _HAVE_PYTHON_16 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol17 #endif18 7 19 8 /* local prototypes: */ … … 35 24 /* Scotch structures and prototypes */ 36 25 #ifdef MATLAB 37 38 39 26 #include "mat.h" 27 #include "mex.h" 28 #include "matrix.h" 40 29 41 42 43 44 45 46 47 30 #define printf mexPrintf 31 #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__)) 32 #define malloc mxMalloc 33 #define calloc mxCalloc 34 #define realloc mxRealloc 35 #define free mxFree 36 #define exit(status) mexErrMsgTxt("exit=" #status) 48 37 #endif 49 38 50 51 39 #endif /* _SCOTCH_H */ -
issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.h
r13213 r13214 29 29 #define __FUNCT__ "Shp2Kml" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define SHP_IN prhs[0] … … 37 37 /* serial output macros: */ 38 38 #define RET_OUT (mxArray**)&plhs[0] 39 #endif 39 40 40 41 /* serial arg counts: */ -
issm/trunk-jpl/src/modules/StringToEnum/StringToEnum.h
r13213 r13214 23 23 #include "../../c/shared/shared.h" 24 24 #include "../../c/issm-binding.h" 25 26 #undef __FUNCT__ 27 #define __FUNCT__ "StringToEnum" 25 28 26 29 #ifdef _HAVE_MATLAB_MODULES_ … … 44 47 #define NRHS 1 45 48 46 #undef __FUNCT__47 #define __FUNCT__ "StringToEnum"48 49 49 /* local prototypes: */ 50 50 void StringToEnumUsage(void); -
issm/trunk-jpl/src/modules/TriMesh/TriMesh.h
r13213 r13214 28 28 #include "../../c/EnumDefinitions/EnumDefinitions.h" 29 29 30 #undef __FUNCT__ 31 #define __FUNCT__ "TriMesh" 32 30 33 #ifdef _HAVE_MATLAB_MODULES_ 31 34 /* serial input macros: */ … … 54 57 #endif 55 58 56 #undef __FUNCT__57 #define __FUNCT__ "TriMesh"58 59 59 /* serial arg counts: */ 60 60 #undef NLHS -
issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.h
r13213 r13214 5 5 #ifndef _TRIMESH_PROCESSRIFTS_H_ 6 6 #define _TRIMESH_PROCESSRIFTS_H_ 7 8 #ifdef HAVE_CONFIG_H9 #include <config.h>10 #else11 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"12 #endif13 14 /*For python modules: needs to come before header files inclusion*/15 #ifdef _HAVE_PYTHON_16 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol17 #endif18 7 19 8 #include "mex.h" -
issm/trunk-jpl/src/modules/TriaSearch/TriaSearch.h
r13213 r13214 28 28 #define __FUNCT__ "TriaSearch" 29 29 30 30 #ifdef _HAVE_MATLAB_MODULES_ 31 31 /* serial input macros: */ 32 32 #define INDEXHANDLE prhs[0] … … 38 38 /* serial output macros: */ 39 39 #define TRIA (mxArray**)&plhs[0] 40 #endif 40 41 41 42 /* serial arg counts: */ 42 43 #undef NLHS 43 44 #define NLHS 1 44 45 45 #undef NRHS 46 46 #define NRHS 5 -
issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.h
r13213 r13214 29 29 #define __FUNCT__ "Xy2ll" 30 30 31 31 #ifdef _HAVE_MATLAB_MODULES_ 32 32 /* serial input macros: */ 33 33 #define X_IN prhs[0] … … 38 38 #define LAT_OUT (mxArray**)&plhs[0] 39 39 #define LON_OUT (mxArray**)&plhs[1] 40 #endif 40 41 41 42 /* serial arg counts: */ … … 46 47 47 48 #endif 48
Note:
See TracChangeset
for help on using the changeset viewer.