From 4f37c607ff55796b318df37718e06871365d3664 Mon Sep 17 00:00:00 2001 From: agyao2 Date: Tue, 17 Feb 2026 18:15:52 -0600 Subject: [PATCH 1/3] Documentation Adds warning and example links documentation w/ navbar and fixes all links on work and energy --- src/pages/about/docs.astro | 34 +++++++++++++++++++++++++++++ src/pages/dyn/work_and_energy.astro | 22 +++++++++---------- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/pages/about/docs.astro b/src/pages/about/docs.astro index b4edb2bde..0d94535e6 100644 --- a/src/pages/about/docs.astro +++ b/src/pages/about/docs.astro @@ -78,6 +78,8 @@ import Slideshow from "../../components/Slideshow.astro"; @@ -844,6 +846,38 @@ All titles should be done in sentence case. + +

+ Tag type: Warning +

+ Options: + + Example: + TEXT`/> + TEXT +

+ *For demonstration purposes, this links to a warning in the vectors page in dynamics. +

+ + + +

+ Tag type: Example +

+ Options: + + Example: + TEXT`/> + TEXT +

+ *For demonstration purposes, this links to an example in the vectors page in dynamics. +

+ +

Tag type: Regular

diff --git a/src/pages/dyn/work_and_energy.astro b/src/pages/dyn/work_and_energy.astro index 030119f0d..fecc5cadb 100644 --- a/src/pages/dyn/work_and_energy.astro +++ b/src/pages/dyn/work_and_energy.astro @@ -59,7 +59,7 @@ import Col from "../../components/Col.astro"

- Beginning with #ren-ec and generalizing it to one-dimensional displacement in the y-direction, the equation becomes: + Beginning with #ren-wc and generalizing it to one-dimensional displacement in the y-direction, the equation becomes:

@@ -105,7 +105,7 @@ import Col from "../../components/Col.astro"

- Since gravity only acts in one direction, we can simplify #ren-efp to: + Since gravity only acts in one direction, we can simplify #ren-efp to:

@@ -141,7 +141,7 @@ import Col from "../../components/Col.astro"

- Since the restoring force in a spring only acts in one direction, we can simplify #ren-efp to: + Since the restoring force in a spring only acts in one direction, we can simplify #ren-efp to:

@@ -238,12 +238,12 @@ import Col from "../../components/Col.astro"

- Using conservation of energy, and the fact that a vector dotted with itself equals its magnitude squared (see #rvi-eg), then: + Using conservation of energy, and the fact that a vector dotted with itself equals its magnitude squared (see #rvi-eg), then:

- Another perhaps less intuitive way is to begin with the work definition #ren-ef: + Another perhaps less intuitive way is to begin with the work definition #ren-wf:

@@ -290,14 +290,14 @@ import Col from "../../components/Col.astro"

- We start with the general expression #rem-eb: + We start with the general expression #rem-eb: where we integrate over the body with a location \(P\). We choose a point \(Q\) fixed to the body and - use #rkg-er to express the + use #rkg-er to express the velocity of \(P\) in terms of and \(\vec\omega\), giving @@ -317,7 +317,7 @@ import Col from "../../components/Col.astro" orthogonal distance to point \(P\) from the line through \(Q\) in direction , so - from #rem-ei we see that + from #rem-ei we see that the final integral above is the moment of inertia about the axis through @@ -327,13 +327,13 @@ import Col from "../../components/Col.astro"

- Skipping the derivation shown in #ren-ep, taking the last step with the integral: + Skipping the derivation shown in #ren-ek, taking the last step with the integral:

- +

where \(W\) is the work done by non-conservative forces. If non-conservative forces are not present, then it becomes conservation of energy. @@ -405,7 +405,7 @@ import Col from "../../components/Col.astro" - +

The rotation angle \(\theta\) is measured around the same From c14665509f3149ccde690a6d61265bc36fd95fc9 Mon Sep 17 00:00:00 2001 From: agyao2 Date: Wed, 18 Feb 2026 10:20:24 -0600 Subject: [PATCH 2/3] Typo fix Changes "wihtout" to without --- src/pages/dyn/work_and_energy.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/dyn/work_and_energy.astro b/src/pages/dyn/work_and_energy.astro index fecc5cadb..8d4806fcb 100644 --- a/src/pages/dyn/work_and_energy.astro +++ b/src/pages/dyn/work_and_energy.astro @@ -463,7 +463,7 @@ import Col from "../../components/Col.astro"

Work done by friction can be positive, zero, or negative.

- +
    @@ -608,4 +608,4 @@ import Col from "../../components/Col.astro" - \ No newline at end of file + From cb249746131199953d520ffc361deee078441004 Mon Sep 17 00:00:00 2001 From: agyao2 Date: Wed, 18 Feb 2026 10:27:24 -0600 Subject: [PATCH 3/3] Fix equation for work done by a moment Changes dtheta to dt --- src/pages/dyn/work_and_energy.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/dyn/work_and_energy.astro b/src/pages/dyn/work_and_energy.astro index 8d4806fcb..c57748bbc 100644 --- a/src/pages/dyn/work_and_energy.astro +++ b/src/pages/dyn/work_and_energy.astro @@ -501,7 +501,7 @@ import Col from "../../components/Col.astro" - +