source: issm/oecreview/Archive/20545-21336/ISSM-20845-20846.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 3.4 KB
RevLine 
[21337]1Index: ../trunk-jpl/src/m/modules/BamgConvertMesh.py
2===================================================================
3--- ../trunk-jpl/src/m/modules/BamgConvertMesh.py (revision 0)
4+++ ../trunk-jpl/src/m/modules/BamgConvertMesh.py (revision 20846)
5@@ -0,0 +1,17 @@
6+from BamgConvertMesh_python import BamgConvertMesh_python
7+
8+def BamgConvertMesh(index,x,y):
9+ """
10+ BAMGCONVERTMESH - Convert [index, x, y] to a bamg geom and mesh geom
11+
12+ Usage:
13+ [bamggeom, bamgmesh] = BamgConvertMesh(index, x, y)
14+ index: index of the mesh
15+ x,y: coordinates of the nodes
16+ """
17+
18+ #Call mex module
19+ [bamggeom, bamgmesh] = BamgConvertMesh_python(index,x,y);
20+
21+ #return
22+ return [bamggeom, bamgmesh]
23Index: ../trunk-jpl/src/m/modules/BamgConvertMesh.m
24===================================================================
25--- ../trunk-jpl/src/m/modules/BamgConvertMesh.m (revision 0)
26+++ ../trunk-jpl/src/m/modules/BamgConvertMesh.m (revision 20846)
27@@ -0,0 +1,17 @@
28+function [bamggeom, bamgmesh] = BamgConvertMesh(index,x,y);
29+%BAMGCONVERTMESH - Convert [x y index] to a bamg geom and mesh geom
30+%
31+% Usage:
32+% [bamggeom, bamgmesh] = BamgConvertMesh(index,x,y);
33+%
34+% index: index of the mesh
35+% x,y: coordinates of the nodes
36+
37+% Check usage
38+if nargin~=3
39+ help BamgConvertMesh
40+ error('Wrong usage (see above)');
41+end
42+
43+% Call mex module
44+[bamggeom, bamgmesh] = BamgConvertMesh_matlab(index,x,y);
45Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
46===================================================================
47--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20845)
48+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20846)
49@@ -37,7 +37,7 @@
50 #}}}
51 #Wrappers {{{
52 lib_LTLIBRARIES += BamgMesher.la\
53- BamgConvertMesh.la\
54+ BamgConvertMesh_matlab.la\
55 BamgTriangulate.la\
56 ContourToMesh_matlab.la\
57 ContourToNodes_matlab.la\
58@@ -143,8 +143,8 @@
59 BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
60 BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
61
62-BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
63-BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
64+BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
65+BamgConvertMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
66
67 BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
68 BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
69Index: ../trunk-jpl/src/wrappers/python/Makefile.am
70===================================================================
71--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20845)
72+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20846)
73@@ -27,7 +27,7 @@
74 #}}}
75 #Wrappers {{{
76 if WRAPPERS
77-lib_LTLIBRARIES += BamgConvertMesh.la\
78+lib_LTLIBRARIES += BamgConvertMesh_python.la\
79 BamgMesher.la\
80 ContourToMesh_python.la\
81 ContourToNodes_python.la\
82@@ -89,8 +89,8 @@
83 AM_CXXFLAGS += $(CXXOPTFLAGS)
84 #}}}
85 #Bin sources {{{
86-BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
87-BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
88+BamgConvertMesh_python_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
89+BamgConvertMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
90
91 BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
92 BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
Note: See TracBrowser for help on using the repository browser.