simcoon 2.0.0b1__tar.gz → 2.0.1__tar.gz

{simcoon-2.0.0b1 → simcoon-2.0.1}/.github/workflows/build.yml

@@ -65,8 +65,11 @@ jobs:
           # scikit-build-core honors CMAKE_ARGS; the compiler-launcher property
           # only works with the Ninja generator (ignored by Visual Studio), so
           # the MSVC dev env + ninja (installed below) are required for sccache.
+          $sc = $env:SCCACHE_PATH -replace '\\','/'
           "SCCACHE_GHA_ENABLED=true" | Out-File $env:GITHUB_ENV -Append
-          "CMAKE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" | Out-File $env:GITHUB_ENV -Append
+          "SCCACHE_IDLE_TIMEOUT=0" | Out-File $env:GITHUB_ENV -Append
+          "CMAKE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=$sc -DCMAKE_CXX_COMPILER_LAUNCHER=$sc" | Out-File $env:GITHUB_ENV -Append
+          "CMAKE_GENERATOR=Ninja" | Out-File $env:GITHUB_ENV -Append
 
       - name: Editable install
         run: |

{simcoon-2.0.0b1 → simcoon-2.0.1}/.github/workflows/ci.yml

@@ -62,8 +62,17 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           pip install ninja
+          # Absolute launcher path (forward slashes for CMake): the sccache
+          # action exports SCCACHE_PATH but does NOT put sccache on PATH, and
+          # msvc-dev-cmd rewrites PATH anyway. Idle timeout 0 keeps the server
+          # (and its stats) alive across the whole job.
+          $sc = $env:SCCACHE_PATH -replace '\\','/'
           "SCCACHE_GHA_ENABLED=true" | Out-File $env:GITHUB_ENV -Append
-          "CMAKE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" | Out-File $env:GITHUB_ENV -Append
+          "SCCACHE_IDLE_TIMEOUT=0" | Out-File $env:GITHUB_ENV -Append
+          "CMAKE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=$sc -DCMAKE_CXX_COMPILER_LAUNCHER=$sc" | Out-File $env:GITHUB_ENV -Append
+          # scikit-build-core only picks Ninja over Visual Studio when ninja is
+          # importable/visible to the python actually running the build
+          "CMAKE_GENERATOR=Ninja" | Out-File $env:GITHUB_ENV -Append
 
       - name: Prepare conda environment (Unix)
         if: runner.os != 'Windows'
@@ -88,11 +97,12 @@ jobs:
         run: |
           cmake -S . -B build -G Ninja `
               -DCMAKE_BUILD_TYPE=Release `
