fix libraries

Author: pbrubeck

pyop2/compilation.py

@@ -344,7 +344,7 @@ class LinuxGnuCompiler(Compiler):
 
     _cflags = ("-fPIC", "-Wall", "-std=gnu11")
     _cxxflags = ("-fPIC", "-Wall")
-    _ldflags = ("-shared", "-lgsl", "-lgslcblas")
+    _ldflags = ("-shared",)
 
     _optflags = ("-march=native", "-O3", "-ffast-math")
     _debugflags = ("-O0", "-g")

pyop2/global_kernel.py

@@ -396,7 +396,7 @@ def _cppargs(self):
     def _ldargs(self):
         ldargs = [f"-L{d}/lib" for d in get_petsc_dir()]
         ldargs.extend(f"-Wl,-rpath,{d}/lib" for d in get_petsc_dir())
-        ldargs.extend(["-lpetsc", "-lm"])
+        ldargs.extend(["-lpetsc", "-lm", "-lgsl", "-lgslcblas"])
         ldargs.extend(self.local_kernel.ldargs)
         return tuple(ldargs)
 

tests/firedrake/regression/test_hypergeometric_function.py

@@ -1,31 +1,20 @@
 from firedrake import *
+from scipy.special import hyp2f1 as sp_hyp2f1
 import numpy as np
-import scipy
 import pytest
 
 
-@pytest.mark.skipif(utils.complex_mode, reason="Complex bessel functions are not implemented.")
 def test_hypergeometric_function():
-    sp_hyp2f1 = scipy.special.hyp2f1
-    a = 1
-    b = 1
-    c = 1
     mesh = UnitDiskMesh(3)
     V = FunctionSpace(mesh, "CG", 1)
-
     x, y = SpatialCoordinate(mesh)
 
-    expr = x / 10
-    uexact = hyp2f1(a, b, c, expr)
-    assert np.allclose(assemble(Function(V).interpolate(uexact)).dat.data,
-                       sp_hyp2f1(a, b, c, assemble(Function(V).interpolate(expr)).dat.data))
-
-    expr = sqrt(x**2+y**2) / 10
-    uexact = hyp2f1(a, b, c, expr)
-    assert np.allclose(assemble(Function(V).interpolate(uexact)).dat.data,
-                       sp_hyp2f1(a, b, c, assemble(Function(V).interpolate(expr)).dat.data))
+    expressions = [((1/3, 1/2, 1), Constant(0.9999) * x),
+                   ((1/2, 1/2, 1), Constant(0.9999) * sqrt(x**2+y**2)),
+                   ((-1/2, 1/2, 1), Constant(0.4999) * sqrt(x*x + y*y))]
 
-    expr = sqrt(x*x + y*y) / 10
-    uexact = hyp2f1(a, b, c, expr)
-    assert np.allclose(assemble(Function(V).interpolate(uexact)).dat.data,
-                       sp_hyp2f1(a, b, c, assemble(Function(V).interpolate(expr)).dat.data))
+    for (a, b, c), expr in expressions:
+        uexact = hyp2f1(a, b, c, expr)
+        result = assemble(Function(V).interpolate(uexact)).dat.data
+        expect = sp_hyp2f1(a, b, c, assemble(Function(V).interpolate(expr)).dat.data)
+        assert np.allclose(result, expect)