weac 3.1.0__tar.gz → 3.1.1__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weac
-Version: 3.1.0
+Version: 3.1.1
 Summary: Weak layer anticrack nucleation model
 Author-email: 2phi GbR <mail@2phi.de>
 License-Expression: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib>=3.9.1
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: numpy<2.4.0,>=2.3.5
 Requires-Dist: scipy>=1.14.0
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: snowpylot>=1.1.3

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "weac"
-version = "3.1.0"
+version = "3.1.1"
 authors = [{ name = "2phi GbR", email = "mail@2phi.de" }]
 description = "Weak layer anticrack nucleation model"
 readme = "README.md"
@@ -20,7 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "matplotlib>=3.9.1",
-    "numpy>=2.0.1",
+    "numpy>=2.3.5,<2.4.0",
     "scipy>=1.14.0",
     "pydantic>=2.11.7",
     "snowpylot>=1.1.3",
@@ -123,7 +123,7 @@ ignore = [
 ]
 
 [tool.bumpversion]
-current_version = "3.1.0"
+current_version = "3.1.1"
 
 [[tool.bumpversion.files]]
 filename = "pyproject.toml"

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

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

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

@@ -272,11 +272,7 @@ class Analyzer:
 
         # Calculate weight load at grid points and superimpose on stress field
         qt = -rho * G_MM_S2 * np.sin(np.deg2rad(phi))
-        # Old Implementation: Changed for numerical stability
-        # for i, qi in enumerate(qt[:-1]):
-        #     Sxx[i, :] += qi * (zi[i + 1] - zi[i])
-        # Sxx[-1, :] += qt[-1] * (zi[-1] - zi[-2])
-        # New Implementation: Changed for numerical stability
+
         dz = np.diff(zi)
         Sxx_MPa[:-1, :] += qt[:-1, np.newaxis] * dz[:, np.newaxis]
         Sxx_MPa[-1, :] += qt[-1] * dz[-1]
@@ -393,7 +389,7 @@ class Analyzer:
         # Get mesh along z-axis
         zmesh = self.get_zmesh(dz=dz)
         zi = zmesh["z"]
-        rho = zmesh["rho"]
+        rho_t_mm3 = zmesh["rho"]
         qs = self.sm.scenario.surface_load
         # Get dimensions of stress field (n rows, m columns)
         n = len(zi)
@@ -414,13 +410,13 @@ class Analyzer:
             dsxx_dxdx[i, :] = E / (1 - nu**2) * (du0_dxdxdx + z * dpsi_dxdxdx)
 
         # Calculate weight load at grid points
-        qn = rho * G_MM_S2 * np.cos(np.deg2rad(phi))
+        qn = -rho_t_mm3 * G_MM_S2 * np.cos(np.deg2rad(phi))
 
         # 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_MPa = cumulative_trapezoid(integrand, zi, axis=0, initial=0)
-        Szz_MPa += cumulative_trapezoid(-qn, zi, initial=0)[:, None]
+        Szz_MPa += cumulative_trapezoid(qn, zi, initial=0)[:, None]
 
         # Normalize tensile stresses to tensile strength
         if normalize:

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

@@ -113,6 +113,9 @@ class MaximalStressResult:
         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.
