source: issm/oecreview/Archive/20545-21336/ISSM-20849-20850.diff@ 21337

../trunk-jpl/src/m/modules/BamgMesher.m

@@ +1 @@
+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);
+

../trunk-jpl/src/m/modules/BamgMesher.py

@@ +1 @@
+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]

../trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -36 +36 @@
 libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS)
 #}}}
 #Wrappers {{{
-lib_LTLIBRARIES += BamgMesher.la\
+lib_LTLIBRARIES += BamgMesher_matlab.la\
                                                  BamgConvertMesh_matlab.la\
                                                  BamgTriangulate.la\
                                                  ContourToMesh_matlab.la\
@@ -140 +140 @@
 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)

../trunk-jpl/src/wrappers/python/Makefile.am

@@ -28 +28 @@
 #Wrappers {{{
 if WRAPPERS
 lib_LTLIBRARIES += BamgConvertMesh_python.la\
-                                                BamgMesher.la\
+                                                BamgMesher_python.la\
                                                 ContourToMesh_python.la\
                                                 ContourToNodes_python.la\
                                                 ElementConnectivity.la\
@@ -92 +92 @@
 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)