weac 3.1.1__py3-none-any.whl → 3.1.2__py3-none-any.whl

weac/__init__.py

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

weac/analysis/criteria_evaluator.py

@@ -24,6 +24,7 @@ from weac.components import (
     WeakLayer,
 )
 from weac.constants import RHO_ICE
+from weac.core.slab_touchdown import TouchdownMode
 from weac.core.system_model import SystemModel
 
 logger = logging.getLogger(__name__)
@@ -683,6 +684,7 @@ class CriteriaEvaluator:
     def evaluate_SteadyState(
         self,
         system: SystemModel,
+        mode: TouchdownMode = "C_in_contact",
         vertical: bool = False,
         print_call_stats: bool = False,
     ) -> SteadyStateResult:
@@ -710,18 +712,33 @@ class CriteriaEvaluator:
                 UserWarning,
             )
         system_copy = copy.deepcopy(system)
+        # Evaluate touchdown distance for flat slab
         system_copy.toggle_touchdown(True)
-        system_copy.update_scenario(scenario_config=ScenarioConfig(phi=0.0))
-        l_BC = system_copy.slab_touchdown.l_BC
+        segments = [
+            Segment(length=5e3, has_foundation=True, m=0.0),
+            Segment(length=5e3, has_foundation=False, m=0.0),
+        ]
+        system_copy.update_scenario(
+            segments=segments, scenario_config=ScenarioConfig(phi=0.0)
+        )
+
+        cut_distance = 0
+        match mode:
+            case "C_in_contact":
+                cut_distance = 2 * system_copy.slab_touchdown.l_BC
+            case "B_point_contact":
+                cut_distance = system_copy.slab_touchdown.l_BC - 1e-3
+            case "A_free_hanging":
+                cut_distance = system_copy.slab_touchdown.l_AB - 1e-3
 
         segments = [
             Segment(length=5e3, has_foundation=True, m=0.0),
-            Segment(length=2 * l_BC, has_foundation=False, m=0.0),
+            Segment(length=cut_distance, has_foundation=False, m=0.0),
         ]
         scenario_config = ScenarioConfig(
             system_type="vpst-" if vertical else "pst-",
             phi=0.0,  # Slab Touchdown works only for flat slab
-            cut_length=2 * l_BC,
+            cut_length=cut_distance,
         )
         system_copy.update_scenario(segments=segments, scenario_config=scenario_config)
         touchdown_distance = system_copy.slab_touchdown.touchdown_distance

weac/components/layer.py

@@ -94,8 +94,43 @@ 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)
+def _adam_tensile_strength(rho, unit: Literal["kPa", "MPa"] = "kPa"):
+    """
+    Estimate the tensile strength of a slab layer from its density.
+
+    Uses the density parametrization of Adam (2025).
+
+    Arguments
+    ---------
+    rho : ndarray, float
+        Layer density (kg/m^3).
+    unit : str, optional
+        Desired output unit of the layer strength. Default is 'kPa'.
+
+    Returns
+    -------
+    ndarray
+        Tensile strength in specified unit.
+    """
+    convert = {"kPa": 1e3, "MPa": 1}
+    TS_0 = 1.0  # [MPa]
+    kappa = 3.45  # [-]
+    # Adam's equation is given in MPa
+    return TS_0 * (rho / RHO_ICE) ** kappa * convert[unit]
+
+
+# # TODO: Compressive Strength from Schöttner
+# def _schotter_compressive_strength(rho, unit: Literal["kPa", "MPa"] = "kPa"):
+#     """
+#     Estimate the compressive strength of a slab layer from its density.
+#     On the compressive strength of weak snow layers of depth hoar - Schöttner (2025).
+
+#     Uses the density parametrization of Schöttner (2025).
+#     """
+#     convert = {"kPa": 1e3, "MPa": 1}
+#     CS_0 = 11.0  # [MPa]
+#     CS_1 = 5.4  # [-]
+#     return CS_0 * (rho / RHO_ICE) ** CS_1 * convert[unit]
 
 
 class Layer(BaseModel):
@@ -114,6 +149,10 @@ class Layer(BaseModel):
         Young's modulus E [MPa].  If omitted it is derived from ``rho``.
     G : float, optional
         Shear modulus G [MPa].  If omitted it is derived from ``E`` and ``nu``.
