Changeset 20852

Timestamp:

07/05/16 08:54:15 (9 years ago)

Author:

bdef

Message:

NEW:adding BamgTriangulate to python wrappers

Location:

issm/trunk-jpl/src/wrappers

Files:

• BamgTriangulate/BamgTriangulate.cpp (modified) (1 diff)
• python/Makefile.am (modified) (3 diffs)

issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.cpp

@@ -33 +33 @@
 
         /*checks on arguments on the matlab side: */
-        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&BamgTriangulateUsage);
+        /* CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&BamgTriangulateUsage); */
+        CHECKARGUMENTS(NLHS,NRHS,&BamgTriangulateUsage);
 
         /*Input datasets: */

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

@@ -1 +1 @@
 AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@
-#AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects
 
 EXEEXT=$(PYTHONWRAPPEREXT)
@@ -30 +30 @@
 lib_LTLIBRARIES += BamgConvertMesh_python.la\
                                                 BamgMesher_python.la\
+                                                BamgTriangulate.la\
                                                 ContourToMesh_python.la\
                                                 ContourToNodes_python.la\
@@ -96 +97 @@
 BamgMesher_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
+BamgTriangulate_la_SOURCES = ../BamgMesher/BamgMesher.cpp
+BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
+
 ContourToMesh_python_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
 ContourToMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)