source: issm/oecreview/Archive/13393-13976/ISSM-13922-13923.diff@ 14312

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

@@ -32 +32 @@
                                                 ElementConnectivity.la\
                                                 EnumToString.la\
                                                 InterpFromMeshToMesh2d.la\
+                                                InterpFromGridToMesh.la\
                                                 MeshProfileIntersection.la\
                                                 NodeConnectivity.la\
                                                 StringToEnum.la\
@@ -112 +113 @@
                                                                                                 ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
 InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
 
+InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
+                                                                                                ../InterpFromGridToMesh/InterpFromGridToMesh.h
+InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
+
 MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
                                                                                 ../MeshProfileIntersection/MeshProfileIntersection.h
 MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)

../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp

@@ -47 +47 @@
         MODULEBOOT();
 
         /*checks on arguments on the matlab side: */
+        #ifdef _HAVE_MATLAB_MODULES_
         if((nlhs!=NLHS) || (nrhs!=6 && nrhs!=7)){
                 InterpFromGridToMeshUsage();
                 _error_("usage. See above");
         }
+        #endif
 
         /*Input datasets: */
         FetchData(&x,&x_rows,NULL,XHANDLE);