Changeset 26737

Timestamp:

12/14/21 18:46:39 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better path to libtriangle

File:

• issm/trunk-jpl/src/jl/usr/triangle.jl (modified) (4 diffs)

issm/trunk-jpl/src/jl/usr/triangle.jl

@@ -8 +8 @@
     numberofpoints :: Cint
     numberofpointattributes :: Cint
-    
+
     trianglelist :: Ptr{Cint}
     triangleattributelist :: Ptr{Cdouble}
@@ -16 +16 @@
     numberofcorners :: Cint
     numberoftriangleattributes :: Cint
-    
+
     segmentlist :: Ptr{Cint}
     segmentmarkerlist :: Ptr{Cint}
@@ -153 +153 @@
         triangle_switches = "pQzDq30ia"*@sprintf("%lf",area) #replace V by Q to quiet down the logging
         #rc=ccall( (:triangulate,"libtriangle"),
-        rc=ccall( (:triangulate,"../../externalpackages/triangle/src/libtriangle.dylib"),
+        rc=ccall( (:triangulate,issmdir()*"/externalpackages/triangle/src/libtriangle.dylib"),
                                 Cint, ( Cstring, Ref{CTriangulateIO}, Ref{CTriangulateIO}, Ref{CTriangulateIO}),
                                 triangle_switches, Ref(ctio_in), Ref(ctio_out), Ref(vor_out))
@@ -161 +161 @@
         triangles = convert(Array{Cint,2},    Base.unsafe_wrap(Array, ctio_out.trianglelist, (3,Int(ctio_out.numberoftriangles)), own=true))' .+1
         segments  = convert(Array{Cint,2},    Base.unsafe_wrap(Array, ctio_out.segmentlist,  (2,Int(ctio_out.numberofsegments)), own=true))' .+1
-        
+
         #assign output
         md.mesh = Mesh2dTriangle()