From 9a32d99c23c8427123d1bd2ce8d0d92779fc1c4f Mon Sep 17 00:00:00 2001
From: Shane Frischkorn <shanef@gmail.com>
Date: Mon, 3 Mar 2014 13:08:12 +1000
Subject: [PATCH] Added pressure and temperature theory

---
 .idea/workspace.xml                           | 189 ++++++++++++++----
 .../three_d_viewer/theory/pressure_temp.html  |  45 ++++-
 2 files changed, 191 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 510fdcb..634462d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rockviewer.wsgi" afterPath="$PROJECT_DIR$/rockviewer.wsgi" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" />
     </list>
     <ignored path="rockviewer.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -27,46 +27,46 @@
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf>
-          <file leaf-file-name="base.html" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="40" column="80" selection-start="2014" selection-end="2014" vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1122">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="mineral_detail.html" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="rock_detail.html" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="3" column="16" selection-start="84" selection-end="84" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="697">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="127" column="0" selection-start="4083" selection-end="4083" vertical-scroll-proportion="0.0" vertical-offset="1459" max-vertical-offset="2856">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="rockviewer.wsgi" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="rockviewer.wsgi" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.11050921" vertical-offset="0" max-vertical-offset="923">
+                <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="pressure_temp.html" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.8104794" vertical-offset="157" max-vertical-offset="1054">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="structure.html" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="731">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="production.py" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/settings/production.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="527">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="wsgi.py" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/wsgi.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="646">
                   <folding />
                 </state>
               </provider>
@@ -177,6 +177,7 @@
         <option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
         <option value="$PROJECT_DIR$/three_d_viewer/views.py" />
         <option value="$PROJECT_DIR$/rockviewer.wsgi" />
+        <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" />
       </list>
     </option>
   </component>
@@ -230,6 +231,82 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="three_d_viewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="three_d_viewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="templates" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="three_d_viewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="three_d_viewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="templates" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="three_d_viewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="theory" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rockviewer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="settings" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="rockviewer" />
@@ -569,11 +646,11 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39889196" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -925,9 +1002,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/settings/production.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="910">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsgi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="923">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.11050921" vertical-offset="0" max-vertical-offset="923">
+        <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="910">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.8104794" vertical-offset="157" max-vertical-offset="1054">
           <folding />
         </state>
       </provider>
diff --git a/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html b/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html
index 7d04504..edc2d4c 100644
--- a/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html
+++ b/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html
@@ -7,7 +7,50 @@
         <h1 class="subHeadings">Theory</h1>
         <h2 class="theoryHeadings" id="pressureandtemp">Pressure and Temperature</h2>
         <p>
-	</p>
+        The heat contained within the Earth is generated by two main sources: the formation of the Earth,
+        and the decay of radioactive isotopes. The Earth was formed by the accretion of a large number of
+        planitesimals as it cleared its orbit. The impact of those planitesimals generated a large amount
+        of heat which is still being lost from the Earth’s core today. The other source of heat comes
+        from the radioactive decay of elements within the crust and mantle of the Earth.
+        The primary radioactive isotopes in the Earth are uranium-235, uranium-238, thorium-232,
+        and potassium-40. Radioactive decay is the dominant form of heat flow at the surface of the Earth,
+        providing approximately 80% of the heat budget.
+        <br /><br />
+        The temperature of the Earth changes from around 0°C at the surface to over 5000°C in the core.
+        The geothermal gradient in the crust is approximately 30°C per kilometre in the crust on average,
+        however there is significant local variation due to things such as the conductive abilities of the
+        rocks at particular locations, as well as the presence of nearby magmatic intrusions.
+        The geothermal gradient in the mantle reduces significantly, down to approximately 0.3°C/km.
+        The base of the lithosphere is defined by the 1000°C isotherm. The base of the mantle is at
+        approximately 2800°C.
+        <br /><br />
+        The method of heat transfer changes throughout the Earth. There are three main mechanisms for
+        heat transfer in the Earth: conduction, convection, and radiation. Starting in the inner core,
+        the main method of heat transfer is by conduction through the solid material. In the liquid,
+        outer core heat transfer is by both conduction and convection. The mantle is dominated by convection,
+        which is the driver of plate tectonics. The crust is again dominated by conduction, and finally
+        energy escapes the Earth to the atmosphere by radiation.
+        <br /><br />
+        Pressure in the Earth continually increases with depth, according to the formula P = gρz,
+        where g is the gravitation field strength, ρ is the density and z is the depth. The main
+        difference in the pressure gradient is cause by the different lithologies in the layers
+        of the Earth. The average density of continental crust is approximately 2.7g/cm3 and
+        is ~3.0 g/cm3 in oceanic crust, and increases to about 3.3 g/cm3 in the mantle.
+        The increase of pressure with depth in the Earth affects the dominant mineralogy, as
+        well as the increase of the melting point of different minerals.
+        <br /><br />
+        The structure of minerals, such as olivine becomes unstable as pressure increases.
+        Below about 410km olivine becomes unstable and transforms into wadsleyite, which has the
+        same chemical composition as olivine, but has a different crystal structure. As depth
+        increases, wadsleyite transforms to ringwoodite, which subsequently transforms into
+        perovskite at about 600km.
+        <br /><br />
+        At higher pressure, minerals have a higher melting point. The effect is this phenomenon
+        is that the dominant method of melting in the mantle is not by increasing the temperature
+        past its melting point, but by decompression. Due to convective processes in the mantle,
+        as parts of the mantle rise the decrease in pressure lowers the melting temperature and
+        can cause the mantle to melt.
+	    </p>
         <div id="pushDownThree"></div>
         </div>
 {% endblock %}