diff options
| -rw-r--r-- | CHANGELOG.txt | 5 | ||||
| -rw-r--r-- | html/encyclopedia/chemistry.html | 6 | ||||
| -rw-r--r-- | html/encyclopedia/physics.html | 49 |
3 files changed, 30 insertions, 30 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d52935b..5d0b461 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +# 46 + +* encyclopedia: Update physics page; +* encyclopedia: Update chemistry page; + # 45 * encyclopedia: Update mathematics page; diff --git a/html/encyclopedia/chemistry.html b/html/encyclopedia/chemistry.html index 33c15e3..5c70343 100644 --- a/html/encyclopedia/chemistry.html +++ b/html/encyclopedia/chemistry.html @@ -14,9 +14,9 @@ <table> <tr> <th>Mål</th> - <th>Tegn<sub> af mål</sub></th> + <th>Symbol<sub> af mål</sub></th> <th>Enhed</th> - <th>Tegn<sub> af enhed</sub></th> + <th>Symbol<sub> af enhed</sub></th> </tr> <tr class="small"> <th colspan="4">Grundlæggende Mål</th> @@ -42,7 +42,7 @@ <table> <tr> <th>Mål</th> - <th>Tegn</th> + <th>Symbol</th> <th>Afledt af</th> </tr> <tr> diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html index a433994..780b7dc 100644 --- a/html/encyclopedia/physics.html +++ b/html/encyclopedia/physics.html @@ -14,9 +14,9 @@ <table> <tr> <th>Mål</th> - <th>Tegn<sub> af mål</sub></th> + <th>Symbol<sub> af mål</sub></th> <th>Enhed</th> - <th>Tegn<sub> af enhed</sub></th> + <th>Symbol<sub> af enhed</sub></th> </tr> <tr class="small"> <th colspan="4">Grundlæggende Mål</th> @@ -146,7 +146,7 @@ <table> <tr> <th>Mål</th> - <th>Tegn</th> + <th>Symbol</th> <th>Afledt af</th> </tr> <tr> @@ -169,48 +169,43 @@ <td class="math">\(Q\)</td> <td>energi</td> </tr> + <tr> + <td>bølgelængde</td> + <td class="math">\(\lambda\)</td> + <td>distance</td> + </tr> </table> - <p class="math">\(A = \frac{C}{s}\)</p> - <br /> - <p class="math">\(Hz = s ^ {-1}\)</p> - <br /> - <p class="math">\(J = \frac{kg \cdot m ^ 2}{s ^ 2}\)</p> - <p class="math">\(J = Nm\)</p> - <p class="math">\(J = Ws\)</p> - <br /> - <p class="math">\(N = \frac{kg \cdot m}{s ^ 2}\)</p> - <br /> - <p class="math">\(Pa = \frac{J}{m ^ 3}\)</p> - <p class="math">\(Pa = \frac{N}{m ^ 2}\)</p> - <br /> - <p class="math">\(W = \frac{J}{s}\)</p> </div> <div class="section" id="formulas"> <p class="large">Formler</p> - <p class="math">\(\rho = \frac{m}{V}\)</p> - <br /> + <p class="math">\(a = \frac{F}{m}\)</p> <p>På en planet:</p> <p class="math">\(g = \frac{Gm}{r ^ {2}}\)</p> <p>... hvori <i>r</i> er afstanden til planetens kerne.</p> <p class="math">\(g = \frac{981}{100} \frac{m}{s ^ 2}\)</p> <p>... er standard på Jorden.</p> <br /> + <p class="math">\(E = Fs\)</p> + <p class="math">\(E = Pt\)</p> + <p class="math">\(K = \frac{mv ^ {2}}{2}\)</p> + <p class="math">\(Q = CT = cmT\)</p> + <p>Gravitation:</p> + <p class="math">\(U = Fs = mgs\)</p> + <p>... hvori <i>F</i> er tyngdekraften og <i>g</i> er den lokale tyngeacceleration.</p> + <br /> <p class="math">\(F = ma\)</p> + <p class="math">\(F = \frac{E}{s}\)</p> <p>Gravtitation mellem to objekter:</p> <p class="math">\(F = \frac{Gm_{0}m_{1}}{r ^ {2}}\)</p> <p>... <i>m_0</i> og <i>m_1</i> er masserne af objekterne og <i>r</i> er distancen mellem centrene af de to objekter.</p> <br /> + <p class="math">\(P = \frac{E}{t}\)</p> + <br /> <p class="math">\(p = \frac{F}{A}\)</p> <br /> - <p class="math">\(P = \frac{E}{t}\)</p> + <p class="math">\(\lambda = \frac{v}{f}\)</p> <br /> - <p class="math">\(E = Fs\)</p> - <p class="math">\(E = Pt\)</p> - <p class="math">\(K = \frac{mv ^ {2}}{2}\)</p> - <p class="math">\(Q = CT = cmT\)</p> - <p>Gravitation:</p> - <p class="math">\(U = Fs = mgs\)</p> - <p>... hvori <i>F</i> er tyngdekraften og <i>g</i> er den lokale tyngeacceleration.</p> + <p class="math">\(\rho = \frac{m}{V}\)</p> </div> <div class="section" id="constants"> <p class="large">Konstanter</p> |