+    slab_tensile_criterion: float
+        The slab tensile criterion, i.e. the portion of the slab thickness that is prone
+        to fail under tensile stresses in the steady state (between 0 and 1).
     """
 
     principal_stress_kPa: np.ndarray
@@ -121,6 +124,7 @@ class MaximalStressResult:
     Sxx_norm: np.ndarray
     max_principal_stress_norm: float
     max_Sxx_norm: float
+    slab_tensile_criterion: float
 
 
 @dataclass
@@ -706,9 +710,9 @@ class CriteriaEvaluator:
                 UserWarning,
             )
         system_copy = copy.deepcopy(system)
-        system_copy.config.touchdown = True
+        system_copy.toggle_touchdown(True)
         system_copy.update_scenario(scenario_config=ScenarioConfig(phi=0.0))
-        l_BC = system.slab_touchdown.l_BC
+        l_BC = system_copy.slab_touchdown.l_BC
 
         segments = [
             Segment(length=5e3, has_foundation=True, m=0.0),
@@ -719,7 +723,6 @@ class CriteriaEvaluator:
             phi=0.0,  # Slab Touchdown works only for flat slab
             cut_length=2 * l_BC,
         )
-        # system_copy.config.touchdown = True
         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)
@@ -1248,6 +1251,9 @@ class CriteriaEvaluator:
         )
         max_principal_stress_norm = np.max(principal_stress_norm)
         max_Sxx_norm = np.max(Sxx_norm)
+        # evaluate for each height level if the slab is prone to fail under tensile stresses
+        height_level_prone_to_fail = np.max(Sxx_norm, axis=1)
+        slab_tensile_criterion = np.mean(height_level_prone_to_fail)
         if print_call_stats:
             analyzer.print_call_stats(
                 message="_calculate_maximal_stresses Call Statistics"
@@ -1259,4 +1265,5 @@ class CriteriaEvaluator:
             Sxx_norm=Sxx_norm,
             max_principal_stress_norm=max_principal_stress_norm,
             max_Sxx_norm=max_Sxx_norm,
+            slab_tensile_criterion=slab_tensile_criterion,
         )

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

@@ -1041,6 +1041,7 @@ class Plotter:
         xwl: np.ndarray,
         z: np.ndarray,
         analyzer: Analyzer,
+        window: float | None = None,
         weaklayer_proportion: float | None = None,
         dz: int = 2,
         levels: int = 300,
@@ -1061,6 +1062,8 @@ class Plotter:
             Solution vector.
         analyzer : Analyzer
             Analyzer instance.
+        window: float | None, optional
+            Window size for the plot. Shows the right edge of the slab, where the slab is deformed. Default is None.
         weaklayer_proportion: float | None, optional
             Proportion of the plot to allocate to the weak layer. Default is None.
         dz : int, optional
@@ -1087,6 +1090,9 @@ class Plotter:
         phi = analyzer.sm.scenario.phi
         system_type = analyzer.sm.scenario.system_type
         fq = analyzer.sm.fq
+        sigma_comp = (
+            analyzer.sm.weak_layer.sigma_comp
+        )  # Compressive strength of the weak layer [kPa]
 
         # Compute slab displacements on grid (cm)
         Usl = np.vstack([fq.u(z, h0=h0, unit="cm") for h0 in zi])
@@ -1204,7 +1210,7 @@ class Plotter:
                     z, phi, dz=dz, val="max", unit="kPa", normalize=normalize
                 )
                 weak_full = analyzer.principal_stress_weaklayer(
-                    z, val="min", unit="kPa", normalize=normalize
+                    z, sc=sigma_comp, val="min", unit="kPa", normalize=normalize
                 )
                 weak = weak_full[nanmask]
                 if normalize:
@@ -1249,13 +1255,14 @@ class Plotter:
             [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,
-        )
+        if xwl_cracked.shape[0] > 0:
+            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-"]:
@@ -1287,14 +1294,15 @@ class Plotter:
             cmap=cmap,
             extend="both",
         )
-        ax.contourf(
-            Xwl_cracked,
-            Zwl_cracked_plot,
-            np.zeros((2, xwl_cracked.shape[0])),
-            levels=levels,
-            cmap=cmap,
-            extend="both",
-        )
+        if xwl_cracked.shape[0] > 0:
+            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)
@@ -1304,7 +1312,10 @@ class Plotter:
         )
 
         # Set limits first, then aspect ratio to avoid matplotlib adjusting limits
-        ax.set_xlim([xmin, xmax])
+        if window is None:
+            ax.set_xlim([xmin, xmax])
+        else:
+            ax.set_xlim([xmax - window, xmax])
         ax.set_ylim([plot_ymin, plot_ymax])
         ax.invert_yaxis()
         ax.use_sticky_edges = False
@@ -1360,6 +1371,10 @@ class Plotter:
 
         # Plot labels
         ax.set_xlabel(r"lateral position $x$ (cm) $\longrightarrow$")
+        ax.set_title(
+            f"{field}{' (normalized to tensile strength)' if normalize else ''}",
+            size=10,
+        )
 
         # Show colorbar
         ticks = np.linspace(levels[0], levels[-1], num=11, endpoint=True)

{weac-3.1.0 → weac-3.1.1}/src/weac/components/layer.py

@@ -94,6 +94,10 @@ def _sigrist_tensile_strength(rho, unit: Literal["kPa", "MPa"] = "kPa"):
     return convert[unit] * 240 * (rho / RHO_ICE) ** 2.44
 
 
+# TODO: Compressive Strength from Schöttner
+# (11 +/- 7) * (rho/rho_0) ^ (5.4 +/- 0.5)
+
+
 class Layer(BaseModel):
     """
     Regular slab layer (no foundation springs).