-              -DCMAKE_C_COMPILER_LAUNCHER=sccache `
-              -DCMAKE_CXX_COMPILER_LAUNCHER=sccache `
+              -DCMAKE_C_COMPILER_LAUNCHER="$env:SCCACHE_PATH" `
+              -DCMAKE_CXX_COMPILER_LAUNCHER="$env:SCCACHE_PATH" `
               -DCMAKE_INSTALL_PREFIX="$env:CONDA_PREFIX/Library" `
               -Wno-dev
           cmake --build build
+          & $env:SCCACHE_PATH --show-stats
 
       - name: Tests (Unix)
         if: runner.os != 'Windows'
@@ -121,6 +131,7 @@ jobs:
         run: |
           pip install scikit-build-core pybind11 numpy
           pip install . --no-build-isolation
+          & $env:SCCACHE_PATH --show-stats
 
       - name: Smoke test simcoon Python (Windows)
         if: runner.os == 'Windows'

{simcoon-2.0.0b1 → simcoon-2.0.1}/CMakeLists.txt

@@ -156,7 +156,47 @@ if(WIN32 AND MSVC AND BLAS_FOUND AND LAPACK_FOUND)
   endif()
 endif()
 
+# Armadillo. Inside a conda environment, use the environment's own Armadillo (hence its
+# BLAS/LAPACK and its single OpenMP runtime, conda-forge's llvm-openmp). Linking a
+# system/Homebrew Armadillo into a conda Python process loads a second OpenMP runtime
+# next to the one numpy/openblas/pytorch already carry: "OMP: Error #15" at import or
+# random crashes in threaded kernels (KMP_DUPLICATE_LIB_OK only hides the guard).
+# Install it with `conda install -c conda-forge armadillo`; -DArmadillo_ROOT=... still wins.
+# Conda prefix: conda-build exposes the host prefix as PREFIX, an activated environment as
+# CONDA_PREFIX (same precedence as the carma lookup below). `conda-meta/` is what makes a
+# directory a conda prefix — PREFIX alone is a common Makefile variable (/usr/local ...).
+set(SIMCOON_CONDA_PREFIX "")
+if(DEFINED ENV{PREFIX} AND EXISTS "$ENV{PREFIX}/conda-meta")
+  set(SIMCOON_CONDA_PREFIX "$ENV{PREFIX}")
+elseif(DEFINED ENV{CONDA_PREFIX} AND EXISTS "$ENV{CONDA_PREFIX}/conda-meta")
+  set(SIMCOON_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
+endif()
+set(_simcoon_armadillo_auto OFF)
+if(SIMCOON_CONDA_PREFIX AND NOT DEFINED Armadillo_ROOT AND NOT DEFINED ENV{Armadillo_ROOT})
+  if(EXISTS "${SIMCOON_CONDA_PREFIX}/include/armadillo")
+    set(Armadillo_ROOT "${SIMCOON_CONDA_PREFIX}")
+    set(_simcoon_armadillo_auto ON)
+    message(STATUS "Conda environment detected: Armadillo_ROOT = ${Armadillo_ROOT}")
+  else()
+    message(WARNING "Conda environment detected (${SIMCOON_CONDA_PREFIX}) but it has no Armadillo: "
+                    "run `conda install -c conda-forge armadillo` so that simcoon shares the "
+                    "environment's BLAS and OpenMP runtime (a non-conda Armadillo brings a second "
+                    "OpenMP runtime into the Python process).")
+  endif()
+endif()
 find_package(Armadillo 12.6 REQUIRED)
+message(STATUS "Armadillo library: ${ARMADILLO_LIBRARIES}")
+message(STATUS "Armadillo include: ${ARMADILLO_INCLUDE_DIRS}")
+# literal search, not MATCHES: a prefix may contain regex metacharacters (py3.11, env(new))
+string(FIND "${ARMADILLO_LIBRARIES};${ARMADILLO_INCLUDE_DIRS}" "${SIMCOON_CONDA_PREFIX}" _simcoon_arma_in_prefix)
+if(_simcoon_armadillo_auto AND _simcoon_arma_in_prefix EQUAL -1)
+  # a cached ARMADILLO_INCLUDE_DIR/ARMADILLO_LIBRARY from an earlier configure wins over the hint
+  message(WARNING "Armadillo is NOT the one of the active conda environment (${SIMCOON_CONDA_PREFIX}): "
+                  "${ARMADILLO_LIBRARIES}. Its BLAS will load a second OpenMP runtime next to the "
+                  "environment's llvm-openmp (OMP Error #15 / crashes). Delete the stale build "
+                  "cache (build/ or build/cp*) and configure again, or pass -DArmadillo_ROOT "
+                  "explicitly if this is intended.")
+endif()
 
 # GTest is only needed when building tests
 if(SIMCOON_BUILD_TESTS)
@@ -181,6 +221,19 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 FetchContent_MakeAvailable(dylib)
 set_target_properties(dylib PROPERTIES UNITY_BUILD OFF)
 
+# dylib v3.0.1 relies on transitive includes that the libc++ shipped with the macOS 26.6
+# SDK no longer pulls in: free() in demangle.cpp, errno in dylib.cpp, ntohl() in symbols.cpp.
+# The runner image moved from Xcode 26.5 to 26.6 and the conda macOS build broke on it.
+# Upstream fixed only the first one (martin-olivier/dylib 0a8573a9, unreleased), so force
+# the headers here rather than moving the pin off a tagged release.
+if(APPLE)
+  # SHELL: is required: CMake de-duplicates repeated identical options, which would
+  # collapse the three flags into "-include cstdlib cerrno arpa/inet.h" and make clang
+  # treat the last two as input files ("no such file or directory: 'cerrno'").
+  target_compile_options(dylib PRIVATE
+    "SHELL:-include cstdlib" "SHELL:-include cerrno" "SHELL:-include arpa/inet.h")
+endif()
+
 # Fastor is header-only — just populate, no build step needed
 FetchContent_Populate(Fastor)
 message(STATUS "Fastor include dir: ${fastor_SOURCE_DIR}")

{simcoon-2.0.0b1 → simcoon-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simcoon
-Version: 2.0.0b1
+Version: 2.0.1
 Summary: Simulation in Mechanics and Materials: Interactive Tools - A library for the simulation of multiphysics systems and heterogeneous materials
 Keywords: simulation,mechanics,materials,composites,homogenization,constitutive-models,finite-element,micromechanics
 Author-Email: Yves Chemisky <yves.chemisky@gmail.com>
@@ -32,6 +32,9 @@ Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Provides-Extra: identify
 Requires-Dist: scikit-learn>=1.0; extra == "identify"
+Provides-Extra: ml
+Requires-Dist: torch>=2.0; extra == "ml"
+Requires-Dist: scikit-learn>=1.0; extra == "ml"
 Description-Content-Type: text/markdown
 
 Simcoon

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/cpp_api/continuum_mechanics_overview.md

@@ -88,7 +88,6 @@ User Material subroutines (UMAT) for finite element analysis, organized by strai
 
 #### **Finite Strain Models**
 
-- `neo_hookean_comp` - Compressible Neo-Hookean hyperelasticity
 - `neo_hookean_incomp` - Incompressible Neo-Hookean hyperelasticity
 - `mooney_rivlin` - Mooney-Rivlin hyperelasticity
 - `saint_venant` - Saint-Venant Kirchhoff model

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/cpp_api/umat/finite.rst

@@ -2,8 +2,8 @@
 Finite Strain Models
 ======================
 
-Hyperelastic and finite strain constitutive models (Neo-Hookean, 
-Mooney-Rivlin, Saint-Venant, etc.).
+Hyperelastic and finite strain constitutive models (Neo-Hookean,
+Mooney-Rivlin, Ogden, Saint-Venant, etc.).
 
 .. doxygengroup:: umat_finite
    :project: simcoon

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/external.rst

@@ -417,5 +417,5 @@ To run the external UMAT tests:
     cd ../../../testBin/Umats/UMABA
     ./TUMABA
 
-Both tests apply a uniaxial tensile loading to 2% strain on a thermoelastic material (E=70000 MPa, ν=0.3) 
+Both tests apply a uniaxial tensile loading to 2% strain on a thermoelastic material (:math:`E = 70000` MPa, :math:`\nu = 0.3`)
 and verify that the computed stress-strain response matches the reference solution.

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/index.rst

@@ -15,7 +15,7 @@ Simcoon is a free, open-source C++ library for simulating multiphysics systems.
 
 Simcoon aims to be a high-quality scientific library for analysing complex, nonlinear system behaviour. It emphasizes performance and ease of use and exposes a Python interface to simplify workflows. The principal focus is to provide a C++ API to generate user-material subroutines for finite-element packages. Simcoon also includes tools to analyse material-point behaviour under loading, such as a thermomechanical solver and a tool to predict effective properties of composites. Parameter identification can be performed using Python with scipy.optimize (e.g. differential_evolution) and the simcoon Parameter/Constant key system.
 
-Simcoon supports geometric nonlinearity using Lagrangian and Eulerian measures, and cumulative strains with several objective rates (Jaumann, Green--Naghdi, and Xi--Meyers--Brühns logarithmic). The logarithmic cumulative-strain measure is the default used by the library's constitutive laws.
+Simcoon supports geometric nonlinearity using Lagrangian and Eulerian measures, and cumulative strains with several objective rates (Jaumann, Green--Naghdi, Xi--Meyers--Brühns logarithmic, and the polar-rotation logarithmic log_R). The logarithmic cumulative-strain measure transported by the exact polar rotation (log_R) is the default used by the library's constitutive laws.
 
 Simcoon makes use of the Fastor library (https://github.com/romeric/Fastor) for high-performance tensor computations; Fastor is distributed under the MIT License and is fetched as a header-only dependency at build time.
 

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/installation.rst

@@ -46,7 +46,7 @@ while BLAS handles internal threading.
    * - macOS
      - Apple Accelerate
      - ON (libomp, bundled in wheel)
-     - None
+     - Duplicate libomp when mixed with conda packages (see below)
    * - Linux
      - System OpenBLAS
      - ON (libgomp)
@@ -56,6 +56,40 @@ while BLAS handles internal threading.
      - OFF
      - None
 
+Duplicate OpenMP runtimes on macOS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Only **one** OpenMP runtime may be active per process. Two common setups load
+a second one next to simcoon's:
+
+- the **PyPI wheel** bundles its own ``libomp`` (via delocate); if numpy/scipy
+  come from **conda**, they load the conda environment's ``libomp`` as well;
+- a **source build** that picks the Homebrew Armadillo pulls Homebrew's
+  ``libomp`` through its OpenBLAS, while conda numpy loads the environment's.
+
+Symptoms range from the explicit Intel abort message ("multiple copies of the
+OpenMP runtime have been linked") to silent crashes (``SIGSEGV`` inside
+``libomp`` worker threads under threaded runs). Remedies, in order of
+preference:
+
+1. **Stay on one channel**: install simcoon *and* numpy/scipy from
+   conda-forge (everything links the same ``llvm-openmp``), or everything
+   from PyPI wheels.
+2. **Source builds in a conda environment**: point CMake at the environment's
+   Armadillo so simcoon shares the environment's OpenMP runtime:
+
+   .. code-block:: bash
+
+       conda install -c conda-forge armadillo
+       CMAKE_ARGS="-DArmadillo_ROOT=$CONDA_PREFIX" pip install -e . --no-build-isolation
+
+   (a plain build on a machine with Homebrew Armadillo links Homebrew's
+   ``libomp`` instead — remove the stale ``build/`` cache when switching).
+3. **Last resort**: ``export KMP_DUPLICATE_LIB_OK=TRUE`` silences the guard
+   but does **not** make the process safe — crashes or silently wrong results
+   remain possible (this is Intel's own warning). If you must use it, also
+   set ``OMP_NUM_THREADS=1`` to keep the second runtime quiescent.
+
 **Using MKL with conda on Linux**
 
 If you prefer Intel MKL for performance, switch the BLAS backend and set the
@@ -113,6 +147,12 @@ Prerequisites (system packages)
 
       brew install armadillo ninja cmake
 
+  .. note::
+     If you develop inside a conda environment, prefer the conda-forge
+     Armadillo with ``CMAKE_ARGS="-DArmadillo_ROOT=$CONDA_PREFIX"`` — the
+     Homebrew one drags in a second OpenMP runtime next to the environment's
+     (see *Duplicate OpenMP runtimes on macOS* above).
+
 - **Windows (vcpkg):**
 
   .. code-block:: powershell
@@ -173,5 +213,7 @@ for finite-element simulations. Both packages can be installed together:
     # pip
     pip install simcoon fedoo
 
-No special configuration is needed -- the BLAS/OpenMP setup described above
-ensures that both libraries coexist without runtime conflicts.
+Keep both packages (and numpy/scipy) on the **same channel** — all-conda or
+all-PyPI — and the BLAS/OpenMP setup described above ensures they coexist
+without runtime conflicts (on macOS, mixing channels can load a second
+OpenMP runtime; see *Duplicate OpenMP runtimes on macOS*).

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/simulation/abaqus.rst

@@ -133,10 +133,10 @@ For coupled thermo-mechanical analysis with heat generation:
 
 The thermo-mechanical version provides:
 
-- Mechanical tangent ``ddsdde`` (∂σ/∂ε)
-- Thermal stress tangent ``ddsddt`` (∂σ/∂T)
-- Heat flux derivative ``drplde`` (∂r/∂ε)
-- Heat capacity ``drpldt`` (∂r/∂T)
+- Mechanical tangent ``ddsdde`` (:math:`\partial \boldsymbol{\sigma} / \partial \boldsymbol{\varepsilon}`)
+- Thermal stress tangent ``ddsddt`` (:math:`\partial \boldsymbol{\sigma} / \partial T`)
+- Heat flux derivative ``drplde`` (:math:`\partial r / \partial \boldsymbol{\varepsilon}`)
+- Heat capacity ``drpldt`` (:math:`\partial r / \partial T`)
 - Heat generation rate ``rpl``
 
 Using umat_singleM_multi (Multiscale)
@@ -285,57 +285,57 @@ The following constitutive models are available through ``select_umat_M()``:
      - State Variables
    * - ELISO
      - Isotropic elasticity
-     - E, ν, α
+     - :math:`E, \nu, \alpha`
      - 1
    * - ELIST
      - Transversely isotropic elasticity
-     - axis, EL, ET, νTL, νTT, GLT, αL, αT
+     - axis, :math:`E_L, E_T, \nu_{TL}, \nu_{TT}, G_{LT}, \alpha_L, \alpha_T`
      - 1
    * - ELORT
      - Orthotropic elasticity
-     - E₁, E₂, E₃, ν₁₂, ν₁₃, ν₂₃, G₁₂, G₁₃, G₂₃, α₁, α₂, α₃
+     - :math:`E_1, E_2, E_3, \nu_{12}, \nu_{13}, \nu_{23}, G_{12}, G_{13}, G_{23}, \alpha_1, \alpha_2, \alpha_3`
      - 1
    * - EPICP
      - Von Mises plasticity, power-law isotropic hardening
-     - E, ν, α, σ_Y, k, m
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m`
      - 8 (T_init, p, EP)
    * - EPKCP
      - Von Mises, power-law isotropic + Prager kinematic
