weac 3.0.2__tar.gz → 3.1.0__tar.gz

{weac-3.0.2 → weac-3.1.0}/CITATION.cff

@@ -8,7 +8,7 @@ authors:
 - family-names: "Weissgraeber"
   given-names: "Philipp"
   orcid: "https://orcid.org/0000-0001-8320-8672"
-version: 3.0.2
+version: 3.1.0
 date-released: 2021-12-30
 identifiers:
   - description: Collection of archived snapshots of all versions of WEAC

{weac-3.0.2/src/weac.egg-info → weac-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weac
-Version: 3.0.2
+Version: 3.1.0
 Summary: Weak layer anticrack nucleation model
 Author-email: 2phi GbR <mail@2phi.de>
 License-Expression: MIT

{weac-3.0.2 → weac-3.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "weac"
-version = "3.0.2"
+version = "3.1.0"
 authors = [{ name = "2phi GbR", email = "mail@2phi.de" }]
 description = "Weak layer anticrack nucleation model"
 readme = "README.md"
@@ -123,7 +123,7 @@ ignore = [
 ]
 
 [tool.bumpversion]
-current_version = "3.0.2"
+current_version = "3.1.0"
 
 [[tool.bumpversion.files]]
 filename = "pyproject.toml"

{weac-3.0.2 → weac-3.1.0}/src/weac/__init__.py

@@ -2,4 +2,4 @@
 WEAC - Weak Layer Anticrack Nucleation Model
 """
 
-__version__ = "3.0.2"
+__version__ = "3.1.0"

{weac-3.0.2 → weac-3.1.0}/src/weac/analysis/__init__.py

@@ -8,7 +8,7 @@ from .criteria_evaluator import (
     CoupledCriterionResult,
     CriteriaEvaluator,
     FindMinimumForceResult,
-    SSERRResult,
+    SteadyStateResult,
 )
 from .plotter import Plotter
 
@@ -18,6 +18,6 @@ __all__ = [
     "CoupledCriterionHistory",
     "CoupledCriterionResult",
     "FindMinimumForceResult",
-    "SSERRResult",
+    "SteadyStateResult",
     "Plotter",
 ]

{weac-3.0.2 → weac-3.1.0}/src/weac/analysis/analyzer.py

@@ -214,7 +214,7 @@ class Analyzer:
             ],  # Convert to t/mm^3
             "tensile_strength": [
                 layer.tensile_strength for layer in self.sm.slab.layers
-            ],
+            ],  # in kPa
         }
 
         # Repeat properties for each grid point in the layer
@@ -225,7 +225,7 @@ class Analyzer:
         return si
 
     @track_analyzer_call
-    def Sxx(self, Z, phi, dz=2, unit="kPa"):
+    def Sxx(self, Z, phi, dz=2, unit="kPa", normalize: bool = False):
         """
         Compute axial normal stress in slab layers.
 
@@ -239,6 +239,10 @@ class Analyzer:
             Element size along z-axis (mm). Default is 2 mm.
         unit : {'kPa', 'MPa'}, optional
             Desired output unit. Default is 'kPa'.
+        normalize : bool, optional
+            Toggle normalization. If True, normalize stress values to the tensile strength of each layer (dimensionless).
+            When normalized, the `unit` parameter is ignored and values are returned as ratios.
+            Default is False.
 
         Returns
         -------
@@ -258,13 +262,13 @@ class Analyzer:
         m = Z.shape[1]
 
         # Initialize axial normal stress Sxx
-        Sxx = np.zeros(shape=[n, m])
+        Sxx_MPa = np.zeros(shape=[n, m])
 
         # Compute axial normal stress Sxx at grid points in MPa
         for i, z in enumerate(zi):
-            E = zmesh["E"][i]
+            E_MPa = zmesh["E"][i]
             nu = zmesh["nu"][i]
-            Sxx[i, :] = E / (1 - nu**2) * self.sm.fq.du_dx(Z, z)
+            Sxx_MPa[i, :] = E_MPa / (1 - nu**2) * self.sm.fq.du_dx(Z, z)
 
         # Calculate weight load at grid points and superimpose on stress field
         qt = -rho * G_MM_S2 * np.sin(np.deg2rad(phi))
@@ -274,14 +278,22 @@ class Analyzer:
         # Sxx[-1, :] += qt[-1] * (zi[-1] - zi[-2])
         # New Implementation: Changed for numerical stability
         dz = np.diff(zi)
-        Sxx[:-1, :] += qt[:-1, np.newaxis] * dz[:, np.newaxis]
-        Sxx[-1, :] += qt[-1] * dz[-1]
+        Sxx_MPa[:-1, :] += qt[:-1, np.newaxis] * dz[:, np.newaxis]
+        Sxx_MPa[-1, :] += qt[-1] * dz[-1]
+
+        # Normalize tensile stresses to tensile strength
+        if normalize:
+            tensile_strength_kPa = zmesh["tensile_strength"]
+            tensile_strength_MPa = tensile_strength_kPa / 1e3
+            # Normalize axial normal stress to layers' tensile strength
+            normalized_Sxx = Sxx_MPa / tensile_strength_MPa[:, None]
+            return normalized_Sxx
 
         # Return axial normal stress in specified unit
-        return convert[unit] * Sxx
+        return convert[unit] * Sxx_MPa
 
     @track_analyzer_call
-    def Txz(self, Z, phi, dz=2, unit="kPa"):
+    def Txz(self, Z, phi, dz=2, unit="kPa", normalize: bool = False):
         """
         Compute shear stress in slab layers.
 
@@ -295,6 +307,9 @@ class Analyzer:
             Element size along z-axis (mm). Default is 2 mm.
         unit : {'kPa', 'MPa'}, optional
             Desired output unit. Default is 'kPa'.
+        normalize : bool, optional
+            Toggle normalization.  If True, normalize shear stress values to the tensile strength of each layer (dimensionless).
+            When normalized, the `unit` parameter is ignored and values are returned as ratios. Default is False.
 
         Returns
         -------
@@ -332,14 +347,22 @@ class Analyzer:
 
         # Integrate -dsxx_dx along z and add cumulative weight load
         # to obtain shear stress Txz in MPa
-        Txz = cumulative_trapezoid(dsxx_dx, zi, axis=0, initial=0)
-        Txz += cumulative_trapezoid(qt, zi, initial=0)[:, None]
+        Txz_MPa = cumulative_trapezoid(dsxx_dx, zi, axis=0, initial=0)
+        Txz_MPa += cumulative_trapezoid(qt, zi, initial=0)[:, None]
+
+        # Normalize shear stresses to tensile strength
+        if normalize:
+            tensile_strength_kPa = zmesh["tensile_strength"]
+            tensile_strength_MPa = tensile_strength_kPa / 1e3
+            # Normalize shear stress to layers' tensile strength
+            normalized_Txz = Txz_MPa / tensile_strength_MPa[:, None]
+            return normalized_Txz
 
         # Return shear stress Txz in specified unit
-        return convert[unit] * Txz
+        return convert[unit] * Txz_MPa
 
     @track_analyzer_call
-    def Szz(self, Z, phi, dz=2, unit="kPa"):
+    def Szz(self, Z, phi, dz=2, unit="kPa", normalize: bool = False):
         """
         Compute transverse normal stress in slab layers.
 
@@ -353,6 +376,10 @@ class Analyzer:
             Element size along z-axis (mm). Default is 2 mm.
         unit : {'kPa', 'MPa'}, optional
             Desired output unit. Default is 'kPa'.
+        normalize : bool, optional
+            Toggle normalization. If True, normalize stress values to the tensile strength of each layer (dimensionless).
+            When normalized, the `unit` parameter is ignored and values are returned as ratios.
+            Default is False.
 
         Returns
         -------
@@ -392,11 +419,19 @@ class Analyzer:
         # Integrate dsxx_dxdx twice along z to obtain transverse
         # normal stress Szz in MPa
         integrand = cumulative_trapezoid(dsxx_dxdx, zi, axis=0, initial=0)
-        Szz = cumulative_trapezoid(integrand, zi, axis=0, initial=0)
-        Szz += cumulative_trapezoid(-qn, zi, initial=0)[:, None]
+        Szz_MPa = cumulative_trapezoid(integrand, zi, axis=0, initial=0)
+        Szz_MPa += cumulative_trapezoid(-qn, zi, initial=0)[:, None]
 
-        # Return shear stress txz in specified unit
-        return convert[unit] * Szz
+        # Normalize tensile stresses to tensile strength
+        if normalize:
+            tensile_strength_kPa = zmesh["tensile_strength"]
+            tensile_strength_MPa = tensile_strength_kPa / 1e3
+            # Normalize transverse normal stress to layers' tensile strength
+            normalized_Szz = Szz_MPa / tensile_strength_MPa[:, None]
+            return normalized_Szz
+
+        # Return transverse normal stress Szz in specified unit
+        return convert[unit] * Szz_MPa
 
     @track_analyzer_call
     def principal_stress_slab(
@@ -438,6 +473,8 @@ class Analyzer:
             'min', or if normalization of compressive principal stress
             is requested.
         """
+        convert = {"kPa": 1e3, "MPa": 1}
+
         # Raise error if specified component is not available
         if val not in ["min", "max"]:
             raise ValueError(f"Component {val} not defined.")
@@ -460,9 +497,10 @@ class Analyzer:
         # Normalize tensile stresses to tensile strength
         if normalize and val == "max":
             zmesh = self.get_zmesh(dz=dz)
-            tensile_strength = zmesh["tensile_strength"]
+            tensile_strength_kPa = zmesh["tensile_strength"]
+            tensile_strength_converted = tensile_strength_kPa / 1e3 * convert[unit]
             # Normalize maximum principal stress to layers' tensile strength
-            normalized_Ps = Ps / tensile_strength[:, None]
+            normalized_Ps = Ps / tensile_strength_converted[:, None]
             return normalized_Ps
 
         # Return absolute principal stresses

{weac-3.0.2 → weac-3.1.0}/src/weac/analysis/criteria_evaluator.py

@@ -95,9 +95,38 @@ class CoupledCriterionResult:
 
 
 @dataclass
-class SSERRResult:
+class MaximalStressResult:
     """
-    Holds the results of the SSERR evaluation.
+    Holds the results of the maximal stress evaluation.
+
+    Attributes:
+    -----------
+    principal_stress_kPa: np.ndarray
+        The principal stress in kPa.
+    Sxx_kPa: np.ndarray
+        The axial normal stress in kPa.
+    principal_stress_norm: np.ndarray
+        The normalized principal stress to the tensile strength of the layers.
+    Sxx_norm: np.ndarray
+        The normalized axial normal stress to the tensile strength of the layers.
+    max_principal_stress_norm: float
+        The normalized maximum principal stress to the tensile strength of the layers.
+    max_Sxx_norm: float
+        The normalized maximum axial normal stress to the tensile strength of the layers.
+    """
+
+    principal_stress_kPa: np.ndarray
+    Sxx_kPa: np.ndarray
+    principal_stress_norm: np.ndarray
+    Sxx_norm: np.ndarray
+    max_principal_stress_norm: float
+    max_Sxx_norm: float
+
+
+@dataclass
+class SteadyStateResult:
+    """
+    Holds the results of the Steady State evaluation.
 
     Attributes:
     -----------
@@ -107,15 +136,21 @@ class SSERRResult:
         The message of the evaluation.
     touchdown_distance : float
         The touchdown distance.
-    SSERR : float
-        The Steady-State Energy Release Rate calculated with the
-        touchdown distance from G_I and G_II.
+    energy_release_rate : float
+        The steady-state energy release rate calculated with the
+        touchdown distance from the differential energy release rate.
+    maximal_stress_result: MaximalStressResult
+        The maximal stresses in the system at the touchdown distance.
+    system: SystemModel
+        The modified system model used for the steady state evaluation.
     """
 
     converged: bool
     message: str
     touchdown_distance: float
-    SSERR: float
+    energy_release_rate: float
+    maximal_stress_result: MaximalStressResult
+    system: SystemModel
 
 
 @dataclass
@@ -641,12 +676,12 @@ class CriteriaEvaluator:
             _recursion_depth=_recursion_depth + 1,
         )
 
-    def evaluate_SSERR(
+    def evaluate_SteadyState(
         self,
         system: SystemModel,
         vertical: bool = False,
         print_call_stats: bool = False,
-    ) -> SSERRResult:
+    ) -> SteadyStateResult:
         """
         Evaluates the Touchdown Distance in the Steady State and the Steady State
         Energy Release Rate.
@@ -688,12 +723,19 @@ class CriteriaEvaluator:
         system_copy.update_scenario(segments=segments, scenario_config=scenario_config)
         touchdown_distance = system_copy.slab_touchdown.touchdown_distance
         analyzer = Analyzer(system_copy, printing_enabled=print_call_stats)
-        G, _, _ = analyzer.differential_ERR(unit="J/m^2")
-        return SSERRResult(
+        energy_release_rate, _, _ = analyzer.differential_ERR(unit="J/m^2")
+        maximal_stress_result = self._calculate_maximal_stresses(
+            system_copy, print_call_stats=print_call_stats
+        )
+        if print_call_stats:
+            analyzer.print_call_stats(message="evaluate_SteadyState Call Statistics")
+        return SteadyStateResult(
             converged=True,
-            message="SSERR evaluation successful.",
+            message="Steady State evaluation successful.",
             touchdown_distance=touchdown_distance,
-            SSERR=G,
+            energy_release_rate=energy_release_rate,
+            maximal_stress_result=maximal_stress_result,
+            system=system_copy,
         )
 
     def find_minimum_force(
@@ -1170,3 +1212,51 @@ class CriteriaEvaluator:
 
         # Return the difference from the target
         return g_delta_diff - target
+
+    def _calculate_maximal_stresses(
+        self,
+        system: SystemModel,
+        print_call_stats: bool = False,
+    ) -> MaximalStressResult:
+        """
+        Calculate the maximal stresses in the system.
+
+        Parameters
+        ----------
+        system : SystemModel
+            The system model to analyze.
+        print_call_stats : bool, optional
+            Whether to print analyzer call statistics. Default is False.
+
+        Returns
+        -------
+        MaximalStressResult
+            Object containing both absolute (in kPa) and normalized stress fields,
+            along with maximum normalized stress values.
+        """
+        analyzer = Analyzer(system, printing_enabled=print_call_stats)
+        _, Z, _ = analyzer.rasterize_solution(num=4000, mode="cracked")
+        Sxx_kPa = analyzer.Sxx(Z=Z, phi=system.scenario.phi, dz=5, unit="kPa")
+        principal_stress_kPa = analyzer.principal_stress_slab(
+            Z=Z, phi=system.scenario.phi, dz=5, unit="kPa"
+        )
+        Sxx_norm = analyzer.Sxx(
+            Z=Z, phi=system.scenario.phi, dz=5, unit="kPa", normalize=True
+        )
+        principal_stress_norm = analyzer.principal_stress_slab(
+            Z=Z, phi=system.scenario.phi, dz=5, unit="kPa", normalize=True
+        )
+        max_principal_stress_norm = np.max(principal_stress_norm)
+        max_Sxx_norm = np.max(Sxx_norm)
+        if print_call_stats:
+            analyzer.print_call_stats(
+                message="_calculate_maximal_stresses Call Statistics"
+            )
+        return MaximalStressResult(
+            principal_stress_kPa=principal_stress_kPa,
+            Sxx_kPa=Sxx_kPa,
+            principal_stress_norm=principal_stress_norm,
+            Sxx_norm=Sxx_norm,
+            max_principal_stress_norm=max_principal_stress_norm,
+            max_Sxx_norm=max_Sxx_norm,
+        )

{weac-3.0.2 → weac-3.1.0}/src/weac/analysis/plotter.py

@@ -885,48 +885,56 @@ class Plotter:
             zmax = np.max(Zsl + scale * Wsl) + pad
         zmin = np.min(Zsl) - pad
 
-        # Compute weak-layer grid coordinates (cm)
-        Xwl, Zwl = np.meshgrid(1e-1 * xwl, [1e-1 * (zi[-1] + H / 2), zmax])
+        # Filter out NaN values from weak layer coordinates
+        nanmask = np.isfinite(xwl)
+        xwl_finite = xwl[nanmask]
 
-        # Assemble weak-layer displacement field (top and bottom)
-        Uwl = np.vstack([Usl[-1, :], np.zeros(xwl.shape[0])])
-        Wwl = np.vstack([Wsl[-1, :], np.zeros(xwl.shape[0])])
+        # Compute weak-layer grid coordinates (cm) - only for finite xwl
+        Xwl, Zwl = np.meshgrid(1e-1 * xwl_finite, [1e-1 * (zi[-1] + H / 2), zmax])
+
+        # Assemble weak-layer displacement field (top and bottom) - only for finite xwl
+        Uwl = np.vstack([Usl[-1, nanmask], np.zeros(xwl_finite.shape[0])])
+        Wwl = np.vstack([Wsl[-1, nanmask], np.zeros(xwl_finite.shape[0])])
 
         # Compute stress or displacement fields
         match field:
             # Horizontal displacements (um)
             case "u":
                 slab = 1e4 * Usl
-                weak = 1e4 * Usl[-1, :]
+                weak = 1e4 * Usl[-1, nanmask]
                 label = r"$u$ ($\mu$m)"
             # Vertical deflection (um)
             case "w":
                 slab = 1e4 * Wsl
-                weak = 1e4 * Wsl[-1, :]
+                weak = 1e4 * Wsl[-1, nanmask]
                 label = r"$w$ ($\mu$m)"
-            # Axial normal stresses (kPa)
             case "Sxx":
-                slab = analyzer.Sxx(z, phi, dz=dz, unit="kPa")
-                weak = np.zeros(xwl.shape[0])
-                label = r"$\sigma_{xx}$ (kPa)"
+                slab = analyzer.Sxx(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = np.zeros(xwl_finite.shape[0])
+                label = (
+                    r"$\sigma_{xx}/\sigma_+$" if normalize else r"$\sigma_{xx}$ (kPa)"
+                )
             # Shear stresses (kPa)
             case "Txz":
-                slab = analyzer.Txz(z, phi, dz=dz, unit="kPa")
-                weak = Tauwl
-                label = r"$\tau_{xz}$ (kPa)"
+                slab = analyzer.Txz(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = Tauwl[nanmask]
+                label = r"$\tau_{xz}/\sigma_+$" if normalize else r"$\tau_{xz}$ (kPa)"
             # Transverse normal stresses (kPa)
             case "Szz":
-                slab = analyzer.Szz(z, phi, dz=dz, unit="kPa")
-                weak = Sigmawl
-                label = r"$\sigma_{zz}$ (kPa)"
+                slab = analyzer.Szz(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = Sigmawl[nanmask]
+                label = (
+                    r"$\sigma_{zz}/\sigma_+$" if normalize else r"$\sigma_{zz}$ (kPa)"
+                )
             # Principal stresses
             case "principal":
                 slab = analyzer.principal_stress_slab(
                     z, phi, dz=dz, val="max", unit="kPa", normalize=normalize
                 )
-                weak = analyzer.principal_stress_weaklayer(
+                weak_full = analyzer.principal_stress_weaklayer(
                     z, val="min", unit="kPa", normalize=normalize
                 )
+                weak = weak_full[nanmask]
                 if normalize:
                     label = (
                         r"$\sigma_\mathrm{I}/\sigma_+$ (slab),  "
@@ -937,11 +945,6 @@ class Plotter:
                         r"$\sigma_\mathrm{I}$ (kPa, slab),  "
                         r"$\sigma_\mathrm{I\!I\!I}$ (kPa, weak layer)"
                     )
-            case _:
-                raise ValueError(
-                    f"Invalid input '{field}' for field. Valid options are "
-                    "'u', 'w', 'Sxx', 'Txz', 'Szz', or 'principal'"
-                )
 
         # Complement label
         label += r"  $\longrightarrow$"
@@ -968,10 +971,9 @@ class Plotter:
 
         # Plot deformed weak-layer _outline
         if system_type in ["-pst", "pst-", "-vpst", "vpst-"]:
-            nanmask = np.isfinite(xwl)
             ax.plot(
-                _outline(Xwl[:, nanmask] + scale * Uwl[:, nanmask]),
-                _outline(Zwl[:, nanmask] + scale * Wwl[:, nanmask]),
+                _outline(Xwl + scale * Uwl),
+                _outline(Zwl + scale * Wwl),
                 "k",
                 linewidth=1,
             )
@@ -1033,6 +1035,354 @@ class Plotter:
 
         return fig
 
+    def plot_visualize_deformation(
+        self,
+        xsl: np.ndarray,
+        xwl: np.ndarray,
+        z: np.ndarray,
+        analyzer: Analyzer,
+        weaklayer_proportion: float | None = None,
+        dz: int = 2,
+        levels: int = 300,
+        field: Literal["w", "u", "principal", "Sxx", "Txz", "Szz"] = "w",
+        normalize: bool = True,
+        filename: str = "visualize_deformation",
+    ) -> Figure:
+        """
+        Plot visualize deformation of the slab and weak layer.
+
+        Parameters
+        ----------
+        xsl : np.ndarray
+            Slab x-coordinates.
+        xwl : np.ndarray
+            Weak layer x-coordinates.
+        z : np.ndarray
+            Solution vector.
+        analyzer : Analyzer
+            Analyzer instance.
+        weaklayer_proportion: float | None, optional
+            Proportion of the plot to allocate to the weak layer. Default is None.
+        dz : int, optional
+            Element size along z-axis (mm). Default is 2 mm.
+        levels : int, optional
+            Number of levels for the colormap. Default is 300.
+        field : str, optional
+            Field to plot ('w', 'u', 'principal', 'Sxx', 'Txz', 'Szz'). Default is 'w'.
+        normalize : bool, optional
+            Toggle normalization. Default is True.
+        filename : str, optional
+            Filename for saving plot. Default is "visualize_deformation".
+
+        Returns
+        -------
+        matplotlib.figure.Figure
+            The generated plot figure.
+        """
+        fig = plt.figure(figsize=(10, 8))
+        ax = fig.add_subplot(111)
+
+        zi = analyzer.get_zmesh(dz=dz)["z"]
+        H = analyzer.sm.slab.H
+        phi = analyzer.sm.scenario.phi
+        system_type = analyzer.sm.scenario.system_type
+        fq = analyzer.sm.fq
+
+        # Compute slab displacements on grid (cm)
+        Usl = np.vstack([fq.u(z, h0=h0, unit="cm") for h0 in zi])
+        Wsl = np.vstack([fq.w(z, unit="cm") for _ in zi])
+        Sigmawl = np.where(np.isfinite(xwl), fq.sig(z, unit="kPa"), np.nan)
+        Tauwl = np.where(np.isfinite(xwl), fq.tau(z, unit="kPa"), np.nan)
+
+        # Put coordinate origin at horizontal center
+        if system_type in ["skier", "skiers"]:
+            xsl = xsl - max(xsl) / 2
+            xwl = xwl - max(xwl) / 2
+
+        # Physical dimensions in cm
+        H_cm = H * 1e-1  # Slab height in cm
+        h_cm = analyzer.sm.weak_layer.h * 1e-1  # Weak layer height in cm
+        crack_h_cm = analyzer.sm.scenario.crack_h * 1e-1  # Crack height in cm
+
+        # Compute slab grid coordinates with vertical origin at top surface (cm)
+        Xsl, Zsl = np.meshgrid(1e-1 * (xsl), 1e-1 * (zi + H / 2))
+
+        # Calculate maximum displacement first (needed for proportion calculation)
+        max_w_displacement = np.nanmax(np.abs(Wsl))
+
+        # Calculate dynamic proportions based on displacement
+        # Weak layer percentage = weak_layer_height / max_displacement (as ratio)
+        # But capped at 40% maximum
+        if weaklayer_proportion is None:
+            if max_w_displacement > 0:
+                weaklayer_proportion = min(0.3, (h_cm / max_w_displacement) * 0.1)
+            else:
+                weaklayer_proportion = 0.3
+
+        # Slab takes the remaining space
+        slab_proportion = 1.0 - weaklayer_proportion
+        cracked_ratio = crack_h_cm / h_cm
+        cracked_proportion = weaklayer_proportion * cracked_ratio
+
+        # Set up plot coordinate system
+        # Plot height is normalized: slab (0 to slab_proportion), weak layer (slab_proportion to slab_proportion+weaklayer_proportion)
+        total_height_plot = (
+            slab_proportion + weaklayer_proportion
+        )  # Total height without displacement
+        # Map physical dimensions to plot coordinates
+        deformation_scale = weaklayer_proportion / h_cm
+
+        # Get x-axis limits spanning all provided x values (deformed and undeformed)
+        xmax = np.max([np.max(Xsl), np.max(Xsl + deformation_scale * Usl)]) + 10.0
+        xmin = np.min([np.min(Xsl), np.min(Xsl + deformation_scale * Usl)]) - 10.0
+
+        # Calculate zmax including maximum deformation
+        zmax = total_height_plot
+
+        # Convert physical coordinates to plot coordinates for slab
+        # Zsl is in cm, we need to map it to plot coordinates (0 to slab_proportion)
+        Zsl_plot = (Zsl / H_cm) * slab_proportion
+
+        # Filter out NaN values from weak layer coordinates
+        nanmask = np.isfinite(xwl)
+        xwl_finite = xwl[nanmask]
+
+        # Compute weak-layer grid coordinates in plot units
+        # Weak layer extends from bottom of slab (slab_proportion) to total height (1.0)
+        Xwl, Zwl_plot = np.meshgrid(
+            1e-1 * xwl_finite, [slab_proportion, total_height_plot]
+        )
+
+        # Assemble weak-layer displacement field (top and bottom) - only for finite xwl
+        Uwl = np.vstack([Usl[-1, nanmask], np.zeros(xwl_finite.shape[0])])
+        Wwl = np.vstack([Wsl[-1, nanmask], np.zeros(xwl_finite.shape[0])])
+
+        # Convert slab displacements to plot coordinates
+        # Scale factor for displacements:
+        # So scaled displacement in plot units = scale * Wsl
+        Wsl_plot = (
+            deformation_scale * Wsl
+        )  # Already in plot units (proportion of total height)
+        Usl_plot = deformation_scale * Usl  # Horizontal displacements also scaled
+        Wwl_plot = deformation_scale * Wwl  # Weak layer displacements
+        Uwl_plot = deformation_scale * Uwl  # Weak layer horizontal displacements
+
+        # Compute stress or displacement fields
+        match field:
+            # Horizontal displacements (um)
+            case "u":
+                slab = 1e4 * Usl
+                weak = 1e4 * Usl[-1, nanmask]
+                label = r"$u$ ($\mu$m)"
+            # Vertical deflection (um)
+            case "w":
+                slab = 1e4 * Wsl
+                weak = 1e4 * Wsl[-1, nanmask]
+                label = r"$w$ ($\mu$m)"
+            # Axial normal stresses (kPa)
+            case "Sxx":
+                slab = analyzer.Sxx(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = np.zeros(xwl_finite.shape[0])
+                label = (
+                    r"$\sigma_{xx}/\sigma_+$" if normalize else r"$\sigma_{xx}$ (kPa)"
+                )
+            # Shear stresses (kPa)
+            case "Txz":
+                slab = analyzer.Txz(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = Tauwl[nanmask]
+                label = r"$\tau_{xz}/\sigma_+$" if normalize else r"$\tau_{xz}$ (kPa)"
+            # Transverse normal stresses (kPa)
+            case "Szz":
+                slab = analyzer.Szz(z, phi, dz=dz, unit="kPa", normalize=normalize)
+                weak = Sigmawl[nanmask]
+                label = (
+                    r"$\sigma_{zz}/\sigma_+$" if normalize else r"$\sigma_{zz}$ (kPa)"
+                )
+            # Principal stresses
+            case "principal":
+                slab = analyzer.principal_stress_slab(
+                    z, phi, dz=dz, val="max", unit="kPa", normalize=normalize
+                )
+                weak_full = analyzer.principal_stress_weaklayer(
+                    z, val="min", unit="kPa", normalize=normalize
+                )
+                weak = weak_full[nanmask]
+                if normalize:
+                    label = (
+                        r"$\sigma_\mathrm{I}/\sigma_+$ (slab),  "
+                        r"$\sigma_\mathrm{I\!I\!I}/\sigma_-$ (weak layer)"
+                    )
+                else:
+                    label = (
+                        r"$\sigma_\mathrm{I}$ (kPa, slab),  "
+                        r"$\sigma_\mathrm{I\!I\!I}$ (kPa, weak layer)"
+                    )
+
+        # Complement label
+        label += r"  $\longrightarrow$"
+
+        # Assemble weak-layer output on grid
+        weak = np.vstack([weak, weak])
+
+        # Normalize colormap
+        absmax = np.nanmax(np.abs([slab.min(), slab.max(), weak.min(), weak.max()]))
+        clim = np.round(absmax, _significant_digits(absmax))
+        levels = np.linspace(-clim, clim, num=levels + 1, endpoint=True)
+
+        # Plot baseline
+        ax.axhline(zmax, color="k", linewidth=1)
+
+        # Plot outlines of the undeformed and deformed slab (using plot coordinates)
+        ax.plot(_outline(Xsl), _outline(Zsl_plot), "--", alpha=0.3, linewidth=1)
+        ax.plot(
+            _outline(Xsl + Usl_plot),
+            _outline(Zsl_plot + Wsl_plot),
+            "-",
+            linewidth=1,
+            color="k",
+        )
+
+        # Plot cracked weak-layer outline (where there is no weak layer)
+        xwl_cracked = xsl[~nanmask]
+        Xwl_cracked, Zwl_cracked_plot = np.meshgrid(
+            1e-1 * xwl_cracked,
+            [slab_proportion + cracked_proportion, total_height_plot],
+        )
+        # No displacements for the cracked weak layer outline (undeformed)
+        ax.plot(
+            _outline(Xwl_cracked),
+            _outline(Zwl_cracked_plot),
+            "k-",
+            alpha=0.3,
+            linewidth=1,
+        )
+
+        # Then plot the deformed weak-layer outline where it exists
+        if system_type in ["-pst", "pst-", "-vpst", "vpst-"]:
+            ax.plot(
+                _outline(Xwl + Uwl_plot),
+                _outline(Zwl_plot + Wwl_plot),
+                "k",
+                linewidth=1,
+            )
+
+        cmap = plt.get_cmap("RdBu_r")
+        cmap.set_over(_adjust_lightness(cmap(1.0), 0.9))
+        cmap.set_under(_adjust_lightness(cmap(0.0), 0.9))
+
+        # Plot fields (using plot coordinates)
+        ax.contourf(
+            Xsl + Usl_plot,
+            Zsl_plot + Wsl_plot,
+            slab,
+            levels=levels,
+            cmap=cmap,
+            extend="both",
+        )
+        ax.contourf(
+            Xwl + Uwl_plot,
+            Zwl_plot + Wwl_plot,
+            weak,
+            levels=levels,
+            cmap=cmap,
+            extend="both",
+        )
+        ax.contourf(
+            Xwl_cracked,
+            Zwl_cracked_plot,
+            np.zeros((2, xwl_cracked.shape[0])),
+            levels=levels,
+            cmap=cmap,
+            extend="both",
+        )
+
+        # Plot setup
+        # Set y-limits to match plot coordinate system (0 to total_height_plot = 1.0)
+        plot_ymin = -0.1
+        plot_ymax = (
+            total_height_plot  # Should be 1.0 (slab_proportion + weaklayer_proportion)
+        )
+
+        # Set limits first, then aspect ratio to avoid matplotlib adjusting limits
+        ax.set_xlim([xmin, xmax])
+        ax.set_ylim([plot_ymin, plot_ymax])
+        ax.invert_yaxis()
+        ax.use_sticky_edges = False
+
+        # Hide the default y-axis on main axis (we'll use custom axes)
+        ax.yaxis.set_visible(False)
+
+        # Set up dual y-axes
+        # Right axis: slab height in cm (0 at top, H_cm at bottom of slab)
+        ax_right = ax.twinx()
+        slab_height_max = H_cm
+        # Map plot coordinates to physical slab height values
+        # Plot: 0 to slab_proportion (0.6) maps to physical: 0 to H_cm
+        slab_height_ticks = np.linspace(0, slab_height_max, num=5)
+        slab_height_positions_plot = (
+            slab_height_ticks / slab_height_max
+        ) * slab_proportion
+        ax_right.set_yticks(slab_height_positions_plot)
+        ax_right.set_yticklabels([f"{tick:.1f}" for tick in slab_height_ticks])
+        # Ensure right axis ticks and label are on the right side
+        ax_right.yaxis.tick_right()
+        ax_right.yaxis.set_label_position("right")
+        ax_right.set_ylim([plot_ymin, plot_ymax])
+        ax_right.invert_yaxis()
+        ax_right.set_ylabel(
+            r"slab depth [cm] $\longleftarrow$", rotation=90, labelpad=5, loc="top"
+        )
+
+        # Left axis: weak layer height in mm (0 at bottom of slab, h at bottom of weak layer)
+        ax_left = ax.twinx()
+        weak_layer_h_mm = analyzer.sm.weak_layer.h
+        # Map plot coordinates to physical weak layer height values
+        # Plot: slab_proportion (0.6) to total_height_plot (1.0) maps to physical: 0 to h_mm
+        weaklayer_height_ticks = np.linspace(0, weak_layer_h_mm, num=3)
+        # Map from plot coordinates (slab_proportion to 1.0) to physical (0 to h_mm)
+        weaklayer_height_positions_plot = (
+            slab_proportion
+            + (weaklayer_height_ticks / weak_layer_h_mm) * weaklayer_proportion
+        )
+        ax_left.set_yticks(weaklayer_height_positions_plot)
+        ax_left.set_yticklabels([f"{tick:.1f}" for tick in weaklayer_height_ticks])
+        # Move left axis to the left side
+        ax_left.yaxis.tick_left()
+        ax_left.yaxis.set_label_position("left")
+        ax_left.set_ylim([plot_ymin, plot_ymax])
+        ax_left.invert_yaxis()
+        ax_left.set_ylabel(
+            r"weaklayer depth [mm] $\longleftarrow$",
+            rotation=90,
+            labelpad=5,
+            loc="bottom",
+        )
+
+        # Plot labels
+        ax.set_xlabel(r"lateral position $x$ (cm) $\longrightarrow$")
+
+        # Show colorbar
+        ticks = np.linspace(levels[0], levels[-1], num=11, endpoint=True)
+        fig.colorbar(
+            ax.contourf(
+                Xsl + Usl_plot,
+                Zsl_plot + Wsl_plot,
+                slab,
+                levels=levels,
+                cmap=cmap,
+                extend="both",
+            ),
+            orientation="horizontal",
+            ticks=ticks,
+            label=label,
+            aspect=35,
+        )
+
+        # Save figure
+        self._save_figure(filename, fig)
+
+        return fig
+
     def plot_stress_envelope(
         self,
         system_model: SystemModel,

{weac-3.0.2 → weac-3.1.0/src/weac.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weac
-Version: 3.0.2
+Version: 3.1.0
 Summary: Weak layer anticrack nucleation model
 Author-email: 2phi GbR <mail@2phi.de>
 License-Expression: MIT

{weac-3.0.2 → weac-3.1.0}/tests/analysis/test_analyzer.py

@@ -79,6 +79,42 @@ class TestAnalyzer(unittest.TestCase):
         self.assertTrue(np.isfinite(Txz).all())
         self.assertTrue(np.isfinite(Szz).all())
 
+    def test_stress_fields_unit_conversion(self):
+        """Test stress fields unit conversion."""
+        _, Z, _ = self.an_ski.rasterize_solution(num=150)
+        phi = self.sm_ski.scenario.phi
+        Sxx_kPa = self.an_ski.Sxx(Z=Z, phi=phi, dz=5, unit="kPa")
+        Sxx_MPa = self.an_ski.Sxx(Z=Z, phi=phi, dz=5, unit="MPa")
+        self.assertEqual(Sxx_kPa.shape, Sxx_MPa.shape)
+        np.testing.assert_array_almost_equal(Sxx_kPa, Sxx_MPa * 1e3, decimal=8)
+        principal_stress_MPa = self.an_ski.principal_stress_slab(
+            Z=Z, phi=phi, dz=5, unit="MPa"
+        )
+        principal_stress_kPa = self.an_ski.principal_stress_slab(
+            Z=Z, phi=phi, dz=5, unit="kPa"
+        )
+        self.assertEqual(principal_stress_MPa.shape, principal_stress_kPa.shape)
+        np.testing.assert_array_almost_equal(
+            principal_stress_MPa * 1e3, principal_stress_kPa, decimal=8
+        )
+        # Test normalized is the same irrespective of unit
+        Sxx_kPa_norm = self.an_ski.Sxx(Z=Z, phi=phi, dz=5, unit="kPa", normalize=True)
+        Sxx_MPa_norm = self.an_ski.Sxx(Z=Z, phi=phi, dz=5, unit="MPa", normalize=True)
+        self.assertEqual(Sxx_kPa_norm.shape, Sxx_MPa_norm.shape)
+        np.testing.assert_array_almost_equal(Sxx_kPa_norm, Sxx_MPa_norm, decimal=8)
+        principal_stress_MPa_norm = self.an_ski.principal_stress_slab(
+            Z=Z, phi=phi, dz=5, unit="MPa", normalize=True
+        )
+        principal_stress_kPa_norm = self.an_ski.principal_stress_slab(
+            Z=Z, phi=phi, dz=5, unit="kPa", normalize=True
+        )
+        self.assertEqual(
+            principal_stress_MPa_norm.shape, principal_stress_kPa_norm.shape
+        )
+        np.testing.assert_array_almost_equal(
+            principal_stress_MPa_norm, principal_stress_kPa_norm, decimal=8
+        )
+
     def test_principal_stress_slab_variants(self):
         """Test principal stress slab variants."""
         _, Z, _ = self.an_ski.rasterize_solution(num=120)

{weac-3.0.2 → weac-3.1.0}/tests/analysis/test_criteria_evaluator.py

@@ -13,7 +13,7 @@ from weac.analysis.criteria_evaluator import (
     CoupledCriterionResult,
     CriteriaEvaluator,
     FindMinimumForceResult,
-    SSERRResult,
+    SteadyStateResult,
 )
 from weac.components import (
     Config,
@@ -183,8 +183,8 @@ class TestCriteriaEvaluator(unittest.TestCase):
         self.assertIsInstance(results, CoupledCriterionResult)
         self.assertGreater(results.critical_skier_weight, 0)
 
-    def test_evaluate_SSERR(self):
-        """Test the evaluate_SSERR method."""
+    def test_evaluate_SteadyState(self):
+        """Test the evaluate_SteadyState method."""
         segments = [
             Segment(length=self.segments_length, has_foundation=True, m=0),
             Segment(length=self.segments_length, has_foundation=True, m=0),
@@ -198,11 +198,17 @@ class TestCriteriaEvaluator(unittest.TestCase):
             ),
             config=Config(touchdown=True),
         )
-        results: SSERRResult = self.evaluator.evaluate_SSERR(system)
+        results: SteadyStateResult = self.evaluator.evaluate_SteadyState(system)
         self.assertTrue(results.converged)
-        self.assertGreater(results.SSERR, 0)
+        self.assertGreater(results.energy_release_rate, 0)
         self.assertGreater(results.touchdown_distance, 0)
         self.assertLess(results.touchdown_distance, system.scenario.L)
+        max_principal_stress_norm = (
+            results.maximal_stress_result.max_principal_stress_norm
+        )
+        max_Sxx_norm = results.maximal_stress_result.max_Sxx_norm
+        self.assertGreater(max_principal_stress_norm, 0)
+        self.assertGreater(max_Sxx_norm, 0)
 
     def test_find_minimum_crack_length(self):
         """Test the find_minimum_crack_length method."""

{weac-3.0.2 → weac-3.1.0}/tests/test_regression_simulation.py

@@ -416,13 +416,13 @@ class TestRegressionSimulation(unittest.TestCase):
         self.assertAlmostEqual(fm.max_dist_stress, 1.0000189267255666, places=6)
         self.assertLess(fm.min_dist_stress, 1.0)
 
-        # evaluate_SSERR baseline
-        ss = evaluator.evaluate_SSERR(system=sm, vertical=False)
+        # evaluate_SteadyState baseline
+        ss = evaluator.evaluate_SteadyState(system=sm, vertical=False)
         self.assertTrue(ss.converged)
         self.assertGreater(ss.touchdown_distance, 0)
         # Baseline values recorded
         self.assertAlmostEqual(ss.touchdown_distance, 1265.551924690803, places=6)
-        np.testing.assert_allclose(ss.SSERR, 2.123992, rtol=1e-6, atol=0)
+        np.testing.assert_allclose(ss.energy_release_rate, 2.123992, rtol=1e-6, atol=0)
 
         # evaluate_coupled_criterion baseline
         cc = evaluator.evaluate_coupled_criterion(system=sm, max_iterations=10)