weac 2.4.0__tar.gz → 2.5.0__tar.gz

{weac-2.4.0 → weac-2.5.0}/CITATION.cff

@@ -8,12 +8,15 @@ authors:
 - family-names: "Weissgraeber"
   given-names: "Philipp"
   orcid: "https://orcid.org/0000-0001-8320-8672"
-version: 2.4.0
+version: 2.5.0
 date-released: 2021-12-30
 identifiers:
   - description: Collection of archived snapshots of all versions of WEAC
     type: doi
     value: 10.5281/zenodo.5773113
+  - description: Release v2.4 for the analysis of slope-normal and vertical PST boundary conditions
+    type: doi
+    value: 10.5281/zenodo.10555144
   - description: Release v2.2 with consistent coordinate systems
     type: doi
     value: 10.5281/zenodo.5907134

{weac-2.4.0 → weac-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weac
-Version: 2.4.0
+Version: 2.5.0
 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
@@ -274,9 +277,9 @@ See the [open issues](https://github.com/2phi/weac/issues) for a list of propose
 <!-- 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.4.0 → weac-2.5.0}/README.md

@@ -85,7 +85,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:
@@ -189,15 +189,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
@@ -250,9 +253,9 @@ See the [open issues](https://github.com/2phi/weac/issues) for a list of propose
 <!-- 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.4.0 → weac-2.5.0}/pyproject.toml

@@ -1,3 +1,6 @@
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.ruff]
+ignore = ["E741"]