-     - E, ν, α, σ_Y, k, m, kX
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m, k_X`
      - 14 (T_init, p, EP, a)
    * - EPCHA
      - Von Mises + Voce + 2× Armstrong-Frederick
-     - E, ν, α, σ_Y, Q, b, C₁, D₁, C₂, D₂
+     - :math:`E, \nu, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2`
      - 33
    * - EPHIL / EPTRI
      - Hill yield + power-law isotropic hardening
-     - E, ν, α, σ_Y, k, m, F, G, H, L, M, N
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m, F, G, H, L, M, N`
      - 8 (T_init, p, EP)
    * - EPHAC
      - Cubic elasticity + Hill + Voce + 2× AF
-     - E, ν, G, α, σ_Y, Q, b, C₁, D₁, C₂, D₂, F, G, H, L, M, N
+     - :math:`E, \nu, G, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2, F, G, H, L, M, N`
      - 33
    * - EPANI
      - Cubic elasticity + anisotropic yield + Voce + 2× AF
-     - E, ν, G, α, σ_Y, Q, b, C₁, D₁, C₂, D₂, P₁₁..P₆₆ (9)
+     - :math:`E, \nu, G, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2, P_{11}..P_{66}` (9)
      - 33
    * - EPDFA
      - Cubic elasticity + DFA yield + Voce + 2× AF
