weac 2.4.1__py3-none-any.whl → 2.5.1__py3-none-any.whl

weac/plot.py

@@ -2,14 +2,16 @@
 # pylint: disable=invalid-name,too-many-locals,too-many-branches
 # pylint: disable=too-many-arguments,too-many-statements
 
-# Third party imports
+# Standard library imports
 import os
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.colors as mc
 import colorsys
 
-# Project imports
+# Third party imports
+import matplotlib.colors as mc
+import matplotlib.pyplot as plt
+import numpy as np
+
+# Local application imports
 from weac.tools import isnotebook
 
 # === SET PLOT STYLES =========================================================
@@ -173,7 +175,7 @@ def slab_profile(instance):
     ax1.set_xlim(500, 0)
 
     ax1.fill_betweenx(y, 0, x)
-    
+
     # Save figure
     save_plot(name='profile')
 
@@ -188,7 +190,8 @@ def slab_profile(instance):
 
 def deformed(instance, xsl, xwl, z, phi, dz=2, scale=100,
              window=np.inf, pad=2, levels=300, aspect=2,
-             field='principal', normalize=True, dark=False):
+             field='principal', normalize=True, dark=False,
+             filename='cont'):
     """
     Plot 2D deformed solution with displacement or stress fields.
 
@@ -378,7 +381,7 @@ def deformed(instance, xsl, xwl, z, phi, dz=2, scale=100,
 
     # Plot labels
     plt.gca().set_xlabel(r'lateral position $x$ (cm) $\longrightarrow$')
-    plt.gca().set_ylabel('depth below surface\n' r'$\longleftarrow $ $d$ (cm)')
+    plt.gca().set_ylabel('depth below surface\n' + r'$\longleftarrow $ $d$ (cm)')
     plt.title(fr'${scale}\!\times\!$ scaled deformations (cm)', size=10)
 
     # Show colorbar
@@ -387,7 +390,10 @@ def deformed(instance, xsl, xwl, z, phi, dz=2, scale=100,
                  label=label, aspect=35)
 
     # Save figure
-    save_plot(name='cont')
+    save_plot(name=filename)
+
+    # Clear Canvas
+    plt.close()
 
     # Reset plot styles
     plt.rcdefaults()
@@ -490,6 +496,9 @@ def plot_data(
     # Save figure
     save_plot(name)
 
+    # Clear canvas
+    plt.close()
+
     # Reset plot styles
     plt.rcdefaults()
 
@@ -497,7 +506,7 @@ def plot_data(
 # === PLOT WRAPPERS ===========================================================
 
 
-def displacements(instance, x, z, **segments):
+def displacements(instance, x, z, i='', **segments):
     """Wrap for dispalcements plot."""
     data = [
         [x/10, instance.u(z, z0=0, unit='mm'), r'$u_0\ (\mathrm{mm})$'],
@@ -505,10 +514,10 @@ def displacements(instance, x, z, **segments):
         [x/10, instance.psi(z, unit='degrees'), r'$\psi\ (^\circ)$ '],
     ]
     plot_data(ax1label=r'Displacements', ax1data=data,
-              name='disp', **segments)
+              name='disp' + str(i), **segments)
 
 
-def section_forces(instance, x, z, **segments):
+def section_forces(instance, x, z, i='', **segments):
     """Wrap section forces plot."""
     data = [
         [x/10, instance.N(z), r'$N$'],
@@ -516,17 +525,17 @@ def section_forces(instance, x, z, **segments):
         [x/10, instance.V(z), r'$V$']
     ]
     plot_data(ax1label=r'Section forces', ax1data=data,
-              name='forc', **segments)
+              name='forc' + str(i), **segments)
 
 
-def stresses(instance, x, z, **segments):
+def stresses(instance, x, z, i='', **segments):
     """Wrap stress plot."""
     data = [
         [x/10, instance.tau(z, unit='kPa'), r'$\tau$'],
         [x/10, instance.sig(z, unit='kPa'), r'$\sigma$']
     ]
     plot_data(ax1label=r'Stress (kPa)', ax1data=data,
-              name='stress', **segments)
+              name='stress' + str(i), **segments)
 
 
 def stress_criteria(x, stress, **segments):
@@ -605,7 +614,7 @@ def save_plot(name):
     name : string
         Name for the figure.
     """
