geopack-vectorize 2.0.2__tar.gz → 2.0.3__tar.gz

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.3] - 2026-11-07
+
+### Fixed
+- Return NaN fields for NaN coordinates in vectorized T01/T96 instead of
+  leaving zero outputs when no magnetopause region matches. Valid points
+  in the same batch retain their scalar-reference values.
+- Normalize Cartesian-to-spherical longitude in vectorized `sphcar` to
+  match the scalar convention of [0, 2*pi), retaining phi=0 at the poles.
+
 ## [2.0.2] - 2026-11-04
 
 ### Fixed

{geopack_vectorize-2.0.2/geopack_vectorize.egg-info → geopack_vectorize-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geopack-vectorize
-Version: 2.0.2
+Version: 2.0.3
 Summary: Python implementation of geopack and Tsyganenko models with optimized vectorization
 Home-page: https://github.com/Butadiene/geopack-vectorize
 Author: geopack-vectorize contributors

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/geopack/__init__.py

@@ -6,7 +6,7 @@ This module re-exports all public functions defined in geopack/geopack.py,
 so that they can be imported directly from `geopack`.
 """
 
-__version__ = '2.0.2'
+__version__ = '2.0.3'
 
 from .geopack import (
     update_igrf,

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/geopack/vectorized/coordinates_complex.py

@@ -23,6 +23,7 @@ def sphcar(r, theta, phi, j):
     -------
     tuple of (float or ndarray)
         Transformed coordinates (x,y,z if j>0, r,theta,phi if j<0)
+        For j<0, phi is in [0, 2*pi), with phi=0 at the poles.
     """
     # Check if input is scalar
     scalar_input = all(np.isscalar(c) for c in (r, theta, phi))
@@ -50,6 +51,7 @@ def sphcar(r, theta, phi, j):
         
         # Handle conditional logic for phi
         phi_out = np.where(sq != 0, np.arctan2(y, x), 0.0)
+        phi_out = np.where(phi_out < 0, phi_out + 2 * np.pi, phi_out)
         
         # Handle conditional logic for theta
         theta_out = np.where(sq != 0, 

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/geopack/vectorized/models/t01.py

@@ -249,7 +249,8 @@ def extall(iopgen,iopt,iopb,iopr,a,ntot,pdyn,dst,byimf,bzimf,vbimf1,vbimf2,ps,x,
     mask_interp = (sigma >= (s0 - dsig)) & (sigma < (s0 + dsig))
     mask_out = sigma >= (s0 + dsig)
 
-    bx, by, bz = np.zeros_like(x), np.zeros_like(y), np.zeros_like(z)
+    # NaN sigma matches no region, so invalid coordinates must stay undefined.
+    bx, by, bz = np.full_like(x, np.nan), np.full_like(y, np.nan), np.full_like(z, np.nan)
 
     # Case 1: Inside the magnetosphere
     bx = np.where(mask_in, bbx, bx)

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/geopack/vectorized/models/t96.py

@@ -125,10 +125,10 @@ def t96(parmod, ps, x, y, z):
     sqrt_arg = np.maximum(sqrt_arg, 0)  # Ensure non-negative
     sigma = np.sqrt((aro + axx0 + np.sqrt(sqrt_arg)) / (2.0 * asq))
     
-    # Initialize output arrays
-    bx = np.zeros_like(x)
-    by = np.zeros_like(y)
-    bz = np.zeros_like(z)
+    # NaN sigma matches no region, so invalid coordinates must stay undefined.
+    bx = np.full_like(x, np.nan)
+    by = np.full_like(y, np.nan)
+    bz = np.full_like(z, np.nan)
     
     # Define masks for three regions
     mask_inside = sigma < (s0 - dsig)

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3/geopack_vectorize.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geopack-vectorize
-Version: 2.0.2
+Version: 2.0.3
 Summary: Python implementation of geopack and Tsyganenko models with optimized vectorization
 Home-page: https://github.com/Butadiene/geopack-vectorize
 Author: geopack-vectorize contributors

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geopack-vectorize"
-version = "2.0.2"
+version = "2.0.3"
 description = "Python implementation of geopack and Tsyganenko models with optimized vectorization"
 authors = [
     {name = "Sheng Tian", email = "ts0110@atmos.ucla.edu"}

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/setup.py

@@ -6,7 +6,7 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setuptools.setup(
     name='geopack-vectorize',
-    version='2.0.2',
+    version='2.0.3',
     author='geopack-vectorize contributors',
     author_email='',
     description='Vectorized Python implementation of geopack and Tsyganenko models (fork of tsssss/geopack)',

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/tests/test_coordinate_broadcasting.py

@@ -65,6 +65,22 @@ class TestCoordinateBroadcasting(unittest.TestCase):
             result = getattr(coordinates_complex, name)(*base)
             self.assertTrue(all(isinstance(c, float) for c in result))
 
+    def test_cartesian_to_spherical_longitude_matches_scalar_in_all_quadrants(self):
+        # Include the negative x axis, signed zero, both poles, and the origin.
+        points = np.array([[1., 1., 0.], [-1., 1., 0.], [-1., -1., 0.], [1., -1., 0.],
+                           [-1., 0., 0.], [-1., -0., 0.], [1., -0., 0.],
+                           [0., 0., 1.], [0., 0., -1.], [0., 0., 0.]])
+        for point in points:
+            with self.subTest(point=point):
+                actual = coordinates_complex.sphcar(*point, -1)
+                self.assertTrue(all(isinstance(c, float) for c in actual))
+                np.testing.assert_allclose(actual, scalar.sphcar(*point, -1), atol=1e-14)
+                self.assertGreaterEqual(actual[2], 0.)
+                self.assertLess(actual[2], 2 * np.pi)
+        self.assert_pointwise(coordinates_complex.sphcar, scalar.sphcar, points.T, (-1,))
+        self.assert_pointwise(coordinates_complex.sphcar, scalar.sphcar,
+                              (np.array([-1., 1.])[:, None], np.array([-1., 1.]), 0.), (-1,))
+
     def test_igrf_cartesian_wrappers_broadcast(self):
         for name in ('igrf_gsm', 'igrf_gsw'):
             for coords in ((5., np.array([1., 2.]), 1.),

{geopack_vectorize-2.0.2 → geopack_vectorize-2.0.3}/tests/test_model_input_regressions.py

@@ -12,6 +12,35 @@ PARMOD = [2., -20., 2., -5., 1., 1., 1., 1., 1., 1.]
 
 
 class TestModelInputRegressions(unittest.TestCase):
+    def test_nan_coordinates_return_nan_for_scalar_inputs(self):
+        for name in ('t01', 't96'):
+            for axis in range(3):
+                point = [-6., 1., 2.]
+                point[axis] = np.nan
+                with self.subTest(model=name, nan_axis=axis), np.errstate(invalid='ignore'):
+                    expected = getattr(models, name)(PARMOD, .2, *point)
+                    actual = getattr(vectorized, name)(PARMOD, .2, *point)
+                    self.assertTrue(np.all(np.isnan(expected)))
+                    self.assertTrue(np.all(np.isnan(actual)))
+                    self.assertTrue(all(isinstance(c, float) for c in actual))
+
+    def test_nan_coordinates_preserve_valid_points_in_multidimensional_batches(self):
+        valid_points = np.array([[-6., 1., 2.], [10.0655881232758, 2., 1.], [15., 3., 1.]])
+        for name in ('t01', 't96'):
+            expected = np.full((3, len(valid_points), 2), np.nan)
+            expected[:, :, 0] = np.array([
+                getattr(models, name)(PARMOD, .2, *point) for point in valid_points
+            ]).T
+            self.assertTrue(np.all(np.isfinite(expected[:, :, 0])))
+            for axis in range(3):
+                points = np.repeat(valid_points[:, None, :], 2, axis=1)
+                points[:, 1, axis] = np.nan
+                with self.subTest(model=name, nan_axis=axis), np.errstate(invalid='ignore'):
+                    actual = getattr(vectorized, name)(PARMOD, .2, *np.moveaxis(points, -1, 0))
+                    self.assertEqual(np.shape(actual), expected.shape)
+                    np.testing.assert_allclose(actual, expected, rtol=1e-10, atol=1e-6,
+                                               equal_nan=True)
+
     def test_t01_imf_interconnection_preserves_clock_angle(self):
         # With G1/G2 held fixed, the IMF dependence is exactly the prescribed
         # T01 interconnection field, including outside the magnetopause.