weac 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

weac/tools.py

@@ -3,66 +3,74 @@
 
 # Standard library imports
 from timeit import default_timer as timer
-from IPython import get_ipython
 
 # Third party imports
 import numpy as np
+
 import weac
 
+try:
+    from IPython import get_ipython
+except ImportError:
+    get_ipython = None
+
 
 def time():
     """Return current time in milliseconds."""
-    return 1e3*timer()
+    return 1e3 * timer()
 
 
 def isnotebook():
     """Identify shell environment."""
     try:
+        if get_ipython is None:
+            return False
         shell = get_ipython().__class__.__name__
-        if shell == 'ZMQInteractiveShell':
-            return True   # Jupyter notebook or qtconsole
-        if shell == 'TerminalInteractiveShell':
+        if shell == "ZMQInteractiveShell":
+            return True  # Jupyter notebook or qtconsole
+        elif shell == "TerminalInteractiveShell":
             return False  # Terminal running IPython
-        # None of the above: other type ?
-        return False
-    except NameError:
-        return False      # Probably standard Python interpreter
+        else:
+            return False  # Other type
+    except (NameError, AttributeError):
+        return False  # Probably standard Python interpreter
 
 
 def load_dummy_profile(profile_id):
     """Define standard layering types for comparison."""
     # Layers [density (kg/m^3), thickness (mm), Young's modulus (N/mm^2)]
-    soft = [180., 120., 5]
-    medium = [270., 120., 30]
-    hard = [350., 120., 93.8]
+    soft = [180.0, 120.0, 5]
+    medium = [270.0, 120.0, 30]
+    hard = [350.0, 120.0, 93.8]
     # soft = [120., 120., 0.3]
     # medium = [180., 120., 1.5]
     # hard = [270., 120., 7.5]
 
-
     # Database (top to bottom)
     database = {
         # Layered
-        'a':      [hard,   medium, soft],
-        'b':      [soft,   medium, hard],
-        'c':      [hard,   soft,   hard],
-        'd':      [soft,   hard,   soft],
-        'e':      [hard,   soft,   soft],
-        'f':      [soft,   soft,   hard],
+        "a": [hard, medium, soft],
+        "b": [soft, medium, hard],
+        "c": [hard, soft, hard],
+        "d": [soft, hard, soft],
+        "e": [hard, soft, soft],
+        "f": [soft, soft, hard],
         # Homogeneous
-        'h':      [medium,   medium,   medium],
-        'soft':   [soft,   soft,   soft],
-        'medium': [medium, medium, medium],
-        'hard':   [hard,   hard,   hard],
+        "h": [medium, medium, medium],
+        "soft": [soft, soft, soft],
+        "medium": [medium, medium, medium],
+        "hard": [hard, hard, hard],
         # Comparison
-        'comp':   [[240., 200., 5.23], ]
+        "comp": [
+            [240.0, 200.0, 5.23],
+        ],
     }
 
     # Load profile
     try:
         profile = np.array(database[profile_id.lower()])
     except KeyError:
-        raise ValueError(f'Profile {profile_id} is not defined.') from None
+        raise ValueError(f"Profile {profile_id} is not defined.") from None
 
     # Prepare output
     layers = profile[:, 0:2]
@@ -90,14 +98,14 @@ def calc_center_of_gravity(layers):
         Z-coordinate of center of gravity (mm).
     """
     # Layering info for center of gravity calculation (bottom to top)
-    n = layers.shape[0]                    # Number of layers
-    rho = 1e-12*np.flipud(layers[:, 0])    # Layer densities (kg/m^3 -> t/mm^3)
-    h = np.flipud(layers[:, 1])            # Layer thicknesses
-    H = sum(h)                             # Total slab thickness
+    n = layers.shape[0]  # Number of layers
+    rho = 1e-12 * np.flipud(layers[:, 0])  # Layer densities (kg/m^3 -> t/mm^3)
+    h = np.flipud(layers[:, 1])  # Layer thicknesses
+    H = sum(h)  # Total slab thickness
     # Layer center coordinates (bottom to top)
-    zi = [H/2 - sum(h[0:j]) - h[j]/2 for j in range(n)]
+    zi = [H / 2 - sum(h[0:j]) - h[j] / 2 for j in range(n)]
     # Z-coordinate of the center of gravity
-    zs = sum(zi*h*rho)/sum(h*rho)
+    zs = sum(zi * h * rho) / sum(h * rho)
     # Return slab thickness and center of gravity
     return H, zs
 
@@ -127,7 +135,7 @@ def calc_vertical_bc_center_of_gravity(slab, phi):
     """
     # Convert slope angle to radians
     phi = np.deg2rad(phi)
-    
+
     # Catch flat-field case
     if phi == 0:
         xs = 0
@@ -135,28 +143,29 @@ def calc_vertical_bc_center_of_gravity(slab, phi):
         w = 0
     else:
         # Layering info for center of gravity calculation (top to bottom)
-        n = slab.shape[0]               # Number of slab
-        rho = 1e-12*slab[:, 0]          # Layer densities (kg/m^3 -> t/mm^3)
-        hi = slab[:, 1]                 # Layer thicknesses
-        H = sum(hi)                     # Total slab thickness
+        n = slab.shape[0]  # Number of slab
+        rho = 1e-12 * slab[:, 0]  # Layer densities (kg/m^3 -> t/mm^3)
+        hi = slab[:, 1]  # Layer thicknesses
+        H = sum(hi)  # Total slab thickness
         # Layer coordinates z_i (top to bottom)
-        z = np.array([-H/2 + sum(hi[0:j]) for j in range(n + 1)])
-        zi = z[:-1]                         # z_i
-        zii = z[1:]                         # z_{i+1}
+        z = np.array([-H / 2 + sum(hi[0:j]) for j in range(n + 1)])
+        zi = z[:-1]  # z_i
+        zii = z[1:]  # z_{i+1}
         # Center of gravity of all layers (top to bottom)
-        zsi = zi + hi/3*(3/2*H - zi - 2*zii)/(H - zi - zii)
+        zsi = zi + hi / 3 * (3 / 2 * H - zi - 2 * zii) / (H - zi - zii)
         # Surface area of all layers (top to bottom)
-        Ai = hi/2*(H - zi - zii)*np.tan(phi)
+        Ai = hi / 2 * (H - zi - zii) * np.tan(phi)
         # Center of gravity in vertical direction
-        zs = sum(zsi*rho*Ai)/sum(rho*Ai)
+        zs = sum(zsi * rho * Ai) / sum(rho * Ai)
         # Center of gravity in horizontal direction
-        xs = (H/2 - zs)*np.tan(phi/2)
+        xs = (H / 2 - zs) * np.tan(phi / 2)
         # Weight of added or cut off slab segments (t)
-        w = sum(Ai*rho)
-    
+        w = sum(Ai * rho)
+
     # Return center of gravity and weight of slab segment
     return xs, zs, w
 
+
 def scapozza(rho):
     """
     Compute Young's modulus (MPa) from density (kg/m^3).
@@ -171,9 +180,9 @@ def scapozza(rho):
     E : float or ndarray
         Young's modulus (MPa).
     """
-    rho = rho*1e-12                 # Convert to t/mm^3
-    rho0 = 917e-12                  # Desity of ice in t/mm^3
-    E = 5.07e3*(rho/rho0)**5.13   # Young's modulus in MPa
+    rho = rho * 1e-12  # Convert to t/mm^3
+    rho0 = 917e-12  # Desity of ice in t/mm^3
+    E = 5.07e3 * (rho / rho0) ** 5.13  # Young's modulus in MPa
     return E
 
 
@@ -197,10 +206,10 @@ def gerling(rho, C0=6.0, C1=4.6):
     E : float or ndarray
         Young's modulus (MPa).
     """
-    return C0*1e-10*rho**C1
+    return C0 * 1e-10 * rho**C1
 
 
-def bergfeld(rho, rho0=917, C0=6.5, C1=4.4):
+def bergfeld(rho, rho0=916.7, C0=6.5, C1=4.4):
     """
     Compute Young's modulus from density according to Bergfeld et al. (2023).
 
@@ -222,12 +231,12 @@ def bergfeld(rho, rho0=917, C0=6.5, C1=4.4):
     E : float or ndarray
         Young's modulus (MPa).
     """
-    return C0*1e3*(rho/rho0)**C1
+    return C0 * 1e3 * (rho / rho0) ** C1
 
 
-def tensile_strength_slab(rho, unit='kPa'):
+def tensile_strength_slab(rho, unit="kPa"):
     """
-    Estimate the tensile strenght of a slab layer from its density.
+    Estimate the tensile strength of a slab layer from its density.
 
     Uses the density parametrization of Sigrist (2006).
 
@@ -241,23 +250,23 @@ def tensile_strength_slab(rho, unit='kPa'):
     Returns
     -------
     ndarray
-        Tensile strenght in specified unit.
+        Tensile strength in specified unit.
     """
-    convert = {
-            'kPa': 1,
-            'MPa': 1e-3
-        }
+    convert = {"kPa": 1, "MPa": 1e-3, "m": 1, "mm": 1e3, "cm": 1e2}
     rho_ice = 917
     # Sigrist's equation is given in kPa
-    return convert[unit]*240*(rho/rho_ice)**2.44
+    value = convert[unit] * 240 * (rho / rho_ice) ** 2.44
+    return value
+
 
 def touchdown_distance(
-        layers: np.ndarray | str | None = None,
-        C0: float = 6.5,
-        C1: float = 4.4,
-        Ewl: float = 0.25,
-        t: float = 10,
-        phi: float = 0):
+    layers: np.ndarray | str | None = None,
+    C0: float = 6.5,
+    C1: float = 4.4,
+    Ewl: float = 0.25,
+    t: float = 10,
+    phi: float = 0,
+):
     """
     Calculate cut length at first contanct and steady-state touchdown distance.
 
