Index: ../trunk-jpl/src/m/modules/BamgTriangulate.py =================================================================== --- ../trunk-jpl/src/m/modules/BamgTriangulate.py (revision 25515) +++ ../trunk-jpl/src/m/modules/BamgTriangulate.py (revision 25516) @@ -2,17 +2,16 @@ def BamgTriangulate(x, y): - """ - BAMGTRIANGULATE + """BAMGTRIANGULATE Usage: index = BamgTriangulate(x, y) - index: index of the triangulation - x, y: coordinates of the nodes + index : index of the triangulation + x, y : coordinates of the nodes """ - # Call mex module + # Call Python module index = BamgTriangulate_python(x, y) - # return - return index + + return index[0] Index: ../trunk-jpl/test/NightlyRun/test2004.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test2004.m (revision 25515) +++ ../trunk-jpl/test/NightlyRun/test2004.m (revision 25516) @@ -153,8 +153,9 @@ longAIS=delH{:,1}; latAIS=delH{:,2}; delHAIS=delH{:,3}; - points=[longAIS,latAIS]; - index=delaunayn(points); + % points=[longAIS,latAIS]; + % index=delaunayn(points); + index=BamgTriangulate(longAIS, latAIS); lat=md.mesh.lat; long=md.mesh.long+360; pos=find(long>360); @@ -262,8 +263,9 @@ longGIS=delH(:,1); latGIS=delH(:,2); delHGIS=delH(:,3); - points=[longGIS,latGIS]; - index=delaunayn(points); + % points=[longGIS,latGIS]; + % index=delaunayn(points); + index=BamgTriangulate(longGIS, latGIS); lat=md.mesh.lat; long=md.mesh.long+360; pos=find(long>360); @@ -275,8 +277,9 @@ longGLA=delH(:,1); latGLA=delH(:,2); delHGLA=sum(delH(:,3:end),2); - points=[longGLA,latGLA]; - index=delaunayn(points); + % points=[longGLA,latGLA]; + % index=delaunayn(points); + index=BamgTriangulate(longGLA, latGLA); lat=md.mesh.lat; long=md.mesh.long+360; pos=find(long>360); Index: ../trunk-jpl/test/Archives/Archive2004.arch =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream