add downloading ISSM in CI

DJ4Earth · Jan 11, 2024 · 1032cef · 1032cef
1 parent 981334d
commit 1032cef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,6 +44,9 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
+      - run: |
+          svn --username anon --password anon checkout https://issm.ess.uci.edu/svn/issm/issm/trunk
+          export ISSM_DIR='./trunk/
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1

diff --git a/src/core/control.jl b/src/core/control.jl
@@ -1,3 +1,8 @@
+using Enzyme
+Enzyme.API.looseTypeAnalysis!(false)
+Enzyme.API.strictAliasing!(false)
+Enzyme.API.typeWarning!(false)
+
 function Control_Core(md::model, femmodel::FemModel) #{{{
 	# Compute gradient 
 	computeGradient(md, femmodel)

diff --git a/src/core/solve.jl b/src/core/solve.jl
@@ -1,8 +1,3 @@
-using Enzyme
-Enzyme.API.looseTypeAnalysis!(false)
-Enzyme.API.strictAliasing!(false)
-Enzyme.API.typeWarning!(false)
-
 include("./issmenums.jl")
 include("./toolkits.jl")
 include("./gauss.jl")

diff --git a/src/usr/triangle.jl b/src/usr/triangle.jl
@@ -152,11 +152,12 @@ function triangle(md::model,domainname::String,resolution::Float64) #{{{
 	#Call triangle using ISSM's default options
 	triangle_switches = "pQzDq30ia"*@sprintf("%lf",area) #replace V by Q to quiet down the logging
 	#rc=ccall( (:triangulate,"libtriangle"),
-	try rc=ccall( (:triangulate,issmdir()*"/externalpackages/triangle/src/libtriangle.dylib"),
+
+	try rc=ccall( (:triangulate,issmdir()*"/externalpackages/triangle/src/libtriangle."*(@static Sys.islinux() ? :"so" : (@static Sys.isapple() ? :"dylib" : :"so"))),
 				Cint, ( Cstring, Ref{CTriangulateIO}, Ref{CTriangulateIO}, Ref{CTriangulateIO}),
 				triangle_switches, Ref(ctio_in), Ref(ctio_out), Ref(vor_out))
 	catch LoadError
-		rc=ccall( (:triangulate,issmdir()*"/externalpackages/triangle/install/lib/libtriangle.dylib"),
+		rc=ccall( (:triangulate,issmdir()*"/externalpackages/triangle/install/lib/libtriangle."*(@static Sys.islinux() ? :"so" : (@static Sys.isapple() ? :"dylib" : :"so"))),
 					Cint, ( Cstring, Ref{CTriangulateIO}, Ref{CTriangulateIO}, Ref{CTriangulateIO}),
 					triangle_switches, Ref(ctio_in), Ref(ctio_out), Ref(vor_out))
 	end