Merge branch '14-1' into 2024

TeachBooks · Dec 2, 2024 · c61f669 · c61f669
2 parents 09f4c76 + 899367f
commit c61f669
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 7 deletions.
diff --git a/book/_config.yml b/book/_config.yml
@@ -122,7 +122,7 @@ parse:
       ||Monday|Tuesday|Wednesday|Thursday|Friday|Upcoming homework|
       |:-:|:-:|:-:|:-:|:--:|:-:|:-:|
       |Homework deadlines ||[Prepare for exam statically indeterminate structure and continuum mechanics](homework15.2) <br>{bdg-primary}`New content`<br>{bdg-secondary}`Prerequisites`||||To be provided|
-      |Class activities||[Exam statically indeterminate structure and continuum mechanics](exam2) <br>{bdg-primary-line}`New content` <br> {bdg-secondary-line}`Prerequisites`||||
+      |Class activities||[Exam statically indeterminate structure and continuum mechanics](exam2) <br>{bdg-primary-line}`New content` <br> {bdg-secondary-line}`Prerequisites`||[Review exam assignment 2 statically indeterminate structures and assignment 1 continuum mechanics](lesson15.2)<br>{bdg-primary-line}`New content` <br> {bdg-secondary-line}`Prerequisites`||
     week16: "To be provided"
     week17: "To be provided"
     week18: "To be provided"

diff --git a/book/_toc.yml b/book/_toc.yml
@@ -298,6 +298,7 @@ parts:
     sections:
     - file: week_15/homework/intro
     - file: week_15/session/intro
+    - file: week_15/session_2/intro
 
 - caption: Miscellaneous
   chapters:

diff --git a/book/week_10/session/intro.md b/book/week_10/session/intro.md
@@ -1,4 +1,4 @@
-```{index} Static indeterminancy; Exam
+```{index} Static indeterminate structures; Exam assignment
 ```
 
 (exam1)=

diff --git a/book/week_11/session_1/intro.ipynb b/book/week_11/session_1/intro.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "```{index} Static indeterminancy; Exam discussion\n",
+    "```{index} Static indeterminate structures; Exam assignment\n",
     "```\n",
     "```{index} Transformations; Class exercise using Mohr's circle and analytical formulas\n",
     "```\n",
@@ -13,7 +13,7 @@
     "(lesson11.1)=\n",
     "# Lesson November 11th\n",
     "\n",
-    "Today we'll discuss the results of the first [exam assignment on Statically indeterminate structures](exam1). Furthermore, it's demonstrated how you to use the displacement method.\n",
+    "Today we'll discuss the results of the first [exam assignment on Statically indeterminate structures](exam1).\n",
     "\n",
     "## Results first exam assignment on Statically indeterminate structures\n",
     "\n",

diff --git a/book/week_15/session/intro.md b/book/week_15/session/intro.md
@@ -1,9 +1,8 @@
-```{index} Continuum mechanics; Exam
+```{index} Static indeterminate structures; Exam assignment
 ```
-```{index} Static indeterminancy; Exam 2
+```{index} Continuum mechanics; Exam assignment
 ```
 
-
 (exam2)=
 # Exam Tuesday December 10th
 

diff --git a/book/week_15/session_2/intro.ipynb b/book/week_15/session_2/intro.ipynb
@@ -0,0 +1,41 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "```{index} Static indeterminate structures; Exam assignment\n",
+    "```\n",
+    "```{index} Continuum mechanics; Exam assignment\n",
+    "```\n",
+    "\n",
+    "(lesson15.2)=\n",
+    "# Lesson December 12th\n",
+    "\n",
+    "Today we'll discuss the results of the first [exam assignment 2 on Statically indeterminate structures and exam assignment 1 on Continuum mechanics](exam2).\n",
+    "\n"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "base",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.18"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}