summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.txt5
-rw-r--r--html/encyclopedia/chemistry.html56
-rw-r--r--html/encyclopedia/physics.html58
3 files changed, 80 insertions, 39 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fd338e4..ddf4dfe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+# 50
+
+* encyclopedia: Update chemistry page;
+* encyclopedia: Update physics page;
+
# 4F
* Remove duplicate entries in navigation bar;
diff --git a/html/encyclopedia/chemistry.html b/html/encyclopedia/chemistry.html
index 6d4acea..c106c43 100644
--- a/html/encyclopedia/chemistry.html
+++ b/html/encyclopedia/chemistry.html
@@ -11,6 +11,7 @@
<p class="pageTitle">Leksikon<sub> Kemi</sub></p>
<div class="section" id="measures-and-units">
<p class="large">Mål og Enheder</p>
+ <p class="small">Jf. <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens mål og enhedder</a>.</p>
<table>
<tr>
<th>Mål</th>
@@ -31,7 +32,7 @@
<th colspan="4">Afledte Mål</th>
</tr>
<tr>
- <td>molarkoncentration</td>
+ <td>stofmængdekoncentration</td>
<td class="math">\(c_i\)</td>
<td>mol pr. kubikmeter</td>
<td class="math">\(\frac{mol}{m^3}\)</td>
@@ -43,36 +44,25 @@
<td class="math">\(\frac{kg}{mol}\)</td>
</tr>
<tr>
- <td>massebrøk</td>
- <td class="math">\(w_i\)</td>
- <td>kilogram pr. kilogram</td>
- <td class="math">\(1\)</td>
- </tr>
- <tr>
<td>massekoncentration</td>
<td class="math">\(\rho_i\)</td>
<td>kilogram pr. kubikmeter</td>
<td class="math">\(\frac{kg}{m^3}\)</td>
</tr>
- <tr>
- <td>volumenbrøk</td>
- <td class="math">\(\phi_i\)</td>
- <td>kubikmeter pr. kubikmeter</td>
- <td class="math">\(1\)</td>
- </tr>
</table>
- <p class="graphicText">Jf. <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens mål og enhedder</a>.</p>
- <p>Variante mål:</p>
+ <p>Mål uden enheder:</p>
<table>
<tr>
<th>Mål</th>
<th>Symbol</th>
- <th>Afledt af</th>
</tr>
<tr>
- <td>atommasse</td>
- <td class="math">\(A_r\)</td>
- <td>masse</td>
+ <td>massebrøk</td>
+ <td class="math">\(w_i\)</td>
+ </tr>
+ <tr>
+ <td>volumenbrøk</td>
+ <td class="math">\(\phi_i\)</td>
</tr>
</table>
<p>Mål med variante enheder:</p>
@@ -83,6 +73,11 @@
<th>Symboler<sub> af enheder</sub></th>
</tr>
<tr>
+ <td>stofmængdekoncentration</td>
+ <td>molær</td>
+ <td class="math">\(M\)</td>
+ </tr>
+ <tr>
<td rowspan="2">masse</td>
<td>gram</td>
<td class="math">\(g\)</td>
@@ -91,10 +86,31 @@
<td>dalton</td>
<td class="math">\(u\)</td>
</tr>
+ <tr>
+ <td>volumen</td>
+ <td>liter</td>
+ <td class="math">\(L\)</td>
+ </tr>
</table>
+ <p>Variante mål:</p>
+ <table>
+ <tr>
+ <th>Mål</th>
+ <th>Symbol</th>
+ <th>Afledt af</th>
+ </tr>
+ <tr>
+ <td>atommasse</td>
+ <td class="math">\(A_r\)</td>
+ <td>masse</td>
+ </tr>
+ </table>
+ <p class="math">\(1\ M=1\ \frac{mol}{L}=10^3\ \frac{mol}{m^3}\)</p>
<br />
<p class="math">\(1\ g=\frac{1}{1000}\ kg\)</p>
<p class="math">\(1\ u=m_u\)</p>
+ <br />
+ <p class="math">\(1\ L=\frac{1}{10^3}\ m^3\)</p>
</div>
<div class="section" id="formulas">
<p class="large">Formler</p>
@@ -114,6 +130,7 @@
</div>
<div class="section" id="constants">
<p class="large">Konstanter</p>
+ <p class="small">Jf. <a href="/html/encyclopedia/physics.html#constants">fysikkens konstanter</a>.</p>
<table>
<tr>
<th>Navn</th>
@@ -132,7 +149,6 @@
<td class="math">\(N_A\)</td>
</tr>
</table>
- <p class="graphicText">Jf. <a href="/html/encyclopedia/physics.html#constants">fysikkens konstanter</a>.</p>
<p class="math">\(M_u=\frac{M(_6^{12}C)}{12}=m_uN_a \approx \frac{999\ 999\ 999\ 65}{10^{14}}\ \frac{kg}{mol}\)</p>
<p class="math">\(m_u=\frac{m(_6^{12}C)}{12} \approx \frac{16\ 605\ 390\ 666}{10^{37}}\ kg=1\ u\)</p>
<p class="math">\(N_A=602\ 214\ 076 \cdot 10^{15}\ mol^{-1}\)</p>
diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html
index e7edebf..7c00842 100644
--- a/html/encyclopedia/physics.html
+++ b/html/encyclopedia/physics.html
@@ -118,6 +118,12 @@
<td class="math">\(\frac{J}{K \cdot kg}\)</td>
</tr>
<tr>
+ <td>flux</td>
+ <td class="math">\(i\)</td>
+ <td>watt pr. kvadratmeter</td>
+ <td class="math">\(\frac{W}{m^2}\)</td>
+ </tr>
+ <tr>
<td>volumen</td>
<td class="math">\(V\)</td>
<td>kubikmeter</td>
@@ -136,6 +142,35 @@
<td class="math">\(\frac{kg}{m^3}\)</td>
</tr>
</table>
+ <p>Mål uden enheder:</p>
+ <table>
+ <tr>
+ <th>Mål</th>
+ <th>Symbol</th>
+ </tr>
+ <tr>
+ <td>strålingsfaktor</td>
+ <td class="math">\(\varepsilon\)</td>
+ </tr>
+ </table>
+ <p>Mål med variante enheder:</p>
+ <table>
+ <tr>
+ <th>Mål</th>
+ <th>Enheder</th>
+ <th>Symboler<sub> af enheder</sub></th>
+ </tr>
+ <tr>
+ <td>temperatur</td>
+ <td>grader celsius</td>
+ <td class="math">\({}^{\circ}C\)</td>
+ </tr>
+ <tr>
+ <td>hastighed</td>
+ <td>kilometer pr. time</td>
+ <td class="math">\(\frac{km}{h}\)</td>
+ </tr>
+ </table>
<p>Variante mål:</p>
<table>
<tr>
@@ -169,24 +204,6 @@
<td>distance</td>
</tr>
</table>
- <p>Mål med variante enheder:</p>
- <table>
- <tr>
- <th>Mål</th>
- <th>Enheder</th>
- <th>Symboler<sub> af enheder</sub></th>
- </tr>
- <tr>
- <td>temperatur</td>
- <td>grader celsius</td>
- <td class="math">\({}^{\circ}C\)</td>
- </tr>
- <tr>
- <td>hastighed</td>
- <td>kilometer pr. time</td>
- <td class="math">\(\frac{km}{h}\)</td>
- </tr>
- </table>
<p class="math">\(1\ {}^{\circ}C=\frac{5463}{20}\ K\)</p>
<br />
<p class="math">\(1\ \frac{km}{h}=\frac{5}{18}\ \frac{m}{s}\)</p>
@@ -214,7 +231,10 @@
<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">\(i={\sigma}T^4{\varepsilon}\)</p>
+ <br />
<p class="math">\(P=\frac{E}{t}\)</p>
+ <p class="math">\(P=iA\)</p>
<br />
<p class="math">\(p=\frac{F}{A}\)</p>
<br />
@@ -224,6 +244,7 @@
</div>
<div class="section" id="constants">
<p class="large">Konstanter</p>
+ <p class="small">Jf. <a href="/html/encyclopedia/mathematics.html#constants">matematikkens konstanter</a>.</p>
<table>
<tr>
<th>Navn</th>
@@ -254,7 +275,6 @@
<td class="math">\(\sigma\)</td>
</tr>
</table>
- <p class="graphicText">Evt. se <a href="/html/encyclopedia/mathematics.html#constants">matematikkens konstanter</a>.</p>
<p class="math">\(c=299\ 792\ 458\ \frac{m}{s}\)</p>
<p class="math">\(e=\frac{1\ 602\ 176\ 634}{10^{28}}\ C\)</p>
<p class="math">\(G \approx \frac{66\ 743}{10^{15}}\ \frac{m^3}{kg \cdot s^2}\)</p>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:33:01 +0100