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

Last change on this file since 14312 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 1.7 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/wrappers/python/Makefile.am
2===================================================================
3--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 13922)
4+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 13923)
5@@ -32,6 +32,7 @@
6 ElementConnectivity.la\
7 EnumToString.la\
8 InterpFromMeshToMesh2d.la\
9+ InterpFromGridToMesh.la\
10 MeshProfileIntersection.la\
11 NodeConnectivity.la\
12 StringToEnum.la\
13@@ -112,6 +113,10 @@
14 ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
15 InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
16
17+InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
18+ ../InterpFromGridToMesh/InterpFromGridToMesh.h
19+InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
20+
21 MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
22 ../MeshProfileIntersection/MeshProfileIntersection.h
23 MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
24Index: ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp
25===================================================================
26--- ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 13922)
27+++ ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 13923)
28@@ -47,10 +47,12 @@
29 MODULEBOOT();
30
31 /*checks on arguments on the matlab side: */
32+ #ifdef _HAVE_MATLAB_MODULES_
33 if((nlhs!=NLHS) || (nrhs!=6 && nrhs!=7)){
34 InterpFromGridToMeshUsage();
35 _error_("usage. See above");
36 }
37+ #endif
38
39 /*Input datasets: */
40 FetchData(&x,&x_rows,NULL,XHANDLE);
Note: See TracBrowser for help on using the repository browser.