Works on future

* plot parameters

* typo correction in dir name

* added cfl hint to test

* test

* fix test

* New comment to fix issue 12

* test workflow

* update pytest

* update pytest

* added uv

* correction in stress formula

* type hint and formatting

* formatting again

* black formatting

* more work around blondel

* error correction

* minor correction

* updated venv

* added catenary model

* updated example script with catenary

* updated example script with catenary

* formatting and namespace renaming

* pyproject.toml

* fix typos

* formating

* Pyntb version change and propagation

* Auto formatting

Author: ecieren

create_uvenv

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# -- dir for all envs
+ENV_DIR=/home/${USER}/ENV
+mkdir -p $ENV_DIR
+
+# -- current env with link
+VENV=${ENV_DIR}/pallas-slenderpy-uv
+VLNK=.venv
+ln -sf $VENV $VLNK
+uv venv $VENV --python-preference=system # --python 3.11
+source $VENV/bin/activate
+# .venv\Scripts\activate
+
+# -- upgrade pip
+uv pip install --upgrade pip
+
+# -- install local package
+rm -rf build
+uv pip install .[examples,dev]
+
+# -- end text
+echo "---"
+echo -e "\e[1mto start the environment, type :\e[0m"
+echo "source ${VENV}/bin/activate"
+echo ""
+echo -e "\e[1mto stop the environment, type :\e[0m"
+echo "deactivate"

examples/create_env create_virtualenvexamples/create_env renamed to create_virtualenv

@@ -1,29 +1,22 @@
 #!/bin/bash
 
-# Run this in slenderpy/examples directory !
-
-
 # -- dir for all envs
 ENV_DIR=/home/${USER}/ENV
 mkdir -p $ENV_DIR
 
-
 # -- current env with link
-VENV=/home/${USER}/ENV/pallas-slenderpy
+VENV=${ENV_DIR}/pallas-slenderpy-virtualenv
 VLNK=.venv
 ln -sf $VENV $VLNK
 python3 -m venv $VENV
 source $VENV/bin/activate
 
-
 # -- upgrade pip
 python3 -m pip install --upgrade pip
 
-
 # -- install local package
-cd ..
-pip install .[examples,test]
-
+rm -rf build
+pip install .[examples,dev]
 
 # -- end text
 echo "---"

doc/conf.py

@@ -16,11 +16,11 @@
 # -- Project information -----------------------------------------------------
 
 project = "slenderpy"
-copyright = "2024, RTE & Eurobios Mews Labs"
-author = "Eurobios Mews Labs"
+copyright = "2025, RTE & Mews Labs"
+author = "Mews Labs"
 
 # The full version, including alpha/beta/rc tags
-release = "2024.0.0"
+release = "2025.0.0"
 
 # -- General configuration ---------------------------------------------------
 

examples/cable_static.py

@@ -1,6 +1,9 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
+from slenderpy.future._constant import _GRAVITY
+from slenderpy.future.cable.static import blondel
+from slenderpy.future.cable.static import catenary
 from slenderpy.future.cable.static import nleq
 from slenderpy.future.cable.static import parabolic
 
@@ -9,15 +12,16 @@ def _aster570():
     linm = 1.571
     axs = 3.653e07
     rts = 1.853e05
-    return linm, axs, rts
+    alpha = 2.300e-05
+    return linm, axs, rts, alpha
 
 
-def parabolic_vs_nleq():
+def parabolic_vs_catenary_vs_nleq():
     """Check differences between parabolic and nleq models when everything
     except mechanical tension is set."""
 
     # conductor properties
-    linm, axs, rts = _aster570()
+    linm, axs, rts, _ = _aster570()
 
     # span properties
     lspan = 400
@@ -28,10 +32,14 @@ def parabolic_vs_nleq():
     xa1 = np.linspace(0, lspan * np.ones_like(tension), 401)
     ya1 = parabolic.shape(xa1, lspan, tension, sld, linm)
 
+    # position (catenary)
+    xa2 = np.array(xa1)
+    ya2 = catenary.shape(xa1, lspan, tension, sld, linm)
+
     # position (nleq)
     lcab, lve = nleq.solve(lspan, tension, sld, linm, axs, rtol=1.0e-99, maxiter=2)
     s = np.linspace(0, lcab * np.ones_like(tension), 401)