-     - E, ν, G, α, σ_Y, Q, b, C₁, D₁, C₂, D₂, F, G, H, L, M, N, K
+     - :math:`E, \nu, G, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2, F, G, H, L, M, N, K`
      - 33
    * - EPCHG
      - Generic Chaboche (selectable yield, N iso/kin terms)
-     - E, ν, G, α, σ_Y, N_iso, N_kin, criteria, (Q,b)×N, (C,D)×N, crit. params
+     - :math:`E, \nu, G, \alpha, \sigma_Y, N_{iso}, N_{kin}`, criteria, :math:`(Q,b) \times N`, :math:`(C,D) \times N`, crit. params
      - 33
    * - EPHIN
      - N Hill yield surfaces
-     - E, ν, α, N, per surface: σ_Y, k, m, F, G, H, L, M, N
+     - :math:`E, \nu, \alpha, N`, per surface: :math:`\sigma_Y, k, m, F, G, H, L, M, N`
      - 1 + 7N
-   * - SMAUT
+   * - SMADI
      - SMA unified model
      - See SMA documentation
      - 24
-   * - SMANI
+   * - SMAAI
      - SMA anisotropic model
      - See SMA documentation
      - 24
@@ -345,15 +345,15 @@ The following constitutive models are available through ``select_umat_M()``:
      - 9
    * - ZENER
      - Kelvin viscoelastic (single branch)