@@ -279,7 +288,7 @@ def touchdown_distance(
         Thickness of the weak layer (mm). Default is 10.
     phi : float, optional
         Inclination of the slab (°). Default is 0.
-        
+
     Returns
     -------
     first_contact : float
@@ -291,10 +300,16 @@ def touchdown_distance(
         Steady-state touchdown distance (mm).
     """
     # Check if layering is defined
-    layers = layers if layers else [[240, 200], ]
+    layers = (
+        layers
+        if layers
+        else [
+            [240, 200],
+        ]
+    )
 
     # Initialize model with user input
-    touchdown = weac.Layered(system='pst-', touchdown=True)
+    touchdown = weac.Layered(system="pst-", touchdown=True)
 
     # Set material properties
     touchdown.set_foundation_properties(E=Ewl, t=t, update=True)
@@ -311,7 +326,7 @@ def touchdown_distance(
 
     # Compute steady-state touchdown distance in a dummy PST with a cut
     # of 5 times the first contact distance
-    touchdown.calc_segments(L=1e5, a=5*first_contact, phi=phi)
+    touchdown.calc_segments(L=1e5, a=5 * first_contact, phi=phi)
     steady_state = touchdown.calc_lC()
 
     # Return first-contact cut length, full-contact cut length,

{weac-2.6.0.dist-info → weac-2.6.2.dist-info}/METADATA

@@ -1,11 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: weac
-Version: 2.6.0
+Version: 2.6.2
 Summary: Weak layer anticrack nucleation model
-Home-page: https://github.com/2phi/weac
-Author: 2phi GbR
-Author-email: mail@2phi.de
+Author-email: 2phi GbR <mail@2phi.de>
 License: Proprietary
+Project-URL: Homepage, https://github.com/2phi/weac
 Project-URL: Demo, https://github.com/2phi/weac/blob/main/demo/demo.ipynb
 Project-URL: Documentation, https://2phi.github.io/weac
 Project-URL: Issues and feature requests, https://github.com/2phi/weac/issues
@@ -16,11 +15,26 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: matplotlib
-Requires-Dist: numpy
-Requires-Dist: scipy
+Requires-Dist: matplotlib>=3.9.1
+Requires-Dist: numpy>=2.0.1
+Requires-Dist: scipy>=1.14.0
 Provides-Extra: interactive
 Requires-Dist: jupyter; extra == "interactive"
+Requires-Dist: ipython>=8.12.3; extra == "interactive"
+Requires-Dist: notebook>=7.0.0; extra == "interactive"
+Requires-Dist: ipywidgets>=8.0.0; extra == "interactive"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinxawesome-theme; extra == "docs"
+Provides-Extra: test
+Requires-Dist: pytest>=7.0.0; extra == "test"
+Requires-Dist: pytest-cov>=4.0.0; extra == "test"
+Provides-Extra: dev
+Requires-Dist: black>=23.0.0; extra == "dev"
+Requires-Dist: mypy>=1.0.0; extra == "dev"
+Requires-Dist: pytest>=7.0.0; extra == "dev"
+Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
+Dynamic: license-file
 
 <!-- LOGO AND TITLE-->
 <!-- <p align="right"><img src="https://github.com/2phi/weac/raw/main/img/logo.png" alt="Logo" width="80" height="80"></p> -->

weac-2.6.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+weac/__init__.py,sha256=QluJIYzVcaSRVJhnjdjrAsqkiemXiBu7-aQdncVct3k,345
+weac/eigensystem.py,sha256=dooypI10GrLXWMGKly-Ym4RrhQ750CsIuPHN0lfDke8,22836
+weac/inverse.py,sha256=IUDtvbioKrkdya5kPWwAeSxgSkV7-iHXNk_W86YnUM8,1890
+weac/layered.py,sha256=CwRx6cVfRqh51vrUCo7EutmghyMM0dW34pUVF8AJX9Q,2086
+weac/mixins.py,sha256=VviOwfkVrGQ8_hvzafYNaIvpHQWpPkWAmVZJRsWWKmc,69369
+weac/plot.py,sha256=0g7MsmssonqVt2tevxdyloKCuA7wOAZ877Hbr7i-44c,21122
+weac/tools.py,sha256=MZ_QrmuWlPiallUu1FH66I-gi0gvWdL3A0LsppkMK0Q,9960
+weac-2.6.2.dist-info/licenses/LICENSE,sha256=CZlY87tZ1Kq7QxKLVrMknnDXGpc1yEZ8SKoXMAk-d4k,1463
+weac-2.6.2.dist-info/METADATA,sha256=xbJG71c6gryCZ-IJSiF3KN_0qsU2d9LuC2Ej-js6fvw,20132
+weac-2.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+weac-2.6.2.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
+weac-2.6.2.dist-info/RECORD,,

{weac-2.6.0.dist-info → weac-2.6.2.dist-info}/WHEEL

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

weac-2.6.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-weac/__init__.py,sha256=mKK2r2XOcQPpaIYJO6ec1M7MYI03uyKgTtiHRhp7VgE,359
-weac/eigensystem.py,sha256=a-RBqON9Sta2c0z412BXgrfxM96heDKNyfiD0PbYLmM,22476
-weac/inverse.py,sha256=pfpE5PaMgKA2sMVk4t-Q6mPJisA-Yyo873XCKI_-HtA,1980
-weac/layered.py,sha256=S18d1PwGrj9K6HFu2u1JBiA94zzM8mX_JiKBGaph9_I,2064
-weac/mixins.py,sha256=NPkhZVwYpcxhMkS9t3ismvfgeQdZZNTg4rz7Y1DH6EQ,70269
-weac/plot.py,sha256=-s0aOV-c2KEgMa5HypiLgIgASsNVz0BR80_7h8J5o68,20705
-weac/tools.py,sha256=ddieeBfXh8APlgxjIf1HuoCjk7UgTSwvS5XKv77dS0M,9961
-weac-2.6.0.dist-info/LICENSE,sha256=CZlY87tZ1Kq7QxKLVrMknnDXGpc1yEZ8SKoXMAk-d4k,1463
-weac-2.6.0.dist-info/METADATA,sha256=tpyRnWRgtJpCzamOcZr1CfmS2paHTLebGD4MczeE9Kg,19484
-weac-2.6.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-weac-2.6.0.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
-weac-2.6.0.dist-info/RECORD,,