-    xa2, ya2 = nleq.shape(s, lspan, tension, sld, linm, axs, lcab=lcab, lve=lve)
+    xa3, ya3 = nleq.shape(s, lspan, tension, sld, linm, axs, lcab=lcab, lve=lve)
 
     # sag-to-length ratio
     ratio = nleq.sag(lspan, tension, sld, linm, axs) / np.sqrt(lspan**2 + sld**2)
@@ -44,7 +52,8 @@ def parabolic_vs_nleq():
         plt.plot(
             xa1[:, n], ya1[:, n], c=f"C{n}", ls="-", label=f"parabolic r={ratio[n]:.3f}"
         )
-        plt.plot(xa2[:, n], ya2[:, n], c=f"C{n}", ls="--", label="nleq")
+        plt.plot(xa2[:, n], ya2[:, n], c=f"C{n}", ls="--", label="catenary")
+        plt.plot(xa3[:, n], ya3[:, n], c=f"C{n}", ls=":", lw=2, label="nleq")
     plt.grid(True)
     plt.xlabel("$x$ (m)")
     plt.ylabel("$y$ (m)")
@@ -56,13 +65,11 @@ def parabolic_vs_nleq():
 def compare_all(lspan=400.0, ratio=0.25, sld=0.0):
     """Quick plot script to make visual check"""
 
-    # NB: we can see that the sag/argsag functions in cable are max chord and not sag ...
-
     # lspan = 100.
     # ratio = 0.01
     # sld = 10.
 
-    linm, axs, rts = _aster570()
+    linm, axs, rts, _ = _aster570()
     tension = ratio * rts
 
     # [parabolic] compute cable stuff
@@ -97,32 +104,37 @@ def compare_all(lspan=400.0, ratio=0.25, sld=0.0):
     sx_ = np.max(nleq.stress(1001, lspan, tension, sld, linm, axs, lcab=lcab, lve=lve))
     sa_ = nleq.mean_stress(lspan, tension, sld, linm, axs, lcab=lcab, lve=lve)
 
-    # [old] [catenary]
-    from slenderpy.future._constant import _GRAVITY
-    import slenderpy.cable as sc
+    # [catenary] compute cable stuff
 
     # static shape
-    s = np.linspace(0, 1, 101)
-    a = tension / (linm * _GRAVITY)
-    y = sc._alts(s, lspan, a, sld)
-
+    xc = np.linspace(0, 1, 101)
+    yc = catenary.shape(xc, lspan, tension, sld, linm)
+    # cable length
+    lc = catenary.length(lspan, tension, sld, linm)
+    # cable sag
+    sagc = catenary.sag(lspan, tension, sld, linm)
     # sag points
-    xc = sc.argsag(lspan, a, sld) * lspan
-    yc = sc._alts(xc / lspan, lspan, a, sld)
+    xu = catenary.argsag(lspan, tension, sld, linm)
+    yu = catenary.shape(xu, lspan, tension, sld, linm)
+    # stress
+    nn = float("nan")
+    # > not implemented yet
 
     # [print]
     print(f"[all] flat length  {lspan:.6f}")
     print(f"[all] 3dim length  {np.sqrt(lspan**2 + sld**2):.6f}")
     print(f"[pbl] cable length {length:.6f}")
-    print(f"[cat] cable length {sc.catenary_length(lspan, a, sld):.6f}")
+    print(f"[cat] cable length {lc:.6f}")
     print(f"[nle] cable len 0  {lcab:.6f}")
     print(f"[nle] cable len 1  {length_:.6f}")
     print(f"[pbl] sag          {sag:.6f}")
-    print(f"[cat] sag          {sc.sag(lspan, a, sld):.6f}")
+    print(f"[cat] sag          {sagc:.6f}")
     print(f"[nle] sag          {sag_:.6f}")
     print(f"[pbl] max stress   {sx:.6f}")
+    print(f"[cat] max stress   {nn:.6f}")
     print(f"[nle] max stress   {sx_:.6f}")
     print(f"[pbl] avg stress   {sa:.6f}")
+    print(f"[cat] avg stress   {nn:.6f}")
     print(f"[nle] avg stress   {sa_:.6f}")
 
     # [plot]
