Changeset 17743

Timestamp:

04/15/14 17:37:19 (11 years ago)

Author:

cborstad

Message:

CHG: added python wrapper for InterpFromMeshToMesh3d

Location:

issm/trunk-jpl/src/wrappers

Files:

• InterpFromMesh2d/InterpFromMesh2d.cpp (modified) (2 diffs)
• InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (modified) (1 diff)
• python/Makefile.am (modified) (3 diffs)

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

@@ -93 +93 @@
         if(nrhs>=8){
 
+                #ifdef _HAVE_MATLAB_MODULES_
                 /*Call expread on filename to build a contour array in the matlab workspace: */
                 mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread");
@@ -109 +110 @@
                         *(contours+i)=contouri;
                 }
-
-                /* Debugging of contours :{{{1*/
-                /*for(i=0;i<numcontours;i++){
-                  _printf_("\nContour echo: contour number  " << i+1 << " / " << numcontours << "\n");
-                  contouri=*(contours+i);
-                  _printf_("   Number of vertices " << contouri->nods << "\n");
-                  for (j=0;j<contouri->nods;j++){
-                  _printf_("   " << *(contouri->x+j) << "f " << *(contouri->y+j) << "f\n");
-                  }
-                  }*/
-                /*}}}*/
+                #else
+                _error_("not supported");
+                #endif
         }
         else{

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

@@ -66 +66 @@
 
         /*checks on arguments on the matlab side: */
+        #ifdef _HAVE_MATLAB_MODULES_
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromMeshToMesh3dUsage);
+        #endif
 
         /*Input datasets: */

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

@@ -53 +53 @@
                                                 EnumToString.la\
                                                 InterpFromMeshToMesh2d.la\
+                                                InterpFromMeshToMesh3d.la\
                                                 InterpFromGridToMesh.la\
                                                 InterpFromMeshToGrid.la\
@@ -144 +145 @@
 InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
 
+InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
+                                                                                                ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
+InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
+
 InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
                                                                                                 ../InterpFromGridToMesh/InterpFromGridToMesh.h
@@ -151 +156 @@
                                                                                                 ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
 InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
-
 
 IssmConfig_la_SOURCES = ../IssmConfig/IssmConfig.cpp\