@@ -225,6 +229,9 @@ class WeakLayer(BaseModel):
     )
     sigma_c: float = Field(default=6.16, gt=0, description="Tensile strength [kPa]")
     tau_c: float = Field(default=5.09, gt=0, description="Shear strength [kPa]")
+    sigma_comp: float = Field(
+        default=2.6, gt=0, description="Compressive strength [kPa]"
+    )
     E_method: Literal["bergfeld", "scapazzo", "gerling"] = Field(
         default="bergfeld",
         description="Method to calculate the Young's modulus",

{weac-3.1.0 → weac-3.1.1}/src/weac/core/field_quantities.py

@@ -58,19 +58,23 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         h0: float = 0,
         unit: LengthUnit = "mm",
     ) -> float | np.ndarray:
-        """Horizontal displacement *u = u₀ + h₀ ψ* at depth h₀."""
+        """
+        Horizontal displacement `u = u₀ + h₀ ψ` at depth `h₀` (mm).
+        """
         return self._unit_factor(unit) * (Z[0, :] + h0 * self.psi(Z))
 
     def du_dx(self, Z: np.ndarray, h0: float) -> float | np.ndarray:
-        """Derivative u' = u₀' + h₀ ψ'."""
+        """Derivative u' = u₀' + h₀ ψ' (-)."""
         return Z[1, :] + h0 * self.dpsi_dx(Z)
 
     def w(self, Z: np.ndarray, unit: LengthUnit = "mm") -> float | np.ndarray:
-        """Center-line deflection *w*."""
+        """
+        Center-line (vertical) deflection `w` (mm).
+        """
         return self._unit_factor(unit) * Z[2, :]
 
     def dw_dx(self, Z: np.ndarray) -> float | np.ndarray:
-        """First derivative w'."""
+        """First derivative `w'` (-)."""
         return Z[3, :]
 
     def psi(
@@ -78,32 +82,32 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         Z: np.ndarray,
         unit: AngleUnit = "rad",
     ) -> float | np.ndarray:
-        """Rotation ψ of the mid-plane."""
+        """Rotation `ψ` of the mid-plane (rad)."""
         factor = self._unit_factor(unit)
         return factor * Z[4, :]
 
     def dpsi_dx(self, Z: np.ndarray) -> float | np.ndarray:
-        """First derivative ψ′."""
+        """First derivative `ψ'` (rad/mm)."""
         return Z[5, :]
 
     def N(self, Z: np.ndarray) -> float | np.ndarray:
-        """Axial normal force N = A11 u' + B11 psi' in the slab [N]"""
+        """Axial normal force `N = A11 u' + B11 ψ'` in the slab [N]"""
         return self.es.A11 * Z[1, :] + self.es.B11 * Z[5, :]
 
     def M(self, Z: np.ndarray) -> float | np.ndarray:
-        """Bending moment M = B11 u' + D11 psi' in the slab [Nmm]"""
+        """Bending moment `M = B11 u' + D11 ψ'` in the slab [Nmm]"""
         return self.es.B11 * Z[1, :] + self.es.D11 * Z[5, :]
 
     def V(self, Z: np.ndarray) -> float | np.ndarray:
-        """Vertical shear force V = kA55(w' + psi) [N]"""
+        """Vertical shear force `V = kA55(w' + ψ)` [N]"""
         return self.es.kA55 * (Z[3, :] + Z[4, :])
 
     def sig(self, Z: np.ndarray, unit: StressUnit = "MPa") -> float | np.ndarray:
-        """Weak-layer normal stress"""
+        """Weak-layer normal stress `sig = -kn * w`"""
         return -self._unit_factor(unit) * self.es.weak_layer.kn * self.w(Z)
 
     def tau(self, Z: np.ndarray, unit: StressUnit = "MPa") -> float | np.ndarray:
