From 4657b1283a0ac7d8d2bd9ec8e58ceb4bd6eebe10 Mon Sep 17 00:00:00 2001 From: awickert Date: Mon, 15 Jan 2024 19:34:39 -0500 Subject: [PATCH] Update scipy.sparse.linalg import: now works again & consistent with f1d. --- gflex/f2d.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gflex/f2d.py b/gflex/f2d.py index 263e747..276c87e 100644 --- a/gflex/f2d.py +++ b/gflex/f2d.py @@ -23,6 +23,7 @@ import numpy as np import scipy from scipy.special import kei +from scipy.sparse.linalg import isolve, spsolve from gflex.base import Flexure @@ -1784,7 +1785,7 @@ def fd_solve(self): self.iterative_ConvergenceTolerance, "m between iterations", ) - wvector = scipy.sparse.linalg.isolve.lgmres( + wvector = isolve.lgmres( self.coeff_matrix, q0vector ) # , tol=1E-10)#,x0=woldvector)#,x0=wvector,tol=1E-15) wvector = wvector[0] # Reach into tuple to get my array back @@ -1796,7 +1797,7 @@ def fd_solve(self): if not self.Quiet: print("Solution type not understood:") print("Defaulting to direct solution with UMFpack") - wvector = scipy.sparse.linalg.spsolve( + wvector = spsolve( self.coeff_matrix, q0vector, use_umfpack=True )