Merge pull request #287 from robbievanleeuwen/composite-results-changes

Composite results changes
robbievanleeuwen · Sep 25, 2023 · 35a7b65 · 35a7b65
2 parents 2d6248f + 8e5d418
commit 35a7b65
Show file tree

Hide file tree

Showing 8 changed files with 2,010 additions and 276 deletions.
diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -1,5 +1,5 @@
 pip==23.1.2
 nox==2023.4.22
-nox-poetry==1.0.2
+nox-poetry==1.0.3
 poetry==1.5.1
 virtualenv==20.23.0
diff --git a/docs/examples/geometry/section_library.ipynb b/docs/examples/geometry/section_library.ipynb
@@ -442,9 +442,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ei = sec.get_ic()  # TODO: fix when I change this!\n",
-    "i_eff = ei[0] / concrete.elastic_modulus\n",
-    "print(f\"I_eff = {i_eff:.3e} mm6\")\n",
+    "ei = sec.get_eic(e_ref=concrete)\n",
+    "print(f\"I_eff = {ei[0]:.3e} mm6\")\n",
     "print(f\"I_rec = {(300 * 600**3 / 12):.3e} mm6\")"
    ]
   }

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,7 +79,7 @@ ipywidgets = "^8.0.6"
 isort = "^5.12.0"
 nbconvert = "==7.4.0"  # 7.5.0 requires pandoc >2.14.2 (not in RTD or ubuntu 22.04)
 nbsphinx = "^0.9.2"
-notebook = "^6.5.4"
+notebook = "^7.0.4"
 pep8-naming = "^0.13.3"
 pre-commit = "^3.3.3"
 pre-commit-hooks = "^4.4.0"