radia 1.3.6__tar.gz → 1.3.8__tar.gz

{radia-1.3.6/src/radia.egg-info → radia-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radia
-Version: 1.3.6
+Version: 1.3.8
 Summary: Radia 3D Magnetostatics with NGSolve Integration and OpenMP Parallelization
 Home-page: https://github.com/ksugahar/Radia_NGSolve
 Author: Pascal Elleaume

{radia-1.3.6 → radia-1.3.8}/docs/SOLVER_METHODS.md

@@ -2,16 +2,15 @@
 
 This document describes the available solver methods in Radia.
 
-## Available Methods
+## Available Methods (v1.3.7+)
 
 | Method | Name | Complexity | Linear | Nonlinear | Best For |
 |--------|------|------------|--------|-----------|----------|
-| **Newton-Raphson** | `'newton'` or `8` | O(N^2 * k) | Yes | Yes | Nonlinear materials |
-| **LU Direct** | `'lu'` or `9` | O(N^3 * k) | Yes | Yes | Small problems (N < 500) |
-| **BiCGSTAB** (Default) | `'bicgstab'` or `10` | O(N^2 * k) | Yes | Yes | General purpose |
+| **LU Direct** | `'lu'` or `'direct'` or `0` | O(N^3 * k) | Yes | Yes | Small problems (N < 500) |
+| **BiCGSTAB** (Default) | `'bicgstab'` or `'iterative'` or `1` | O(N^2 * k) | Yes | Yes | General purpose |
 | **BiCGSTAB + H-matrix** | `'bicgstab'` + `SolverHMatrixEnable()` | O(N log N * k) | Yes | Yes | Large problems (N > 1000) |
 
-**Note:** All solvers now support both linear and nonlinear materials (v1.3.5+).
+**Note:** All solvers support both linear and nonlinear materials. The Newton-Raphson method (former Method 8) has been removed in v1.3.7 - Newton-style M(H) updates are now integrated into both LU and BiCGSTAB solvers.
 
 ## Usage
 
@@ -34,14 +33,14 @@ grp = rad.ObjCnt([cube, ext_field])
 res = rad.Solve(grp, 0.0001, 1000)
 
 # Or specify method by name
-res = rad.Solve(grp, 0.0001, 1000, 'bicgstab')  # BiCGSTAB
-res = rad.Solve(grp, 0.0001, 1000, 'lu')        # LU decomposition
-res = rad.Solve(grp, 0.0001, 1000, 'newton')    # Newton-Raphson (nonlinear)
-
-# Or by number (for backward compatibility)
-res = rad.Solve(grp, 0.0001, 1000, 10)  # BiCGSTAB
-res = rad.Solve(grp, 0.0001, 1, 9)      # LU (only 1 iteration needed)
-res = rad.Solve(grp, 0.0001, 1000, 8)   # Newton-Raphson
+res = rad.Solve(grp, 0.0001, 1000, 'bicgstab')    # BiCGSTAB (default)
+res = rad.Solve(grp, 0.0001, 1000, 'iterative')   # Same as 'bicgstab'
+res = rad.Solve(grp, 0.0001, 1000, 'lu')          # LU decomposition
+res = rad.Solve(grp, 0.0001, 1000, 'direct')      # Same as 'lu'
+
+# Or by number
+res = rad.Solve(grp, 0.0001, 1000, 0)  # LU Direct
+res = rad.Solve(grp, 0.0001, 1000, 1)  # BiCGSTAB
 ```
 
 ### Method Selection Guide
@@ -55,45 +54,35 @@ Problem size?
 Material type?
   |-- Linear (MatLin)      --> Any solver works
   |-- Nonlinear (MatSatIso, MatSatIsoTab, etc.) --> Any solver works
-                                                    'newton' is traditional choice
-                                                    'bicgstab' also works well
 ```
 
-**Note:** All solvers now have outer nonlinear iteration loops, so they all
-handle nonlinear materials correctly. The choice depends mainly on problem size.
+**Note:** Both solvers have outer nonlinear iteration loops with Newton-style M(H) updates, so they handle nonlinear materials correctly. The choice depends mainly on problem size.
 
-## Newton-Raphson (Method 8)
+## LU Direct Solver (Method 0)
 
-Newton-Raphson iterative solver for **nonlinear materials**. Uses local Jacobian for each element.
+Direct solver using LU decomposition with partial pivoting. O(N^3) complexity per nonlinear iteration.
 
 **Pros:**
-- Handles nonlinear (saturable) materials correctly
-- Uses instantaneous susceptibility at each iteration
-- Good convergence for typical B-H curves
+- Exact solution per nonlinear iteration
+- Always converges
+- Stable for all materials
+- Supports both linear and nonlinear materials
 
 **Cons:**
-- Slower than BiCGSTAB for linear materials
-- Requires well-defined B-H curve
+- O(N^3) time complexity - slow for large N
+- O(N^2) memory usage
 
-**Best for:** Nonlinear materials (MatSatIso, MatSatIsoTab, MatLam, etc.)
+**Best for:** Small problems (N < 500), validation/debugging
 
 ```python
-# Nonlinear material with B-H curve
-bh_curve = [
-    [0, 0],
-    [100, 0.5],
-    [500, 1.2],
-    [2000, 1.6],
-    [10000, 1.9]
-]
-mat = rad.MatSatIsoTab(bh_curve)
-rad.MatApl(cube, mat)
-
-# Solve with Newton-Raphson
-res = rad.Solve(grp, 0.0001, 1000, 'newton')
+res = rad.Solve(grp, 0.0001, 100, 'lu')     # By name
+res = rad.Solve(grp, 0.0001, 100, 'direct') # Alias
+res = rad.Solve(grp, 0.0001, 100, 0)        # By number
 ```
 
-## BiCGSTAB (Default)
+**Note:** For linear materials, LU converges in 1-2 outer iterations. For nonlinear materials, multiple outer iterations are needed for chi(H) to converge.
+
+## BiCGSTAB (Method 1, Default)
 
 BiCGSTAB (Biconjugate Gradient Stabilized) is an iterative solver with O(N^2 * k) complexity where k is the number of iterations.
 
@@ -109,34 +98,12 @@ BiCGSTAB (Biconjugate Gradient Stabilized) is an iterative solver with O(N^2 * k
 **Best for:** General magnetostatic problems, tetrahedral meshes
 
 ```python
-res = rad.Solve(grp, 0.0001, 1000)        # Uses default BiCGSTAB
-res = rad.Solve(grp, 0.0001, 1000, 'bicgstab')  # Explicit
-```
-
-## LU Direct Solver
-
-Direct solver using LU decomposition with partial pivoting. O(N^3) complexity per nonlinear iteration.
-
-**Pros:**
-- Exact solution per nonlinear iteration
-- Always converges
-- Stable for all materials
-- Supports both linear and nonlinear materials
-
-**Cons:**
-- O(N^3) time complexity - slow for large N
-- O(N^2) memory usage
-
-**Best for:** Small problems (N < 500), validation/debugging
-
-```python
-res = rad.Solve(grp, 0.0001, 100, 'lu')   # For nonlinear materials
-res = rad.Solve(grp, 0.0001, 100, 9)      # Same as above
+res = rad.Solve(grp, 0.0001, 1000)              # Default (BiCGSTAB)
+res = rad.Solve(grp, 0.0001, 1000, 'bicgstab')  # By name
+res = rad.Solve(grp, 0.0001, 1000, 'iterative') # Alias
+res = rad.Solve(grp, 0.0001, 1000, 1)           # By number
 ```
 
-**Note:** For linear materials, LU converges in 1 outer iteration. For nonlinear
-materials, multiple outer iterations are needed for chi(H) to converge.
-
 ## H-Matrix Acceleration
 
 Enable H-matrix with HACApK ACA+ algorithm for BiCGSTAB:
@@ -176,27 +143,27 @@ Results from 40mm soft iron cube (mu_r=1000) in 1T uniform field:
 
 ## Accuracy
 
-Both LU and BiCGSTAB methods produce consistent results for linear materials:
+Both LU and BiCGSTAB methods produce identical results:
 
 | N_elem | LU Bz (T) | BiCGSTAB Bz (T) | Difference |
 |--------|-----------|-----------------|------------|
-| 27 | 0.1373162 | 0.1373157 | 0.0004% |
-| 512 | 0.1406983 | 0.1406980 | 0.0002% |
-| 1000 | 0.1411381 | 0.1411383 | 0.0001% |
+| 27 | 14.067658 | 14.067658 | 0.0000% |
+| 64 | 14.067658 | 14.067658 | 0.0000% |
+| 125 | 14.067658 | 14.067658 | 0.0000% |
 
 ## Notes
 
-1. **Default change (v1.3.5):** BiCGSTAB is now the default solver
-2. **Nonlinear support (v1.3.5):** All solvers now use Newton-style M(H) updates and produce identical results
-3. **Tetrahedral meshes:** All methods work correctly with tetrahedral elements
-4. **Material types:**
+1. **Simplified method numbering (v1.3.7):** Methods are now 0 (LU) and 1 (BiCGSTAB)
+2. **Newton-Raphson removed (v1.3.7):** Newton-style M(H) updates are integrated into both solvers
+3. **Default solver:** BiCGSTAB is the default
+4. **Tetrahedral meshes:** All methods work correctly with tetrahedral elements
+5. **Material types:**
    - Linear materials (MatLin): Any solver works; 'bicgstab' is fastest for large problems
    - Nonlinear materials (MatSatIso, MatSatIsoTab, MatLam): Any solver works; all produce identical results
-5. **Method numbers:** For backward compatibility, methods can also be specified by number (8=Newton, 9=LU, 10=BiCGSTAB)
 
 ## Technical Details: Nonlinear Material Handling
 
-**All solvers (v1.3.5+)** now use Newton-style M(H) updates for nonlinear materials:
+Both solvers use Newton-style M(H) updates for nonlinear materials:
 
 1. **Outer iteration loop**: After each linear system solve, apply Newton-style correction
 2. **Gauss-Seidel update**: For each element i:
@@ -208,14 +175,25 @@ Both LU and BiCGSTAB methods produce consistent results for linear materials:
 This hybrid approach combines the efficiency of LU/BiCGSTAB with the accuracy of Newton-Raphson:
 - LU/BiCGSTAB provide a good initial guess for M
 - Newton-style M(H) update ensures correct nonlinear behavior
-- All three solvers now produce identical results for both linear and nonlinear materials
+- Both solvers produce identical results for both linear and nonlinear materials
+
+**Solver Comparison** (v1.3.7+):
+
+| Method | Number | Inner Method | Nonlinear Update | Best For |
+|--------|--------|--------------|------------------|----------|
+| LU | 0 | LU decomposition | M = M(H) | Small problems, validation |
+| BiCGSTAB | 1 | BiCGSTAB iteration | M = M(H) | General purpose, large problems |
+
+Both solvers produce identical results for both linear and nonlinear materials.
+
+## Migration from v1.3.6
 
-**Solver Comparison** (v1.3.5+):
+If you were using method numbers 8, 9, or 10:
 
-| Solver | Inner Method | Nonlinear Update | Best For |
-|--------|--------------|------------------|----------|
-| Newton (8) | Gauss-Seidel | M = M(H) | General purpose |
-| LU (9) | LU decomposition | M = M(H) | Small problems, validation |
-| BiCGSTAB (10) | BiCGSTAB iteration | M = M(H) | Large problems |
+| Old (v1.3.6) | New (v1.3.7+) | Notes |
+|--------------|---------------|-------|
+| `8` (Newton) | Removed | Use `0` (LU) or `1` (BiCGSTAB) - both have Newton-style M(H) updates |
+| `9` (LU) | `0` or `'lu'` | Same functionality |
+| `10` (BiCGSTAB) | `1` or `'bicgstab'` | Same functionality, now default |
 
-All solvers produce identical results for both linear and nonlinear materials.
+**Recommended:** Use string names (`'lu'`, `'bicgstab'`, `'direct'`, `'iterative'`) for clarity.

{radia-1.3.6 → radia-1.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "radia"
-version = "1.3.6"
+version = "1.3.8"
 description = "Radia 3D Magnetostatics with NGSolve Integration and OpenMP Parallelization"
 readme = "README.md"
 requires-python = ">=3.12"

{radia-1.3.6 → radia-1.3.8}/setup.py

@@ -16,7 +16,7 @@ import shutil
 import sys
 
 # Read version from pyproject.toml
-version = "1.3.6"
+version = "1.3.8"
 
 # Read the README file
 readme_file = Path(__file__).parent / "README.md"
@@ -25,8 +25,11 @@ long_description = readme_file.read_text(encoding="utf-8") if readme_file.exists
 def prepare_package_data():
 	"""
 	Prepare package data by copying built extension modules to the package directory
+
+	Note: Package directory is now src/radia (not src/python) so that
+	'import radia' works correctly after pip install.
 	"""
-	package_dir = Path(__file__).parent / "src" / "python"
+	package_dir = Path(__file__).parent / "src" / "radia"
 	package_dir.mkdir(parents=True, exist_ok=True)
 
 	# Copy radia.pyd from build/Release/ if it exists
@@ -86,7 +89,7 @@ setup(
 	packages=find_packages(where="src"),
 	package_dir={"": "src"},
 	package_data={
-		"python": [
+		"radia": [
 			"*.pyd",  # Include all .pyd files (radia.pyd, radia_ngsolve.pyd)
 			"*.py",   # Include all Python utility modules
 		],

radia-1.3.8/src/radia/__init__.py

@@ -0,0 +1,18 @@
+# Radia Python package
+# This module re-exports all symbols from the C++ extension module (radia.pyd)
+# so that 'import radia' works correctly when installed via pip
+
+__version__ = "1.3.8"
+
+# Import all symbols from the C++ extension module
+try:
+    from radia.radia import *
+except ImportError:
+    # Fallback for development: try importing from the same directory
+    try:
+        from .radia import *
+    except ImportError as e:
+        raise ImportError(
+            "Failed to import radia C++ extension module (radia.pyd). "
+            "Ensure the package was built correctly with Build.ps1 before installation."
+        ) from e

{radia-1.3.6 → radia-1.3.8/src/radia.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radia
-Version: 1.3.6
+Version: 1.3.8
 Summary: Radia 3D Magnetostatics with NGSolve Integration and OpenMP Parallelization
 Home-page: https://github.com/ksugahar/Radia_NGSolve
 Author: Pascal Elleaume

{radia-1.3.6 → radia-1.3.8}/src/radia.egg-info/SOURCES.txt

@@ -110,18 +110,18 @@ examples/solver_benchmarks/benchmark_solver_scaling_extended.py
 examples/solver_benchmarks/plot_benchmark_results.py
 examples/solver_benchmarks/run_all_benchmarks.py
 examples/solver_benchmarks/verify_field_accuracy.py
-src/python/__init__.py
-src/python/nastran_mesh_import.py
-src/python/netgen_mesh_import.py
-src/python/rad_ngsolve_fast.py
-src/python/radia.pyd
-src/python/radia_coil_builder.py
-src/python/radia_field_cached.py
-src/python/radia_ngsolve.pyd
-src/python/radia_ngsolve_field.py
-src/python/radia_ngsolve_utils.py
-src/python/radia_pyvista_viewer.py
-src/python/radia_vtk_export.py
+src/radia/__init__.py
+src/radia/nastran_mesh_import.py
+src/radia/netgen_mesh_import.py
+src/radia/rad_ngsolve_fast.py
+src/radia/radia.pyd
+src/radia/radia_coil_builder.py
+src/radia/radia_field_cached.py
+src/radia/radia_ngsolve.pyd
+src/radia/radia_ngsolve_field.py
+src/radia/radia_ngsolve_utils.py
+src/radia/radia_pyvista_viewer.py
+src/radia/radia_vtk_export.py
 src/radia.egg-info/PKG-INFO
 src/radia.egg-info/SOURCES.txt
 src/radia.egg-info/dependency_links.txt

radia-1.3.8/src/radia.egg-info/top_level.txt

@@ -0,0 +1 @@
+radia

radia-1.3.6/src/python/__init__.py

@@ -1,2 +0,0 @@
-# Radia Python package
-__version__ = "1.1.0"

radia-1.3.6/src/radia.egg-info/top_level.txt

@@ -1 +0,0 @@
-python