{weac-2.4.0 → weac-2.5.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = weac
-version = 2.4.0
+version = 2.5.0
 author = 2phi GbR
 author_email = mail@2phi.de
 description = Weak layer anticrack nucleation model

{weac-2.4.0 → weac-2.5.0}/weac/__init__.py

@@ -11,7 +11,7 @@ from weac.inverse import Inverse
 from weac import plot
 
 # Version
-__version__ = '2.4.0'
+__version__ = '2.5.0'
 
 # Public names
 __all__ = [

{weac-2.4.0 → weac-2.5.0}/weac/eigensystem.py

@@ -90,7 +90,7 @@ class Eigensystem:
         Describes the stiffnesses of weak-layer and slab.
     """
 
-    def __init__(self, system='pst-'):
+    def __init__(self, system='pst-', touchdown=False):
         """
         Initialize eigensystem with user input.
 
@@ -114,41 +114,48 @@ class Eigensystem:
         self.system = system    # 'pst-', '-pst', 'vpst-', '-vpst', 'skier', 'skiers'
 
         # Initialize weak-layer attributes that will be filled later
-        self.weak = False       # Weak-layer properties dictionary
-        self.t = False          # Weak-layer thickness (mm)
-        self.kn = False         # Weak-layer compressive stiffness
-        self.kt = False         # Weak-layer shear stiffness
-        self.tc = False         # Weak-layer collapse height (mm)
+        self.weak = False           # Weak-layer properties dictionary
+        self.t = False              # Weak-layer thickness (mm)
+        self.kn = False             # Weak-layer compressive stiffness
+        self.kt = False             # Weak-layer shear stiffness
 
         # Initialize slab attributes
-        self.p = 0              # Surface line load (N/mm)
-        self.slab = False       # Slab properties dictionary
-        self.k = False          # Slab shear correction factor
-        self.h = False          # Total slab height (mm)
-        self.zs = False         # Z-coordinate of slab center of gravity (mm)
-        self.phi = False        # Slab inclination (°)
-        self.A11 = False        # Slab extensional stiffness
-        self.B11 = False        # Slab bending-extension coupling stiffness
-        self.D11 = False        # Slab bending stiffness
-        self.kA55 = False       # Slab shear stiffness
-        self.K0 = False         # Stiffness determinant
+        self.p = 0                  # Surface line load (N/mm)
+        self.slab = False           # Slab properties dictionary
+        self.k = False              # Slab shear correction factor
+        self.h = False              # Total slab height (mm)
+        self.zs = False             # Z-coordinate of slab center of gravity (mm)
+        self.phi = False            # Slab inclination (°)
+        self.A11 = False            # Slab extensional stiffness
+        self.B11 = False            # Slab bending-extension coupling stiffness
+        self.D11 = False            # Slab bending stiffness
+        self.kA55 = False           # Slab shear stiffness
+        self.K0 = False             # Stiffness determinant
 
         # Inizialize eigensystem attributes
-        self.ewC = False        # Complex eigenvalues
-        self.ewR = False        # Real eigenvalues
-        self.evC = False        # Complex eigenvectors
-        self.evR = False        # Real eigenvectors
-        self.sC = False         # Stability shift of complex eigenvalues
-        self.sR = False         # Stability shift of real eigenvalues
+        self.ewC = False            # Complex eigenvalues
+        self.ewR = False            # Real eigenvalues
+        self.evC = False            # Complex eigenvectors
+        self.evR = False            # Real eigenvectors
+        self.sC = False             # Stability shift of complex eigenvalues
+        self.sR = False             # Stability shift of real eigenvalues
 
         # Initialize touchdown attributes
-        self.touchdown = False  # Flag whether touchdown is possible
-        self.lC = False         # Minimum length of substratum contact (mm)
-        self.lS = False         # Maximum span between bedded and touchdown (mm)
-        self.ratio = False      # Stiffness ratio of collalpsed to uncollapsed weak-layer
-        self.beta = False       # Ratio of slab to bedding stiffness
-
-    def set_foundation_properties(self, t=30, cf=0.5, E=0.25, nu=0.25, update=False):
+        self.touchdown = touchdown  # Flag whether touchdown is possible
+        self.a = False              # Cracklength
+        self.tc = False             # Weak-layer collapse height (mm)
+        self.ratio = False          # Stiffness ratio of collapsed to uncollapsed weak-layer
+        self.betaU = False          # Ratio of slab to bedding stiffness (uncollapsed)
+        self.betaC = False          # Ratio of slab to bedding stiffness (collapsed)
+        self.mode = False           # Touchdown-mode can be either A, B, C or D
+        self.td = False             # Touchdown length
+
+    def set_foundation_properties(
+            self,
+            t: float = 10.0,
+            E: float = 0.25,
+            nu: float = 0.25,
+            update: bool = False):
         """
         Set material properties and geometry of foundation (weak layer).
 
@@ -169,7 +176,6 @@ class Eigensystem:
         """
         # Geometry
         self.t = t              # Weak-layer thickness (mm)
-        self.tc = cf*self.t     # Weak-layer collapse height (mm)
 
         # Material properties
         self.weak = {
@@ -193,8 +199,6 @@ class Eigensystem:
             Columns are density (kg/m^3) and thickness (mm). One row
             corresponds to one layer. If entered as str, last split
             must be available in database.
-        phi : float
-            Inclination of the slab (degrees).
         C0 : float, optional
             Multiplicative constant of Young modulus parametrization
             according to Bergfeld et al. (2023). Default is 6.0.
@@ -229,9 +233,6 @@ class Eigensystem:
         # Poisson's ratio
         self.slab = np.vstack([layers.T, E, G, nu]).T
 
-        # Set beam inclination
-        self.phi = phi
-
         # Recalculate the fundamental system after properties have changed
         if update:
             self.calc_fundamental_system()
@@ -253,7 +254,7 @@ class Eigensystem:
         """
         self.p = p
 
-    def calc_foundation_stiffness(self, ratio=16):
+    def calc_foundation_stiffness(self):
         """Compute foundation normal and shear stiffness."""
         # Elastic moduli (MPa) under plane-strain conditions
         G = self.weak['E']/(2*(1 + self.weak['nu']))    # Shear modulus
@@ -263,9 +264,6 @@ class Eigensystem:
         self.kn = E/self.t                              # Normal stiffness
         self.kt = G/self.t                              # Shear stiffness
 
-        # Weak-layer stiffness increment factor for collapse
-        self.ratio = ratio
-
     def get_ply_coordinates(self):
         """
         Calculate ply (layer) z-coordinates.
@@ -479,146 +477,6 @@ class Eigensystem:
 
         return Fn, Ft
 
-    def calc_beta(self):
-        """
-        Calculate beta.
-
-        Returns
-        -------
-        beta : float
-            Weak-layer to slab stiffness relation factor.
-        """
-        # (Intact) weak-layer to slab stiffness relation factor
-        self.beta = (self.kn/(4*self.D11))**(1/4)
-
-    def calc_span_length(self):
-        """
-        Calculate span from layer and weak layer properties and load situation.
-
-        Returns
-        -------
-        lS : float
-            Span of the element between bedded element and touchdown for full touchdown.
-        """
-        def polynomial():
-            """
-            Calculate the coefficients of a sixth order polynomial equation.
-
-            Returns
-            -------
-            list
-                First coefficient for sixth order term,
-                second coefficient for fith order term and so on.
-            """
-            kA55 = self.kA55
-            D11 = self.D11
-            tc = self.tc
-            
-            a1 = kA55**2*kR1*kN1*q0
-            a2 = 6*kA55*(D11*kA55 + kR1*kR2)*kN1*q0
-            a3 = 30*D11*kA55*(kR1 + kR2)*kN1*q0
-            a4 = 24*D11*(2*kA55**2*kR1 + 3*D11*kA55*kN1 + 3*kR1*kR2*kN1)*q0
-            a5 = 72*D11*(D11*(kA55**2 + (kR1 + kR2)*kN1)*q0 \
-                + kA55*kR1*(2*kR2*q0 - kA55*kN1*tc))
-            a6 = 144*D11*kA55*(D11*(kR1 + kR2)*q0 \
-                - (D11*kA55 + kR1*kR2)*kN1*tc)
-            a7 = - 144*D11**2*kA55*(kR1 + kR2)*kN1*tc
-            return [a1,a2,a3,a4,a5,a6,a7]
-
-        # Get spring stiffnesses for adjacent segment with intact weak-layer
-        kR1 = self.calc_rot_spring(collapse=False)
-        kN1 = self.calc_trans_spring()
-        # Get spring stiffnesses for adjacent segment with collapsed weak-layer
-        kR2 = self.calc_rot_spring(collapse=True)
-        # Get surface normal load components
-        qn = self.get_weight_load(self.phi)[0]
-        pn = self.get_surface_load(self.phi)[0]
-        q0 = qn + pn
-        # Calculate positive real roots
-        pos = (np.roots(polynomial()).imag == 0) & (np.roots(polynomial()).real > 0)
-        self.lS = np.roots(polynomial())[pos].real[0]
-
-    def calc_contact_length(self):
-        """
-        Calculate segment length where max slab deflection equals tc.
-
-        Returns
-        -------
-        lC : float
-            Maximum length without substratum contact.
-        """
-        def polynomial():
-            """
-            Calculate the coefficients of a fourth order polynomial equation.
-
-            Returns
-            -------
-            list
-                First coefficient for fourth order term,
-                second coefficient for third order term and so on.
-            """
-            a1 = 1/(8*self.D11)*q0
-            a2 = 1/(2*kR1)*q0
-            a3 = 1/(2*self.kA55)*q0
-            a4 = 1/kN1*q0
-            a5 = -self.tc
-            return [a1,a2,a3,a4,a5]
-
-        # Get spring stiffnesses for adjacent segment intact intact weak-layer
-        kR1 = self.calc_rot_spring(collapse=False)
-        kN1 = self.calc_trans_spring()
-        # Get surface normal load components
-        qn = self.get_weight_load(self.phi)[0]
-        pn = self.get_surface_load(self.phi)[0]
-        q0 = qn + pn
-        # Calculate positive real roots
-        pos = (np.roots(polynomial()).imag == 0) & (np.roots(polynomial()).real > 0)
-        self.lC = np.roots(polynomial())[pos].real[0]
-
-    def calc_rot_spring(self, collapse=True):
-        """
-        Calculate rotational spring stiffness from layer properties.
-
-        Arguments
-        ---------
-        collapse : boolean
-            Indicates whether weak-layer is collapsed.
-
-        Returns
-        -------
-        kR : float
-            Rotational spring stiffness (Nmm/mm/rad).
-        """
-        # get ratio for foundation stiffness after collapse
-        if collapse:
-            ratio = self.ratio
-        else:
-            ratio = 1
-        # calc spring stiffness
-        kR = self.D11*self.beta*ratio**(1/4)
-
-        return kR
-
-    def calc_trans_spring(self):
-        """
-        Calculate translational spring stiffness from layer properties.
-
-        Returns
-        -------
-        kN : float
-            Translational spring stiffness (N/mm^2).
-        """
-        # calc translational spring stiffness for bedded euler-bernoulli-beam
-        kN = 2*self.D11*self.beta**3
-
-        return kN
-
-    def calc_touchdown_system(self):
-        """Calculate the lenghts for touchdown evaluation"""
-        self.calc_beta()
-        self.calc_span_length()
-        self.calc_contact_length()
-
     def zh(self, x, l=0, bed=True):
         """
         Compute bedded or free complementary solution at position x.

{weac-2.4.0 → weac-2.5.0}/weac/layered.py

@@ -2,14 +2,15 @@
 
 # Project imports
 from weac.mixins import FieldQuantitiesMixin
+from weac.mixins import SlabContactMixin
 from weac.mixins import SolutionMixin
 from weac.mixins import AnalysisMixin
 from weac.mixins import OutputMixin
 from weac.eigensystem import Eigensystem
 
 
-class Layered(FieldQuantitiesMixin, SolutionMixin, AnalysisMixin,
-              OutputMixin, Eigensystem):
+class Layered(FieldQuantitiesMixin, SlabContactMixin, SolutionMixin,
+              AnalysisMixin, OutputMixin, Eigensystem):
     """
     Layered beam on elastic foundation model application interface.
 
@@ -20,7 +21,7 @@ class Layered(FieldQuantitiesMixin, SolutionMixin, AnalysisMixin,
     analysis from AnalysisMixin().
     """
 
-    def __init__(self, system='pst-', layers=None, phi=0):
+    def __init__(self, system='pst-', layers=None, touchdown=False):
         """
         Initialize model with user input.
 
@@ -38,10 +39,9 @@ class Layered(FieldQuantitiesMixin, SolutionMixin, AnalysisMixin,
             to one layer. Default is [[240, 200], ].
         """
         # Call parent __init__
-        super().__init__(system=system)
+        super().__init__(system=system, touchdown=touchdown)
 
         # Set material properties and set up model
-        self.set_beam_properties(layers if layers else [[240, 200], ], phi)
+        self.set_beam_properties(layers if layers else [[240, 200], ])
         self.set_foundation_properties()
         self.calc_fundamental_system()
-        self.calc_touchdown_system()