AtHeartEngineer/kaipy
1
0
Fork 0
mirror of https://github.com/JHUAPL/kaipy.git synced 2026-01-07 21:43:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor regrid to use RectBivariateSpline

Browse Source
This commit is contained in:
wiltbemj
2025-04-24 14:23:38 -06:00
parent 5cb751a259
commit 4783483f22
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kaipy/gamera/gamGrids.py
View File

@@ -9,6 +9,7 @@ import matplotlib.cm as cm
import matplotlib.pyplot as plt
import kaipy.kaiViz as kv
import kaipy.kdefs as kdefs
from scipy.interpolate import RectBivariateSpline
#Use routine to generate xx,yy = corners of active upper half plane
@@ -958,7 +959,6 @@ def regrid(xxi, yyi, Ni, Nj, Rin=0.0, Rout=0.0, TINY=1.0e-8, scale=False):
ndarray: The x-coordinate values of the regridded grid.
ndarray: The y-coordinate values of the regridded grid.
"""
iMeth = "cubic"
Ni0 = xxi.shape[0] - 1
Nj0 = xxi.shape[1] - 1
rr0 = np.sqrt(xxi ** 2.0 + yyi ** 2.0)
@@ -989,9 +989,9 @@ def regrid(xxi, yyi, Ni, Nj, Rin=0.0, Rout=0.0, TINY=1.0e-8, scale=False):
rScl = xSclIn + iLFM[i] * dxScl
rr0[i, :] = rScl * rr0[i, :]
# Create interpolants
fR = interpolate.interp2d(iLFM, jLFM, rr0.T, kind=iMeth, fill_value=None)
fP = interpolate.interp2d(iLFM, jLFM, pp0.T, kind=iMeth, fill_value=None)
# Create interpolants using RectBivariateSpline
fR = RectBivariateSpline(iLFM, jLFM, rr0, kx=3, ky=3)
fP = RectBivariateSpline(iLFM, jLFM, pp0, kx=3, ky=3)
# Regrid onto new
XXi = np.zeros((Ni + 1, Nj + 1))
@@ -1001,8 +1001,8 @@ def regrid(xxi, yyi, Ni, Nj, Rin=0.0, Rout=0.0, TINY=1.0e-8, scale=False):
sj = np.linspace(0, 1, Nj + 1)
for i in range(Ni + 1):
for j in range(Nj + 1):
r = fR(si[i], sj[j])
phi = fP(si[i], sj[j])
r = fR(si[i], sj[j])[0, 0]
phi = fP(si[i], sj[j])[0, 0]
phi = np.maximum(TINY, phi)
phi = np.minimum(np.pi - TINY, phi)

4
tests/gamera/test_gamGrids.py
View File

@@ -5,9 +5,9 @@ import h5py
# FILE: kaipy/gamera/test_gamGrids.py
from kaipy.gamera.gamGrids import (
genLFM, genEllip, genSph, genEgg, genFatEgg, RampUp, Egglipses,
genEllip, genSph, genEgg, genFatEgg, RampUp, Egglipses,
GenKSph, GenKSphNonU, GenKSphNonUGL, Aug2D, Aug2Dext, genRing,
PrintRing, Aug3D, WriteGrid, WriteChimp, VizGrid, getLFM, LoadTabG, regrid
PrintRing, Aug3D, WriteGrid, WriteChimp, VizGrid, LoadTabG, regrid
)
def test_genEllip():