Merge pull request #267 from mfem/custom_bessel

Custom bessel

Author: sshiraiwa

.github/workflows/build-and-test-callable.yml

@@ -89,7 +89,9 @@ jobs:
     # Download/install dependencies
     # -------------------------------------------------------------------------------------------------
     - name: Install core dependencies via requirements.txt
-      run: pip install -r requirements.txt --verbose
+      run: |
+        pip install setuptools
+        pip install -r requirements.txt --verbose
 
     - name: Install MPI
       if: inputs.parallel

.github/workflows/build-and-test-dispatch.yml

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
-        python-version: ['3.8', '3.9', '3.10', '3.11'] # 3.12 is not supported by scipy
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] # 3.12 is not supported by scipy
         parallel: [false]
     name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
     uses: ./.github/workflows/build-and-test-callable.yml
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
-        python-version: ['3.9', '3.10', '3.11'] # 3.12 is not supported by scipy
+        python-version: ['3.9', '3.10', '3.11', '3.12'] # 3.12 is not supported by scipy
         parallel: [true]
     name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
     uses: ./.github/workflows/build-and-test-callable.yml

examples/ex25.py

@@ -19,8 +19,14 @@
 from os.path import expanduser, join, dirname
 import numpy as np
 from numpy import sin, cos, exp, sqrt, pi
-import scipy.special
 
+try:
+    import numba
+except ImportError:
+    assert False, "Numba is required"
+
+from mfem.common.bessel import jv as jn
+from mfem.common.bessel import yv as yn
 
 prob = ''
 
@@ -526,8 +532,6 @@ def source(x, out):
 
 
 def maxwell_solution(x, E, sdim):
-    jn = scipy.special.jv
-    yn = scipy.special.yn
     # Initialize
     for i in range(sdim):
         E[i] = 0.0
@@ -683,7 +687,7 @@ def detJ_JT_J_inv_Im_f(x, D):
         det *= dxs[i]
     for i in range(dim):
         D[i] = (det / (dxs[i]**2)).imag
-    #print("imag", D)
+    # print("imag", D)
 
 
 def detJ_JT_J_inv_abs_f(x, D):

examples/ex25p.py

@@ -12,15 +12,22 @@
          * calling JITed function from JITed coefficient
      
 '''
+from mpi4py import MPI
+from mfem.common.bessel import yv as yn
+from mfem.common.bessel import jv as jn
 from numba import jit, types, carray
 import os
 import mfem.par as mfem
 from mfem.par import intArray
 from os.path import expanduser, join, dirname
 import numpy as np
 from numpy import sin, cos, exp, sqrt, pi
-import scipy.special
-from mpi4py import MPI
+
+try:
+    import numba
+except ImportError:
+    assert False, "Numba is required"
+
 
 num_procs = MPI.COMM_WORLD.size
 myid = MPI.COMM_WORLD.rank
@@ -546,9 +553,6 @@ def source(x):
 
 def maxwell_solution(x):
 
-    jn = scipy.special.jv
-    yn = scipy.special.yn
-
     # Initialize
     E = np.zeros(dim, dtype=np.complex128)