-    filename = name + '.pdf'
+    filename = name + '.png'
     # Show figure if on jupyter notebook
     if isnotebook():
         plt.show()

weac/tools.py

@@ -7,6 +7,7 @@ from IPython import get_ipython
 
 # Third party imports
 import numpy as np
+import weac
 
 
 def time():
@@ -249,3 +250,62 @@ def tensile_strength_slab(rho, unit='kPa'):
     rho_ice = 917
     # Sigrist's equation is given in kPa
     return convert[unit]*240*(rho/rho_ice)**2.44
+
+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):
+    """
+    Calculate cut length at first contanct and steady-state touchdown distance.
+
+    Arguments
+    ---------
+    layers : list, optional
+        2D list of layer densities and thicknesses. Columns are
+        density(kg/m ^ 3) and thickness(mm). One row corresponds
+        to one layer. Default is [[240, 200], ].
+    C0 : float, optional
+        Multiplicative constant of Young modulus parametrization
+        according to Bergfeld et al. (2023). Default is 6.5.
+    C1 : float, optional
+        Exponent of Young modulus parameterization according to
+        Bergfeld et al. (2023). Default is 4.4.
+    Ewl : float, optional
+        Young's modulus of the weak layer (MPa). Default is 0.25.
+    t : float, optional
+        Thickness of the weak layer (mm). Default is 10.
+    phi : float, optional
+        Inclination of the slab (°). Default is 0.
+        
+    Returns
+    -------
+    first_contact : float
+        Cut length at first contact (mm).
+    steady_state : float
+        Steady-state touchdown distance (mm).
+    """
+    # Check if layering is defined
+    layers = layers if layers else [[240, 200], ]
+
+    # Initialize model with user input
+    touchdown = weac.Layered(system='pst-', touchdown=True)
+
+    # Set material properties
+    touchdown.set_foundation_properties(E=Ewl, t=t, update=True)
+    touchdown.set_beam_properties(layers=layers, C0=C0, C1=C1, update=True)
+
+    # Assemble very long dummy PST to compute crack length where the slab
+    # first comes in contact with base layer after weak-layer collapse
+    touchdown.calc_segments(L=1e5, a=0, phi=phi)
+    first_contact = touchdown.calc_a1()
+
+    # 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)
+    steady_state = touchdown.calc_lC()
+
+    # Return first-contact cut length and steady-state touchdown distance (mm)
+    return first_contact, steady_state