-     - E₀, ν₀, α, E₁, ν₁, ηB₁, ηS₁
+     - :math:`E_0, \nu_0, \alpha, E_1, \nu_1, \eta_{B1}, \eta_{S1}`
      - 14
    * - ZENNK
      - Kelvin viscoelastic (N branches)
-     - E₀, ν₀, α, N, per branch: Eᵢ, νᵢ, ηBᵢ, ηSᵢ
+     - :math:`E_0, \nu_0, \alpha, N`, per branch: :math:`E_i, \nu_i, \eta_{Bi}, \eta_{Si}`
      - 7 + 7N
    * - PRONK
      - Prony series viscoelastic (generalized Maxwell)
-     - E₀, ν₀, α, N, per branch: Eᵢ, νᵢ, ηBᵢ, ηSᵢ
+     - :math:`E_0, \nu_0, \alpha, N`, per branch: :math:`E_i, \nu_i, \eta_{Bi}, \eta_{Si}`
      - 7 + 7N
    * - MODUL
      - Composable modular UMAT

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/simulation/ansys.rst

@@ -117,55 +117,79 @@ Model Codes
    * - 2
      - ELISO
      - Isotropic elasticity
-     - E, ν, α
+     - :math:`E, \nu, \alpha`
    * - 3
      - ELIST
      - Transversely isotropic elasticity
