Skip to content

Commit

Permalink
Celsius
Browse files Browse the repository at this point in the history
  • Loading branch information
fabfab1 committed Feb 7, 2019
1 parent 0f9da47 commit 8b69262
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 42 deletions.
12 changes: 6 additions & 6 deletions docs/algorithms/algorithm_bibliography.html
Original file line number Diff line number Diff line change
Expand Up @@ -854,15 +854,15 @@ <h4> Algorithms: </h4>
<td colspan="4">
<table class="algo">
<tr>
<td>Thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Thermic difference in <a href="../units/celsius.html">Celsius</a></td>
<td>hours in <a href="../units/hr.html">hr</a></td>
</tr>
<tr>
<td><input type="text" name="var1" oninput="calc(this)" onkeyup="calc(this)"></td>
<td><input type="text" name="var2" oninput="calc(this)" onkeyup="calc(this)"></td>
</tr>
<tr>
<td>Remaining thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Remaining thermic difference in <a href="../units/celsius.html">Celsius</a></td>
</tr>
<tr>
<td><input type="text" name="result1" disabled="" data-op="(var2 > 12) ? 0 : var1 * (1 - (1/12) * var2)"></td>
Expand Down Expand Up @@ -1195,8 +1195,8 @@ <h4> Algorithms: </h4>
<b>Cornerstones&nbsp;2006&nbsp;133</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celcius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celsius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down Expand Up @@ -1475,8 +1475,8 @@ <h4> Algorithms: </h4>
<b>Wulff&nbsp;1966&nbsp;126</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celcius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celsius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down
12 changes: 6 additions & 6 deletions docs/algorithms/algorithm_materials.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ <h4> Algorithms: </h4>
<td colspan="4">
<table class="algo">
<tr>
<td>Thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Thermic difference in <a href="../units/celsius.html">Celsius</a></td>
<td>hours in <a href="../units/hr.html">hr</a></td>
</tr>
<tr>
<td><input type="text" name="var1" oninput="calc(this)" onkeyup="calc(this)"></td>
<td><input type="text" name="var2" oninput="calc(this)" onkeyup="calc(this)"></td>
</tr>
<tr>
<td>Remaining thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Remaining thermic difference in <a href="../units/celsius.html">Celsius</a></td>
</tr>
<tr>
<td><input type="text" name="result1" disabled="" data-op="(var2 > 12) ? 0 : var1 * (1 - (1/12) * var2)"></td>
Expand Down Expand Up @@ -742,8 +742,8 @@ <h4> Algorithms: </h4>
<b>Cornerstones&nbsp;2006&nbsp;133</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celcius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celsius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down Expand Up @@ -788,8 +788,8 @@ <h4> Algorithms: </h4>
<b>Wulff&nbsp;1966&nbsp;126</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celcius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celsius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down
12 changes: 6 additions & 6 deletions docs/algorithms/algorithm_position_in_process.html
Original file line number Diff line number Diff line change
Expand Up @@ -447,15 +447,15 @@ <h4> Algorithms: </h4>
<td colspan="4">
<table class="algo">
<tr>
<td>Thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Thermic difference in <a href="../units/celsius.html">Celsius</a></td>
<td>hours in <a href="../units/hr.html">hr</a></td>
</tr>
<tr>
<td><input type="text" name="var1" oninput="calc(this)" onkeyup="calc(this)"></td>
<td><input type="text" name="var2" oninput="calc(this)" onkeyup="calc(this)"></td>
</tr>
<tr>
<td>Remaining thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Remaining thermic difference in <a href="../units/celsius.html">Celsius</a></td>
</tr>
<tr>
<td><input type="text" name="result1" disabled="" data-op="(var2 > 12) ? 0 : var1 * (1 - (1/12) * var2)"></td>
Expand Down Expand Up @@ -731,8 +731,8 @@ <h4> Algorithms: </h4>
<b>Cornerstones&nbsp;2006&nbsp;133</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celcius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celsius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down Expand Up @@ -891,8 +891,8 @@ <h4> Algorithms: </h4>
<b>Wulff&nbsp;1966&nbsp;126</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celcius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celsius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down
12 changes: 6 additions & 6 deletions docs/algorithms/algorithm_type.html
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,15 @@ <h4> Algorithms: </h4>
<td colspan="4">
<table class="algo">
<tr>
<td>Thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Thermic difference in <a href="../units/celsius.html">Celsius</a></td>
<td>hours in <a href="../units/hr.html">hr</a></td>
</tr>
<tr>
<td><input type="text" name="var1" oninput="calc(this)" onkeyup="calc(this)"></td>
<td><input type="text" name="var2" oninput="calc(this)" onkeyup="calc(this)"></td>
</tr>
<tr>
<td>Remaining thermic difference in <a href="../units/celcius.html">Celcius</a></td>
<td>Remaining thermic difference in <a href="../units/celsius.html">Celsius</a></td>
</tr>
<tr>
<td><input type="text" name="result1" disabled="" data-op="(var2 > 12) ? 0 : var1 * (1 - (1/12) * var2)"></td>
Expand Down Expand Up @@ -851,8 +851,8 @@ <h4> Algorithms: </h4>
<b>Cornerstones&nbsp;2006&nbsp;133</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celcius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of lime requires a heat source of 900 Celsius for 36 hours.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Lime requires heat of 900 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down Expand Up @@ -897,8 +897,8 @@ <h4> Algorithms: </h4>
<b>Wulff&nbsp;1966&nbsp;126</b>
<table class="data">
<tr>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celcius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celcius</td>
<td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">Production of gypsum requires a heat source of 100-200 Celsius.</td>
<td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">Gypsum requires heat of 100-200 Celsius</td>
</tr>
<tr>
<td colspan="4"></td>
Expand Down
4 changes: 2 additions & 2 deletions docs/algorithms_data/Aurenche_1981_46.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<algorithm_math>Thermic difference is reduced by 1/12 every hour for a 40cm thick mudbrick wall.</algorithm_math>
<variables>
<var1>
<unit>Celcius</unit><description>Thermic difference</description>
<unit>Celsius</unit><description>Thermic difference</description>
</var1>
<var2>
<unit>hr</unit><description>hours</description>
Expand All @@ -45,7 +45,7 @@

