Index: ../trunk-jpl/src/m/modules/BamgMesher.m =================================================================== --- ../trunk-jpl/src/m/modules/BamgMesher.m (revision 0) +++ ../trunk-jpl/src/m/modules/BamgMesher.m (revision 20850) @@ -0,0 +1,19 @@ +function [bamgmesh,bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions); +%BAMGMESHER +% +% Usage: +% [bamgmesh, bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions); +% +% bamgmesh: input bamg mesh +% bamggeom: input bamg geometry for the mesh +% bamgoptions: options for the bamg mesh + +% Check usage +if nargin~=3 + help BamgMesher + error('Wrong usage (see above)'); +end + +% Call mex module +[bamgmesh, bamggeom] = BamgMesher_matlab(bamgmesh,bamggeom,bamgoptions); + Index: ../trunk-jpl/src/m/modules/BamgMesher.py =================================================================== --- ../trunk-jpl/src/m/modules/BamgMesher.py (revision 0) +++ ../trunk-jpl/src/m/modules/BamgMesher.py (revision 20850) @@ -0,0 +1,19 @@ +from BamgMesher_python import BamgMesher_python + +def BamgMesher(bamgmesh,bamggeom,bamgoptions): + """ + BAMGMESHER + + Usage: + [bamgmesh,bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions); + + bamgmesh: input bamg mesh + bamggeom: input bamg geometry for the mesh + bamgoptions: options for the bamg mesh + """ + + #Call mex module + [bamgmesh, bamggeom] = BamgMesher_python(bamgmesh, bamggeom, bamgoptions); + + #return + return [bamgmesh, bamggeom] Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20849) +++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20850) @@ -36,7 +36,7 @@ libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS) #}}} #Wrappers {{{ -lib_LTLIBRARIES += BamgMesher.la\ +lib_LTLIBRARIES += BamgMesher_matlab.la\ BamgConvertMesh_matlab.la\ BamgTriangulate.la\ ContourToMesh_matlab.la\ @@ -140,8 +140,8 @@ libISSMApi_la_LDFLAGS = -static endif -BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp -BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) +BamgMesher_matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp +BamgMesher_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp BamgConvertMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) Index: ../trunk-jpl/src/wrappers/python/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20849) +++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20850) @@ -28,7 +28,7 @@ #Wrappers {{{ if WRAPPERS lib_LTLIBRARIES += BamgConvertMesh_python.la\ - BamgMesher.la\ + BamgMesher_python.la\ ContourToMesh_python.la\ ContourToNodes_python.la\ ElementConnectivity.la\ @@ -92,8 +92,8 @@ 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) +BamgMesher_python_la_SOURCES = ../BamgMesher/BamgMesher.cpp +BamgMesher_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) ContourToMesh_python_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp ContourToMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)