source: issm/oecreview/Archive/20545-21336/ISSM-20849-20850.diff@ 21337

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

CHG: added Archive/20545-21336

File size: 3.5 KB
RevLine 
[21337]1Index: ../trunk-jpl/src/m/modules/BamgMesher.m
2===================================================================
3--- ../trunk-jpl/src/m/modules/BamgMesher.m (revision 0)
4+++ ../trunk-jpl/src/m/modules/BamgMesher.m (revision 20850)
5@@ -0,0 +1,19 @@
6+function [bamgmesh,bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions);
7+%BAMGMESHER
8+%
9+% Usage:
10+% [bamgmesh, bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions);
11+%
12+% bamgmesh: input bamg mesh
13+% bamggeom: input bamg geometry for the mesh
14+% bamgoptions: options for the bamg mesh
15+
16+% Check usage
17+if nargin~=3
18+ help BamgMesher
19+ error('Wrong usage (see above)');
20+end
21+
22+% Call mex module
23+[bamgmesh, bamggeom] = BamgMesher_matlab(bamgmesh,bamggeom,bamgoptions);
24+
25Index: ../trunk-jpl/src/m/modules/BamgMesher.py
26===================================================================
27--- ../trunk-jpl/src/m/modules/BamgMesher.py (revision 0)
28+++ ../trunk-jpl/src/m/modules/BamgMesher.py (revision 20850)
29@@ -0,0 +1,19 @@
30+from BamgMesher_python import BamgMesher_python
31+
32+def BamgMesher(bamgmesh,bamggeom,bamgoptions):
33+ """
34+ BAMGMESHER
35+
36+ Usage:
37+ [bamgmesh,bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions);
38+
39+ bamgmesh: input bamg mesh
40+ bamggeom: input bamg geometry for the mesh
41+ bamgoptions: options for the bamg mesh
42+ """
43+
44+ #Call mex module
45+ [bamgmesh, bamggeom] = BamgMesher_python(bamgmesh, bamggeom, bamgoptions);
46+
47+ #return
48+ return [bamgmesh, bamggeom]
49Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
50===================================================================
51--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20849)
52+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20850)
53@@ -36,7 +36,7 @@
54 libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS)
55 #}}}
56 #Wrappers {{{
57-lib_LTLIBRARIES += BamgMesher.la\
58+lib_LTLIBRARIES += BamgMesher_matlab.la\
59 BamgConvertMesh_matlab.la\
60 BamgTriangulate.la\
61 ContourToMesh_matlab.la\
62@@ -140,8 +140,8 @@
63 libISSMApi_la_LDFLAGS = -static
64 endif
65
66-BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
67-BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
68+BamgMesher_matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp
69+BamgMesher_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
70
71 BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
72 BamgConvertMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
73Index: ../trunk-jpl/src/wrappers/python/Makefile.am
74===================================================================
75--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20849)
76+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 20850)
77@@ -28,7 +28,7 @@
78 #Wrappers {{{
79 if WRAPPERS
80 lib_LTLIBRARIES += BamgConvertMesh_python.la\
81- BamgMesher.la\
82+ BamgMesher_python.la\
83 ContourToMesh_python.la\
84 ContourToNodes_python.la\
85 ElementConnectivity.la\
86@@ -92,8 +92,8 @@
87 BamgConvertMesh_python_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
88 BamgConvertMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
89
90-BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
91-BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
92+BamgMesher_python_la_SOURCES = ../BamgMesher/BamgMesher.cpp
93+BamgMesher_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
94
95 ContourToMesh_python_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
96 ContourToMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
Note: See TracBrowser for help on using the repository browser.