<results>
<result1>
<unit>Celcius</unit><description>Remaining thermic difference</description>
<unit>Celsius</unit><description>Remaining thermic difference</description>
<op>(var2 &gt; 12) ? 0 : var1 * (1 - (1/12) * var2)</op><!-- if var2 > 12 stop decreasing, else linear decrease (real: negative exponential) -->
</result1>
</results>
Expand Down
4 changes: 2 additions & 2 deletions docs/algorithms_data/Cornerstones_2006_133.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<algdata>

<algorithm_statement>Production of lime requires a heat source of 900 Celcius for 36 hours.</algorithm_statement>
<algorithm_math>Lime requires heat of 900 Celcius</algorithm_math>
<algorithm_statement>Production of lime requires a heat source of 900 Celsius for 36 hours.</algorithm_statement>
<algorithm_math>Lime requires heat of 900 Celsius</algorithm_math>



Expand Down
4 changes: 2 additions & 2 deletions docs/algorithms_data/Wulff_1966_126.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<algdata>

<algorithm_statement>Production of gypsum requires a heat source of 100-200 Celcius.</algorithm_statement>
<algorithm_math>Gypsum requires heat of 100-200 Celcius</algorithm_math>
<algorithm_statement>Production of gypsum requires a heat source of 100-200 Celsius.</algorithm_statement>
<algorithm_math>Gypsum requires heat of 100-200 Celsius</algorithm_math>

</algdata>

Expand Down
4 changes: 0 additions & 4 deletions docs/units/celcius_data.html

This file was deleted.

10 changes: 5 additions & 5 deletions docs/units/celcius.html → docs/units/celsius.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Unit: Celcius - EnCAB</title>
<meta name="description" content="Unit: Celcius - EnCAB">
<title>Unit: Celsius - EnCAB</title>
<meta name="description" content="Unit: Celsius - EnCAB">
<meta name="author" content="F. Buccellati">
<link rel="stylesheet" href="../styles.css?v=1.0">
<script async="" src="../scripts.js"></script>
Expand Down Expand Up @@ -41,10 +41,10 @@
<header>
<h1 align="center">Energetic Calculator for Ancient Buildings
- EnCAB</h1>
<h2 align="center"><span style="color: #6633ff;">Unit: Celcius</span></h2>
<h2 align="center"><span style="color: #6633ff;">Unit: Celsius</span></h2>
</header>
<h4><a href="celcius.html">Celcius</a></h4>
<div w3-include-html="celcius_data.html"></div>
<h4><a href="celsius.html">Celsius</a></h4>
<div w3-include-html="celsius_data.html"></div>
<br>
<p>Back to <a href="units_index.html" target="_top">Index of Units</a></p>
<script>
Expand Down
4 changes: 4 additions & 0 deletions docs/units/celsius_data.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h4><a name="unit_cm">Unit: Celsius -- Links</a></h4>
<p>Getty AAT: <a href="http://vocab.getty.edu/page/aat/300056066">Temperature</a></p>
<h4>Unit: Celsius -- Description</h4>
<p>Celsius (measured in degrees) is a measurement of temperature.</p>
6 changes: 3 additions & 3 deletions docs/units/units_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h1 align="center">Energetic Calculator for Ancient Buildings
<h2 align="center"><span style="color: #6633ff;">Index of Units Used</span></h2>
</header>
<h4> Index of Units (links to individual pages): </h4>
<section block="index" sort="units"> <a href="brick.html">brick</a> <a href="celcius.html">celcius</a>
<section block="index" sort="units"> <a href="brick.html">brick</a> <a href="celsius.html">celsius</a>
<a href="cm.html">cm</a> <a href="cm2.html">cm2</a> <a href="day.html">day</a>
<a href="hr.html">hr</a> <a href="kg.html">kg</a> <a href="m.html">m</a>
<a href="m3.html">m3</a> <a href="p-h.html">p-h</a> <a href="percent.html">percent</a>
Expand All @@ -54,8 +54,8 @@ <h4> List of Units: </h4>
<h4><a href="brick.html">Brick</a></h4>
<div w3-include-html="brick_data.html"></div>
<br>
<h4><a href="celcius.html">Celcius</a></h4>
<div w3-include-html="celcius_data.html"></div>
<h4><a href="celsius.html">Celsius</a></h4>
<div w3-include-html="celsius_data.html"></div>
<br>
<h4><a href="cm.html">Centimeters</a></h4>
<div w3-include-html="cm_data.html"></div>
Expand Down

0 comments on commit 8b69262

Please sign in to comment.