+    tensile_strength: float
+        Tensile strength [kPa].
+    tensile_strength_method: Literal["sigrist", "adam", "hybrid"]
+        Method to calculate the tensile strength.
     """
 
     # has to be provided
@@ -129,8 +168,8 @@ class Layer(BaseModel):
     tensile_strength: float = Field(
         default=0.0, ge=0, description="Tensile strength [kPa]"
     )
-    tensile_strength_method: Literal["sigrist"] = Field(
-        default="sigrist",
+    tensile_strength_method: Literal["sigrist", "adam", "hybrid"] = Field(
+        default="hybrid",
         description="Method to calculate the tensile strength",
     )
     E_method: Literal["bergfeld", "scapazzo", "gerling"] = Field(
@@ -153,17 +192,23 @@ class Layer(BaseModel):
         else:
             raise ValueError(f"Invalid E_method: {self.E_method}")
         object.__setattr__(self, "G", self.G or self.E / (2 * (1 + self.nu)))
-        if self.tensile_strength_method == "sigrist":
-            object.__setattr__(
-                self,
-                "tensile_strength",
-                self.tensile_strength
-                or _sigrist_tensile_strength(self.rho, unit="kPa"),
-            )
-        else:
-            raise ValueError(
-                f"Invalid tensile_strength_method: {self.tensile_strength_method}"
-            )
+
+        if not self.tensile_strength:
+            if self.tensile_strength_method == "sigrist":
+                ts_value = _sigrist_tensile_strength(self.rho, unit="kPa")
+            elif self.tensile_strength_method == "adam":
+                ts_value = _adam_tensile_strength(self.rho, unit="kPa")
+            elif self.tensile_strength_method == "hybrid":
+                # Use Sigrist for rho < 250, Adam for rho >= 250
+                if self.rho < 250:
+                    ts_value = _sigrist_tensile_strength(self.rho, unit="kPa")
+                else:
+                    ts_value = _adam_tensile_strength(self.rho, unit="kPa")
+            else:
+                raise ValueError(
+                    f"Invalid tensile_strength_method: {self.tensile_strength_method}"
+                )
+            object.__setattr__(self, "tensile_strength", ts_value)
 
     @model_validator(mode="after")
     def validate_positive_E_G(self):

weac/core/slab_touchdown.py

@@ -20,6 +20,9 @@ from weac.core.unknown_constants_solver import UnknownConstantsSolver
 logger = logging.getLogger(__name__)
 
 
+TouchdownMode = Literal["A_free_hanging", "B_point_contact", "C_in_contact"]
+
+
 class SlabTouchdown:  # pylint: disable=too-many-instance-attributes,too-few-public-methods
     """
     Handling the touchdown situation in a PST.
@@ -56,7 +59,7 @@ class SlabTouchdown:  # pylint: disable=too-many-instance-attributes,too-few-pub
         Length of the crack for transition of stage A to stage B [mm]
     l_BC : float
         Length of the crack for transition of stage B to stage C [mm]
-    touchdown_mode : Literal["A_free_hanging", "B_point_contact", "C_in_contact"]
+    touchdown_mode : TouchdownMode
         Type of touchdown mode
     touchdown_distance : float
         Length of the touchdown segment [mm]
@@ -74,9 +77,7 @@ class SlabTouchdown:  # pylint: disable=too-many-instance-attributes,too-few-pub
     straight_scenario: Scenario
     l_AB: float
     l_BC: float
-    touchdown_mode: Literal[
-        "A_free_hanging", "B_point_contact", "C_in_contact"
-    ]  # Three types of contact with collapsed weak layer
+    touchdown_mode: TouchdownMode  # Three types of contact with collapsed weak layer
     touchdown_distance: float
     collapsed_weak_layer_kR: float | None = None
 

weac/core/system_model.py

@@ -335,8 +335,7 @@ class SystemModel:
             weak_layer=self.weak_layer,
             slab=self.slab,
         )
-        if self.config.touchdown:
-            self._invalidate_slab_touchdown()
+        self._invalidate_slab_touchdown()
         self._invalidate_constants()
 
     def toggle_touchdown(self, touchdown: bool):

{weac-3.1.1.dist-info → weac-3.1.2.dist-info}/METADATA

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