-     - axis, EL, ET, νTL, νTT, GLT, αL, αT
+     - axis, :math:`E_L, E_T, \nu_{TL}, \nu_{TT}, G_{LT}, \alpha_L, \alpha_T`
    * - 4
      - ELORT
      - Orthotropic elasticity
-     - E₁, E₂, E₃, ν₁₂, ν₁₃, ν₂₃, G₁₂, G₁₃, G₂₃, α₁, α₂, α₃
+     - :math:`E_1, E_2, E_3, \nu_{12}, \nu_{13}, \nu_{23}, G_{12}, G_{13}, G_{23}, \alpha_1, \alpha_2, \alpha_3`
    * - 5
      - EPICP
      - Von Mises plasticity, power-law isotropic hardening
-     - E, ν, α, σ_Y, k, m
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m`
    * - 6
      - EPKCP
      - Von Mises, power-law isotropic + Prager kinematic
-     - E, ν, α, σ_Y, k, m, kX
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m, k_X`
    * - 7
      - EPCHA
      - Von Mises + Voce + 2× Armstrong-Frederick
-     - E, ν, α, σ_Y, Q, b, C₁, D₁, C₂, D₂
+     - :math:`E, \nu, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2`
    * - 8
-     - SMAUT
+     - SMADI
      - SMA unified model
      - See SMA documentation
+   * - 9
+     - SMAAI
+     - SMA unified model, anisotropic criterion
+     - See SMA documentation
    * - 10
      - LLDM0
      - Lemaitre-Chaboche damage
-     - E, ν, α, σ_y, H, S, s, D_c
+     - :math:`E, \nu, \alpha, \sigma_y, H, S, s, D_c`
    * - 11
      - ZENER
      - Kelvin viscoelastic (single branch)
-     - E₀, ν₀, α, E₁, ν₁, ηB₁, ηS₁
+     - :math:`E_0, \nu_0, \alpha, E_1, \nu_1, \eta_{B1}, \eta_{S1}`
    * - 12
      - ZENNK
      - Kelvin viscoelastic (N branches)
-     - E₀, ν₀, α, N, per branch: Eᵢ, νᵢ, ηBᵢ, ηSᵢ
+     - :math:`E_0, \nu_0, \alpha, N`, per branch: :math:`E_i, \nu_i, \eta_{Bi}, \eta_{Si}`
    * - 13
      - PRONK
      - Prony series viscoelastic (generalized Maxwell)