-        """Weak-layer shear stress"""
+        """Weak-layer shear stress `tau = -kt * (w' * h/2 - u(h=H/2))`"""
         return (
             -self._unit_factor(unit)
             * self.es.weak_layer.kt
@@ -114,11 +118,11 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         )
 
     def eps(self, Z: np.ndarray) -> float | np.ndarray:
-        """Weak-layer normal strain"""
+        """Weak-layer normal strain `eps = -w / h`"""
         return -self.w(Z) / self.es.weak_layer.h
 
     def gamma(self, Z: np.ndarray) -> float | np.ndarray:
-        """Weak-layer shear strain."""
+        """Weak-layer shear strain `gamma = (w' * h/2 - u(h=H/2)) / h`"""
         return (
             self.dw_dx(Z) / 2 - self.u(Z, h0=self.es.slab.H / 2) / self.es.weak_layer.h
         )
@@ -176,9 +180,9 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
 
     def dz_dxdx(self, z: np.ndarray, phi: float, qs: float) -> np.ndarray:
         """
-        Get second derivative z''(x) = K*z'(x) of the solution vector.
+        Get second derivative `z''(x) = K*z'(x)` of the solution vector.
 
-        z''(x) = [u''(x) u'''(x) w''(x) w'''(x) psi''(x), psi'''(x)]^T
+        `z''(x) = [u''(x) u'''(x) w''(x) w'''(x) psi''(x), psi'''(x)]^T`
 
         Parameters
         ----------
@@ -200,7 +204,7 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
 
     def du0_dxdx(self, z: np.ndarray, phi: float, qs: float) -> float | np.ndarray:
         """
-        Get second derivative of the horiz. centerline displacement u0''(x).
+        Get second derivative of the horiz. centerline displacement `u0''(x)` (mm⁻¹).
 
         Parameters
         ----------
@@ -213,13 +217,13 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         -------
         ndarray, float
             Second derivative of the horizontal centerline displacement
-            u0''(x) (1/mm).
+            `u0''(x)`.
         """
         return self.dz_dx(z, phi, qs)[1, :]
 
     def dpsi_dxdx(self, z: np.ndarray, phi: float, qs: float) -> float | np.ndarray:
         """
-        Get second derivative of the cross-section rotation psi''(x).
+        Get second derivative of the cross-section rotation `psi''(x)` (mm⁻²).
 
         Parameters
         ----------
@@ -231,13 +235,13 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         Returns
         -------
         ndarray, float
-            Second derivative of the cross-section rotation psi''(x) (1/mm^2).
+            Second derivative of the cross-section rotation psi''(x).
         """
         return self.dz_dx(z, phi, qs)[5, :]
 
     def du0_dxdxdx(self, z: np.ndarray, phi: float, qs: float) -> float | np.ndarray:
         """