{weac-2.4.1.dist-info → weac-2.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weac
-Version: 2.4.1
+Version: 2.5.1
 Summary: Weak layer anticrack nucleation model
 Home-page: https://github.com/2phi/weac
 Author: 2phi GbR
@@ -109,7 +109,7 @@ WEAC implements closed-form analytical models for the [mechanical analysis of dr
 
 Cite the repository as:
 ```
-Rosendahl, P. L. & Weissgraeber, P. (2022). Weak Layer Anticrack Nucleation Model (WEAC). Zenodo. https://doi.org/10.5281/zenodo.5773113
+Rosendahl, P. L., Schneider, J., & Weissgraeber, P. (2022). Weak Layer Anticrack Nucleation Model (WEAC). Zenodo. https://doi.org/10.5281/zenodo.5773113
 ```
 
 Read the [📄 white paper](https://doi.org/10.5194/tc-17-1475-2023) for model derivations, illustrations, dimensions, material properties, and kinematics:
@@ -213,15 +213,18 @@ x_cm, tau_kPa = skier.get_weaklayer_shearstress(x=xwl, z=z, unit='kPa')
 
 See the [open issues](https://github.com/2phi/weac/issues) for a list of proposed features and known issues.
 
-### v2.5
+### v2.6
 - [ ] Finite fracture mechanics implementation for layered snow covers
 
-### v2.4
+### v2.5
 - [ ] Implement anistropic weak layer
 - [ ] Add demo gif
 
 ## Release history
 
+### v2.4
+- Choose between slope-normal (`'-pst'`, `'pst-'`) or vertial (`'-vpst'`, `'vpst-'`) PST boundary conditions
+
 ### v2.3
 - Stress plots on deformed contours
 - PSTs now account for slab touchdown
@@ -271,12 +274,18 @@ See the [open issues](https://github.com/2phi/weac/issues) for a list of propose
 5. Open a pull request
 
 
+<!-- LICENSE -->
+## Workflows
+[![Publish Python 🐍 releases 📦 to PyPI ](https://github.com/2phi/weac/actions/workflows/release.yml/badge.svg)](https://github.com/2phi/weac/actions/workflows/release.yml)<br>
+[![Build and publish Sphinx 🪬 documentation ](https://github.com/2phi/weac/actions/workflows/docs.yml/badge.svg)](https://github.com/2phi/weac/actions/workflows/docs.yml)
+
+
 <!-- LICENSE -->
 ## License
 
-Copyright 2phi GbR, 2020-2023.
+Copyright 2phi GbR, 2020-2024.
 
-We currently do not offer an open source license. Please contact us for private licensing options.
+We currently do not offer an open-source license. Please contact us for private licensing options.
 
 
 <!-- CONTACT -->

weac-2.5.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+weac/__init__.py,sha256=5_KHE81CCZ6C9a_-12Ln7Trbla2nVy6ZP4_Mi6frgPQ,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=CtZQgzsJtODSPyYLNHhehn24ma13rNGfyYhUVcdp9mk,9605
+weac-2.5.1.dist-info/LICENSE,sha256=kZ_nAN1upf01GX0XTvH6LSOveV_dXX1xazrr-fI1qj8,129
+weac-2.5.1.dist-info/METADATA,sha256=w62iA_tpWfPxqkzb61PS5dzGYppsqOsQM9WDsus4mzg,17290
+weac-2.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+weac-2.5.1.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
+weac-2.5.1.dist-info/RECORD,,

{weac-2.4.1.dist-info → weac-2.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

weac-2.4.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-weac/__init__.py,sha256=li9Z4iHEswBMz3C2vgjEWVKAhoIKBc5PsBPvAbMYB0g,359
-weac/eigensystem.py,sha256=-TkOdGqnzxLJJMIcHCXxQCLNUZnT4-KLlK8LUbVoJBI,27015
-weac/inverse.py,sha256=pfpE5PaMgKA2sMVk4t-Q6mPJisA-Yyo873XCKI_-HtA,1980
-weac/layered.py,sha256=ivotD-YhY-yM-VGn6uY5LhtjaFn7uQRbRrd81W0mfD8,1903
-weac/mixins.py,sha256=cE8lf1bCneP81XCfFz87EnYVLVBuSZqzWXqH9FtGN8U,55622
-weac/plot.py,sha256=JCMbikfnevxgi9lA7kT47q73BlTAn9c3_zYW1iYxu7s,20520
-weac/tools.py,sha256=3_fh4lTMlmReHTcPXZhBR_aA6gjPCkqus9zLYWTcsk4,7423
-weac-2.4.1.dist-info/LICENSE,sha256=kZ_nAN1upf01GX0XTvH6LSOveV_dXX1xazrr-fI1qj8,129
-weac-2.4.1.dist-info/METADATA,sha256=eWgGguyQRLNfYRDU-ZGy4TxBTn8Nd1Gbcq0i-kwqHKc,16767
-weac-2.4.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-weac-2.4.1.dist-info/top_level.txt,sha256=8tyXUHPFU4Ba_5kPtpwvXo5l6GjJmOnODVBJFygpdeE,5
-weac-2.4.1.dist-info/RECORD,,