{weac-3.1.1.dist-info → weac-3.1.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-weac/__init__.py,sha256=kgTwOD6mYTXI3qvj9z5uFDNJH84Toa29jQuKAu-5P_M,76
+weac/__init__.py,sha256=CIiVU46-0zhtGbOm2zgB-Pcnh5wzVzn5DojC3CJQmDA,76
 weac/constants.py,sha256=BX8ifZhFciCuzzako1p-2Wh5CWWzR3cPdvyu501UtUs,1194
 weac/logging_config.py,sha256=GJn4Fs80dDRpbPkSPByCmIOLkEI01dbeuMMSv_IDgoM,1103
 weac/analysis/__init__.py,sha256=FDbmQLC5zmT8OJftqNYgihXc8WYB1b9FasFPGzkKVU8,498
 weac/analysis/analyzer.py,sha256=-yoOqsdQvpNvBc-U2nqB4UEKHGTMBu23lVPJqKxUVcs,29095
-weac/analysis/criteria_evaluator.py,sha256=yiKQV6ccgNnDMEky18zlHT3YfvoxdqCQtnPHKhbnrJA,47624
+weac/analysis/criteria_evaluator.py,sha256=u4nvlkqTxNB0_7xp8ycRPe9RLuTLHP6_VzNlTG9q-nw,48286
 weac/analysis/plotter.py,sha256=ibkH4rzQ2pqQVXPRfek722e8eU3vP63uysb-Q-EzfC0,80556
 weac/components/__init__.py,sha256=94WIUVjPI3U-grN_7v0oi9bZB3Z8rCBcx9wJPOwJBAQ,439
 weac/components/config.py,sha256=tnOnJ0M-_knZBhdr052nDyyFFAZN0f2hQ68XRuXG6d8,869
 weac/components/criteria_config.py,sha256=f2agU7nXWURFAw8_68igiSk5aICUxwaB9u3Qasit-Q0,2909
-weac/components/layer.py,sha256=kfghjavzCqzzGrkKzllMMT4qD3F0pcYfk1ZHgM6rvE0,10755
+weac/components/layer.py,sha256=Ut0B9jKW4a6GVPxV43A4VCtAQJYk6ZA3MX8gt2aJBcQ,12491
 weac/components/model_input.py,sha256=oyX4p7PgaAtUXXtpvV8XO_KxwOXtG1TB0x7rXxNfCFA,3330
 weac/components/scenario_config.py,sha256=Tam-m9DQtdjmTm-lKQ8Dcjqje04ttJS2X3v_Nn7AUHQ,2563
 weac/components/segment.py,sha256=F279KcAAkRuJKWav_BZ4BanO96WZm4KXtKHinFZki7s,941
@@ -17,16 +17,16 @@ weac/core/eigensystem.py,sha256=b7KXi2weCY9IVlH_7lCTXzKSx_pLdWY-x8BPjHL5nKo,1373
 weac/core/field_quantities.py,sha256=rr0KvM5Eu9AR43CQrrODJJkXkM2b2N3BWk2dE38f64c,9175
 weac/core/scenario.py,sha256=vHHe-JDWc-8ECVfy6lFGVtJmIIKRc0J9iUEGR8zckdw,6050
 weac/core/slab.py,sha256=YwbAf7ogYDn3p0nXfj3IjVqwA6ro3jBSg2wXb_io_gQ,5125
-weac/core/slab_touchdown.py,sha256=k30FyvclH_Q3mCZNTbJkNhSenv3ja6qSNhhkmi5p04A,14009
-weac/core/system_model.py,sha256=HAZuquY6p1wf5QuUPA6VOVDIICeCxOaeXqk1dSfEzNY,15513
+weac/core/slab_touchdown.py,sha256=fTKrTblYC4i7CDQe_WIReUNdJXES7K5POBb5Fm2kHg4,13980
+weac/core/system_model.py,sha256=rTsQqqKMYcyJCQw3ogsUCKgXmnJlnL9l4tjV5Tfpg1Y,15475
 weac/core/unknown_constants_solver.py,sha256=kzB8351UC03rVcJWez0FAwdawI2tERbpcgqMRKgYbi8,17753
 weac/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 weac/utils/geldsetzer.py,sha256=Rmn_PUyeomPLfxZlj9LDbdBBRDWovavrQenka318TIM,3681
 weac/utils/misc.py,sha256=lGz0IDDJ_3nvYjSkivPJ5Xscl1D_AmvQLSjaL7SUbKs,3674
 weac/utils/snow_types.py,sha256=OKSY8LzfKycSjg7uSUZkSXUzwhcw1D1fZs5S3hVQtUM,1573
 weac/utils/snowpilot_parser.py,sha256=drOLnUg7uzMJMO9qU9x79xZkqQfFPCCQonVpU9S0x8U,13682
-weac-3.1.1.dist-info/licenses/LICENSE,sha256=ojZPWKFHbFGDrlNOvuAKGH9WcKhpLHWZPcQ4SzhK91M,1082
-weac-3.1.1.dist-info/METADATA,sha256=0cdfjFenF40KllOBi5gLkyOSkdA3Ko_1LAdX43AlUK4,25593
-weac-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-weac-3.1.1.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
-weac-3.1.1.dist-info/RECORD,,
+weac-3.1.2.dist-info/licenses/LICENSE,sha256=ojZPWKFHbFGDrlNOvuAKGH9WcKhpLHWZPcQ4SzhK91M,1082
+weac-3.1.2.dist-info/METADATA,sha256=xkJGkSjRAFW5BmqW99JDo9R1G71zq9rlh2gEOBl_P74,25593
+weac-3.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+weac-3.1.2.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
+weac-3.1.2.dist-info/RECORD,,

{weac-3.1.1.dist-info → weac-3.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any