-        Get third derivative of the horiz. centerline displacement u0'''(x).
+        Get third derivative of the horiz. centerline displacement `u0'''(x)` (mm⁻²).
 
         Parameters
         ----------
@@ -250,13 +254,13 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         -------
         ndarray, float
             Third derivative of the horizontal centerline displacement
-            u0'''(x) (1/mm^2).
+            u0'''(x).
         """
         return self.dz_dxdx(z, phi, qs)[1, :]
 
     def dpsi_dxdxdx(self, z: np.ndarray, phi: float, qs: float) -> float | np.ndarray:
         """
-        Get third derivative of the cross-section rotation psi'''(x).
+        Get third derivative of the cross-section rotation `psi'''(x)` (mm⁻³).
 
         Parameters
         ----------
@@ -268,6 +272,6 @@ class FieldQuantities:  # pylint: disable=too-many-instance-attributes, too-many
         Returns
         -------
         ndarray, float
-            Third derivative of the cross-section rotation psi'''(x) (1/mm^3).
+            Third derivative of the cross-section rotation psi'''(x).
         """
         return self.dz_dxdx(z, phi, qs)[5, :]

{weac-3.1.0 → weac-3.1.1}/src/weac/core/unknown_constants_solver.py

@@ -273,17 +273,17 @@ class UnknownConstantsSolver:
         Arguments
         ---------
         zl : ndarray
-            Solution vector (6x1) or (6x6) at left end of beam segement.
+            Solution vector (6x1) or (6x6) at left end of beam segment.
         zr : ndarray
-            Solution vector (6x1) or (6x6) at right end of beam segement.
+            Solution vector (6x1) or (6x6) at right end of beam segment.
         has_foundation : boolean
             Indicates whether segment has foundation(True) or not (False).
             Default is False.
         pos: {'left', 'mid', 'right', 'l', 'm', 'r'}, optional
-            Determines whether the segement under consideration
-            is a left boundary segement (left, l), one of the
-            center segement (mid, m), or a right boundary
-            segement (right, r). Default is 'mid'.
+            Determines whether the segment under consideration
+            is a left boundary segment (left, l), one of the
+            center segment (mid, m), or a right boundary
+            segment (right, r). Default is 'mid'.
 
         Returns
         -------
@@ -310,7 +310,7 @@ class UnknownConstantsSolver:
                     bcs[2],
                     fq.u(zr, h0=0),  # ui(xi = li)
                     fq.w(zr),  # wi(xi = li)
-                    fq.psi(zr),  # psii(xi = li)
+                    fq.psi(zr),  # psi(xi = li)
                     fq.N(zr),  # Ni(xi = li)
                     fq.M(zr),  # Mi(xi = li)
                     fq.V(zr),  # Vi(xi = li)
@@ -321,13 +321,13 @@ class UnknownConstantsSolver:
                 [
                     -fq.u(zl, h0=0),  # -ui(xi = 0)
                     -fq.w(zl),  # -wi(xi = 0)
-                    -fq.psi(zl),  # -psii(xi = 0)
+                    -fq.psi(zl),  # -psi(xi = 0)
                     -fq.N(zl),  # -Ni(xi = 0)
                     -fq.M(zl),  # -Mi(xi = 0)
                     -fq.V(zl),  # -Vi(xi = 0)
                     fq.u(zr, h0=0),  # ui(xi = li)
                     fq.w(zr),  # wi(xi = li)
-                    fq.psi(zr),  # psii(xi = li)
+                    fq.psi(zr),  # psi(xi = li)
                     fq.N(zr),  # Ni(xi = li)
                     fq.M(zr),  # Mi(xi = li)
                     fq.V(zr),  # Vi(xi = li)
@@ -347,7 +347,7 @@ class UnknownConstantsSolver:
                 [
                     -fq.u(zl, h0=0),  # -ui(xi = 0)
                     -fq.w(zl),  # -wi(xi = 0)
-                    -fq.psi(zl),  # -psii(xi = 0)
+                    -fq.psi(zl),  # -psi(xi = 0)
                     -fq.N(zl),  # -Ni(xi = 0)
                     -fq.M(zl),  # -Mi(xi = 0)
                     -fq.V(zl),  # -Vi(xi = 0)
@@ -385,9 +385,9 @@ class UnknownConstantsSolver:
             Default is False.
         pos : {'left', 'mid', 'right', 'l', 'm', 'r'}, optional
             Determines whether the segement under consideration
-            is a left boundary segement (left, l), one of the
-            center segement (mid, m), or a right boundary
-            segement (right, r). Default is 'mid'.
+            is a left boundary segment (left, l), one of the
+            center segment (mid, m), or a right boundary
+            segment (right, r). Default is 'mid'.
 
         Returns
         -------

{weac-3.1.0 → weac-3.1.1}/src/weac/utils/geldsetzer.py

@@ -82,18 +82,23 @@ HAND_HARDNESS = {
     "F-": 0.67,
     "F": 1,
     "F+": 1.33,
+    "F-4F": 1.5,
     "4F-": 1.67,
     "4F": 2,
     "4F+": 2.33,
+    "4F-1F": 2.5,
     "1F-": 2.67,
     "1F": 3,
     "1F+": 3.33,
+    "1F-P": 3.5,
     "P-": 3.67,
     "P": 4,
     "P+": 4.33,
+    "P-K": 4.5,
     "K-": 4.67,
     "K": 5,
     "K+": 5.33,
+    "K-I": 5.5,
     "I-": 5.67,
     "I": 6,
     "I+": 6.33,
@@ -117,18 +122,23 @@ HAND_HARDNESS_TO_DENSITY = {
     "F-": 71.7,
     "F": 103.7,
     "F+": 118.4,
+    "F-4F": 123.15,
     "4F-": 127.9,
     "4F": 158.2,
     "4F+": 163.7,
+    "4F-1F": 176.15,
     "1F-": 188.6,
     "1F": 208,
     "1F+": 224.4,
+    "1F-P": 238.6,
     "P-": 252.8,
     "P": 275.9,
     "P+": 314.6,
+    "P-K": 336.85,
     "K-": 359.1,
     "K": 347.4,
     "K+": 407.8,
+    "K-I": 407.8,
     "I-": 407.8,
     "I": 407.8,
     "I+": 407.8,

{weac-3.1.0 → weac-3.1.1}/src/weac/utils/snow_types.py

@@ -65,18 +65,23 @@ class HandHardness(str, Enum):
     Fm = "F-"
     F = "F"
     Fp = "F+"
+    F_4F = "F-4F"
     _4Fm = "4F-"
     _4F = "4F"
     _4Fp = "4F+"
+    _4F_1F = "4F-1F"
     _1Fm = "1F-"
     _1F = "1F"
     _1Fp = "1F+"
+    _1F_P = "1F-P"
     Pm = "P-"
     P = "P"
     Pp = "P+"
+    P_K = "P-K"
     Km = "K-"
     K = "K"
     Kp = "K+"
+    K_I = "K-I"
     Im = "I-"
     I = "I"
     Ip = "I+"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weac
-Version: 3.1.0
+Version: 3.1.1
 Summary: Weak layer anticrack nucleation model
 Author-email: 2phi GbR <mail@2phi.de>
 License-Expression: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib>=3.9.1
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: numpy<2.4.0,>=2.3.5
 Requires-Dist: scipy>=1.14.0
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: snowpylot>=1.1.3

{weac-3.1.0 → weac-3.1.1}/src/weac.egg-info/requires.txt

@@ -1,5 +1,5 @@
 matplotlib>=3.9.1
-numpy>=2.0.1
+numpy<2.4.0,>=2.3.5
 scipy>=1.14.0
 pydantic>=2.11.7
 snowpylot>=1.1.3

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

@@ -210,6 +210,48 @@ class TestCriteriaEvaluator(unittest.TestCase):
         self.assertGreater(max_principal_stress_norm, 0)
         self.assertGreater(max_Sxx_norm, 0)
 
+    def test_evaluate_SteadyState_without_touchdown_in_config(self):
+        """
+        Test evaluate_SteadyState when SystemModel is initialized without touchdown=True.
+
+        This is a regression test for bug #37: SteadyState evaluation should work
+        even if the SystemModel is not initialized with touchdown=True in Config.
+        The evaluate_SteadyState method should internally enable touchdown mode
+        using toggle_touchdown() to properly invalidate cached properties.
+        """
+        segments = [
+            Segment(length=self.segments_length, has_foundation=True, m=0),
+            Segment(length=self.segments_length, has_foundation=True, m=0),
+        ]
+        # Initialize system WITHOUT touchdown=True (default is False)
+        system = SystemModel(
+            model_input=ModelInput(
+                layers=self.layers,
+                weak_layer=self.weak_layer,
+                segments=segments,
+                scenario_config=ScenarioConfig(phi=self.phi),
+            ),
+            config=Config(),  # touchdown defaults to False
+        )
+
+        # This should not raise AttributeError: 'NoneType' object has no attribute 'l_BC'
+        results: SteadyStateResult = self.evaluator.evaluate_SteadyState(system)
+
+        # Verify results are valid
+        self.assertTrue(results.converged)
+        self.assertGreater(results.energy_release_rate, 0)
+        self.assertGreater(results.touchdown_distance, 0)
+        self.assertLess(results.touchdown_distance, results.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)
+
+        # Verify the original system's touchdown state was not modified
+        self.assertFalse(system.config.touchdown)
+
     def test_find_minimum_crack_length(self):
         """Test the find_minimum_crack_length method."""
         segments = [

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

@@ -421,7 +421,7 @@ class TestRegressionSimulation(unittest.TestCase):
         self.assertTrue(ss.converged)
         self.assertGreater(ss.touchdown_distance, 0)
         # Baseline values recorded
-        self.assertAlmostEqual(ss.touchdown_distance, 1265.551924690803, places=6)
+        self.assertAlmostEqual(ss.touchdown_distance, 1265.551937834, places=6)
         np.testing.assert_allclose(ss.energy_release_rate, 2.123992, rtol=1e-6, atol=0)
 
         # evaluate_coupled_criterion baseline