Spectral updates

docs/api/utilities/derivatives.md

@@ -4,4 +4,4 @@
 
 ---
 
-::: exponax.make_incompressible
+::: exponax.spectral.make_incompressible

docs/api/utilities/spectral.md

@@ -4,4 +4,12 @@
 
 ---
 
-::: exponax.ifft
+::: exponax.ifft
+
+---
+
+::: exponax.get_spectrum
+
+---
+
+::: exponax.spectral.build_scaling_array

exponax/__init__.py

@@ -6,7 +6,7 @@
 from ._forced_stepper import ForcedStepper
 from ._interpolation import FourierInterpolator, map_between_resolutions
 from ._repeated_stepper import RepeatedStepper
-from ._spectral import derivative, fft, ifft, make_incompressible
+from ._spectral import derivative, fft, get_spectrum, ifft
 from ._utils import (
     build_ic_set,
     make_grid,
@@ -26,7 +26,7 @@
     "derivative",
     "fft",
     "ifft",
-    "make_incompressible",
+    "get_spectrum",
     "make_grid",
     "rollout",
     "repeat",

exponax/_interpolation.py

@@ -9,13 +9,12 @@
 from jaxtyping import Array, Complex, Float
 
 from ._spectral import (
-    build_reconstructional_scaling_array,
     build_scaled_wavenumbers,
     build_scaling_array,
     fft,
     get_modes_slices,
     ifft,
-    nyquist_filter_mask,
+    oddball_filter_mask,
     space_indices,
     wavenumber_shape,
 )
@@ -84,8 +83,11 @@ def __init__(
         self.num_points = state.shape[-1]
 
         self.state_hat_scaled = fft(state, num_spatial_dims=self.num_spatial_dims) / (
-            build_reconstructional_scaling_array(
-                self.num_spatial_dims, self.num_points, indexing=indexing
+            build_scaling_array(
+                self.num_spatial_dims,
+                self.num_points,
+                mode="reconstruction",
+                indexing=indexing,
             )
         )
         self.wavenumbers = build_scaled_wavenumbers(
@@ -242,12 +244,13 @@ def map_between_resolutions(
     ) / build_scaling_array(
         num_spatial_dims,
         old_num_points,
+        mode="norm_compensation",
     )
 
     if new_num_points > old_num_points:
         # Upscaling
         if old_num_points % 2 == 0 and oddball_zero:
-            old_state_hat_scaled *= nyquist_filter_mask(
+            old_state_hat_scaled *= oddball_filter_mask(
                 num_spatial_dims, old_num_points
             )
 
@@ -269,11 +272,12 @@ def map_between_resolutions(
     new_state_hat = new_state_hat_scaled * build_scaling_array(
         num_spatial_dims,
         new_num_points,
+        mode="norm_compensation",
     )
     if old_num_points > new_num_points:
         # Downscaling
         if new_num_points % 2 == 0 and oddball_zero:
-            new_state_hat *= nyquist_filter_mask(num_spatial_dims, new_num_points)
+            new_state_hat *= oddball_filter_mask(num_spatial_dims, new_num_points)
 
     new_state = ifft(
         new_state_hat,