@@ -132,8 +144,8 @@ def compare_all(lspan=400.0, ratio=0.25, sld=0.0):
     plt.plot([xs, xs], [ys, xs * sld / lspan], ls="--", c="C0")
     plt.plot(xn, yn, label="NL eq.", c="C1")
     plt.plot([xt, xt], [yt, xt * sld / lspan], ls="--", c="C1")
-    plt.plot(s * lspan, y, c="C2", label="catenary")
-    plt.plot([xc, xc], [yc, xc * sld / lspan], ls="--", c="C2")
+    plt.plot(xc, yc, c="C2", label="catenary")
+    plt.plot([xu, xu], [yu, xu * sld / lspan], ls="--", c="C2")
     plt.legend()
     plt.xlabel("$x$")
     plt.ylabel("$y$")
@@ -147,13 +159,62 @@ def compare_all(lspan=400.0, ratio=0.25, sld=0.0):
     return
 
 
+def test_blondel():
+
+    # conductor properties
+    linm, axs, rts, alpha = _aster570()
+
+    # span properties
+    lspan = 400
+    tensions = rts * np.array([0.02, 0.05, 0.1, 0.2])
+    slds = np.array([0.0, 20.0, 50.0, 100.0])
+
+    # temperatures
+    Tref = 15.0
+    Tend = Tref + np.linspace(-20, +80, 101)
+    dt = Tend - Tref
+
+    #
+    fig, ax = plt.subplots(nrows=len(slds), ncols=len(tensions))
+    for i in range(len(slds)):
+        for j in range(len(tensions)):
+
+            sld = slds[i]
+            tension = tensions[j]
+
+            # compute new tensions
+            w = linm * _GRAVITY * lspan
+            tb = blondel.tension(w, tension, Tref, Tend, axs, alpha)
+            tp = parabolic.thermal_expansion_tension(
+                lspan, tension, sld, Tref, Tend, linm, alpha
+            )
+            tn = nleq.thermal_expansion_tension(
+                lspan, tension, sld, Tref, Tend, linm, axs, alpha
+            )
+
+            ax[i, j].plot(dt, tb - tension, label="blondel")
+            ax[i, j].plot(dt, tp - tension, label="parabolic")
+            ax[i, j].plot(dt, tn - tension, label="nleq")
+            ax[i, j].grid(True)
+            ax[i, j].set_title(f"With H={tension/1000.} kN and h={sld} m")
+
+    ax[-1, -1].legend()
+    for i in range(len(slds)):
+        ax[i, 0].set_ylabel("Tension difference (N)")
+    for j in range(len(tensions)):
+        ax[-1, j].set_xlabel("Temperature difference (K)")
+
+
 if __name__ == "__main__":
     import matplotlib
 
     matplotlib.use("TkAgg")
     plt.close("all")
 
-    parabolic_vs_nleq()
+    parabolic_vs_catenary_vs_nleq()
+
     compare_all(lspan=400.0, ratio=0.25, sld=10.0)
     print()
     compare_all(lspan=100.0, ratio=0.01, sld=15.0)
+    #
+    test_blondel()

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=40.8.0",
+    "setuptools>=68.0.0",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -22,8 +22,8 @@ dependencies = [
     "matplotlib >= 3.3.2",
     "numpy >= 1.19.0",
     "pandas >= 1.1.3",
-    "pyntb > 2024.0.1",
-    "scipy >= 1.5.2",
+    "pyntb >= 2025.0.1",
+    "scipy >= 1.7.0",
     "tqdm >= 4.58.0",
     "xarray >= 0.16.2",
 ]
@@ -34,7 +34,15 @@ examples = [
 ]
 test = [
     "pylint",
-    "pytest", 
+    "pytest",
+]
+lint = [
+    "black ~= 25.1.0",
+    "mypy ~= 1.13.0",
+    "ruff ~= 0.8.0"
+]
+dev = [
+    "slenderpy[test,lint]",
 ]
 
 [project.urls]

src/slenderpy/_cable_utils.py

@@ -6,6 +6,7 @@
 import scipy.interpolate
 import scipy.sparse
 from scipy.optimize import brenth
+
 from slenderpy import fdm_utils as fdmu
 
 

src/slenderpy/beam.py

@@ -5,6 +5,7 @@
 import numpy as np
 import scipy as sp
 from scipy.optimize import newton
+
 from slenderpy import _cable_utils as cbu
 from slenderpy import _progress_bar as spb
 from slenderpy import fdm_utils as fdu