-     - E₀, ν₀, α, N, per branch: Eᵢ, νᵢ, ηBᵢ, ηSᵢ
+     - :math:`E_0, \nu_0, \alpha, N`, per branch: :math:`E_i, \nu_i, \eta_{Bi}, \eta_{Si}`
+   * - 14
+     - EPTRI
+     - Tresca-family plasticity (Hill layout)
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m, F, G, H, L, M, N`
+   * - 15
+     - SMADC
+     - SMA unified model, cubic elasticity
+     - See SMA documentation
+   * - 16
+     - SMAAC
+     - SMA unified model, cubic + anisotropic criterion
+     - See SMA documentation
    * - 17
      - EPHIL
      - Hill yield + power-law isotropic hardening
-     - E, ν, α, σ_Y, k, m, F, G, H, L, M, N
+     - :math:`E, \nu, \alpha, \sigma_Y, k, m, F, G, H, L, M, N`
    * - 18
      - EPHAC
      - Cubic elasticity + Hill + Voce + 2× AF
-     - E, ν, G, α, σ_Y, Q, b, C₁, D₁, C₂, D₂, F, G, H, L, M, N
+     - :math:`E, \nu, G, \alpha, \sigma_Y, Q, b, C_1, D_1, C_2, D_2, F, G, H, L, M, N`
+   * - 25--28
+     - SMRDI / SMRDC / SMRAI / SMRAC
+     - SMA unified transformation + reorientation (iso/cubic × iso/aniso)
+     - See SMA documentation
+   * - 200
+     - MODUL
+     - Modular composition (props encode the mechanisms)
+     - See the modular UMAT documentation
 
 How It Works
 ------------
@@ -229,28 +253,28 @@ simcoon and Abaqus use the same Voigt notation, but Ansys differs in the shear c
      - Ansys
    * - 0
      - Normal 11
-     - σ₁₁, ε₁₁
-     - σ₁₁, ε₁₁
+     - :math:`\sigma_{11}, \varepsilon_{11}`
+     - :math:`\sigma_{11}, \varepsilon_{11}`
    * - 1
      - Normal 22
-     - σ₂₂, ε₂₂
-     - σ₂₂, ε₂₂
+     - :math:`\sigma_{22}, \varepsilon_{22}`
+     - :math:`\sigma_{22}, \varepsilon_{22}`
    * - 2
      - Normal 33
-     - σ₃₃, ε₃₃
-     - σ₃₃, ε₃₃
+     - :math:`\sigma_{33}, \varepsilon_{33}`
+     - :math:`\sigma_{33}, \varepsilon_{33}`
    * - 3
      - Shear 12
-     - σ₁₂, γ₁₂
-     - σ₁₂, γ₁₂
+     - :math:`\sigma_{12}, \gamma_{12}`
+     - :math:`\sigma_{12}, \gamma_{12}`
    * - 4
      - Shear 13/23
-     - σ₁₃, γ₁₃
-     - σ₂₃, γ₂₃
+     - :math:`\sigma_{13}, \gamma_{13}`
+     - :math:`\sigma_{23}, \gamma_{23}`
    * - 5
      - Shear 23/13
-     - σ₂₃, γ₂₃
-     - σ₁₃, γ₁₃
+     - :math:`\sigma_{23}, \gamma_{23}`
+     - :math:`\sigma_{13}, \gamma_{13}`
 
 The ``usermat_singleM.cpp`` bridge automatically swaps indices 4 and 5 during conversion.
 

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/simulation/fea_integration.rst

@@ -86,7 +86,7 @@ EPDFA (DFA-Chaboche), EPCHG (generic Chaboche), EPHIN (N Hill surfaces)
 ZENER (Kelvin, single branch), ZENNK (Kelvin, N branches), PRONK (Prony series)
 
 **Shape Memory Alloys:**
-SMAUT (unified), SMANI (anisotropic)
+SMADI (unified), SMAAI (anisotropic criterion)
 
 **Damage:**
 LLDM0 (Lemaitre-Ladeveze-Dufailly)

{simcoon-2.0.0b1 → simcoon-2.0.1}/docs/simulation/index.rst

@@ -8,6 +8,7 @@ Simulation
    solver.rst
    python_solver.rst
    umat_catalog.rst
+   modular_python.rst
    umat_tutorial.rst
    identification.rst
    output.rst