Index: ../trunk-jpl/src/m/modules/BamgConvertMesh.py =================================================================== --- ../trunk-jpl/src/m/modules/BamgConvertMesh.py (revision 0) +++ ../trunk-jpl/src/m/modules/BamgConvertMesh.py (revision 20846) @@ -0,0 +1,17 @@ +from BamgConvertMesh_python import BamgConvertMesh_python + +def BamgConvertMesh(index,x,y): + """ + BAMGCONVERTMESH - Convert [index, x, y] to a bamg geom and mesh geom + + Usage: + [bamggeom, bamgmesh] = BamgConvertMesh(index, x, y) + index: index of the mesh + x,y: coordinates of the nodes + """ + + #Call mex module + [bamggeom, bamgmesh] = BamgConvertMesh_python(index,x,y); + + #return + return [bamggeom, bamgmesh] Index: ../trunk-jpl/src/m/modules/BamgConvertMesh.m =================================================================== --- ../trunk-jpl/src/m/modules/BamgConvertMesh.m (revision 0) +++ ../trunk-jpl/src/m/modules/BamgConvertMesh.m (revision 20846) @@ -0,0 +1,17 @@ +function [bamggeom, bamgmesh] = BamgConvertMesh(index,x,y); +%BAMGCONVERTMESH - Convert [x y index] to a bamg geom and mesh geom +% +% Usage: +% [bamggeom, bamgmesh] = BamgConvertMesh(index,x,y); +% +% index: index of the mesh +% x,y: coordinates of the nodes + +% Check usage +if nargin~=3 + help BamgConvertMesh + error('Wrong usage (see above)'); +end + +% Call mex module +[bamggeom, bamgmesh] = BamgConvertMesh_matlab(index,x,y); Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20845) +++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20846) @@ -37,7 +37,7 @@ #}}} #Wrappers {{{ lib_LTLIBRARIES += BamgMesher.la\ - BamgConvertMesh.la\ + BamgConvertMesh_matlab.la\ BamgTriangulate.la\ ContourToMesh_matlab.la\ ContourToNodes_matlab.la\ @@ -143,8 +143,8 @@ BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) -BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp -BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) +BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp +BamgConvertMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) Index: ../trunk-jpl/src/wrappers/python/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20845) +++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20846) @@ -27,7 +27,7 @@ #}}} #Wrappers {{{ if WRAPPERS -lib_LTLIBRARIES += BamgConvertMesh.la\ +lib_LTLIBRARIES += BamgConvertMesh_python.la\ BamgMesher.la\ ContourToMesh_python.la\ ContourToNodes_python.la\ @@ -89,8 +89,8 @@ AM_CXXFLAGS += $(CXXOPTFLAGS) #}}} #Bin sources {{{ -BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp -BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) +BamgConvertMesh_python_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp +BamgConvertMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)