diff --git a/db.sqlite3 b/db.sqlite3 index 0038e8d..022212f 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/docs/Web Site.docx b/docs/Web Site.docx index f10cc04..cfd4200 100644 Binary files a/docs/Web Site.docx and b/docs/Web Site.docx differ diff --git a/three_d_viewer/templates/three_d_viewer/acknowledgements.html b/three_d_viewer/templates/three_d_viewer/acknowledgements.html index 7cc83dc..1f6b7fc 100644 --- a/three_d_viewer/templates/three_d_viewer/acknowledgements.html +++ b/three_d_viewer/templates/three_d_viewer/acknowledgements.html @@ -5,7 +5,7 @@

Acknowledgements



- 3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Schrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft. + 3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Shrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft.



3DVOL is funded by the QUT Teaching and Learning Unit and the School of Earth, Environmental, and Biological Sciences. QUT High Performance Computing provides technical support. diff --git a/three_d_viewer/templates/three_d_viewer/theory/bowen.html b/three_d_viewer/templates/three_d_viewer/theory/bowen.html index 883577e..f82d7a7 100644 --- a/three_d_viewer/templates/three_d_viewer/theory/bowen.html +++ b/three_d_viewer/templates/three_d_viewer/theory/bowen.html @@ -7,12 +7,12 @@

Theory

Bowen's Reaction Series

- Bowen's Reaction Series arranges the silicate minerals in the order that they crystallize from magma. The minerals at the + Bowen's Reaction Series arranges the silicate minerals in the order that they crystallize from magma. The minerals at the top of the series crystallize from the melt at higher temperature than those lower down. It contains a continuous series, (right hand limb), a discontinuous series (left hand limb), and the residual phases, which are listed in their relative sequence of crystallization. The discontinuous series describes the sequence of minerals that crystallize as the temperature of the magma decreases. The discontinuity of each of the crystallization sequences reflects the different melting/crystallization temperatures of the minerals, and the change in composition of the - residual magma, as the early crystallizing phases are being fractionated from the melt. The continuous series always crystallizes plagioclase, + residual magma, as the early crystallizing phases are being fractionated from the melt. The continuous series always crystallizes plagioclase, but the composition of the plagioclase changes from more calcic (i.e. anorthite) at higher temperatures to more sodic (i.e. albite) as the temperature decreases. The compositional change during mineral growth can be recorded in compositional zoning of plagioclase crystals. The minerals at the bottom of Bowen’s reaction series crystallize last and are more stable, @@ -23,7 +23,7 @@ crystallize quartz. Which minerals actually form, depend on many factors, such as the chemical composition of the melt, temperature, pressure, and amount of fractional crystallization. For example, basalts form from the crystallization of olivine, - pyroxene and + pyroxene and calcic plagioclase, meaning that crystallization stopped without the series progressing. If more fractional crystallization were to occur, more intermediate and felsic minerals can crystallize.
diff --git a/three_d_viewer/templates/three_d_viewer/theory/classification.html b/three_d_viewer/templates/three_d_viewer/theory/classification.html index c4fd45c..9ce5be4 100644 --- a/three_d_viewer/templates/three_d_viewer/theory/classification.html +++ b/three_d_viewer/templates/three_d_viewer/theory/classification.html @@ -8,7 +8,7 @@

Classification of Minerals

The classification of minerals is based on their chemistry. The following mineral classes are based on the character of their common anions:

-
  • Silicates (SiO44-)

  • +
  • Silicates (SiO44-)

  • Oxides (O2-)

  • Sulfides (S2-)

  • Sulfates (SO42-)

  • @@ -19,7 +19,7 @@
  • Native elements, e.g. Au.


  • - The relative abundance of elements in the Earth’s crust (see Structure of Earth) determines which minerals form. + The relative abundance of elements in the Earth’s crust (see Structure of Earth) determines which minerals form. Oxygen is the most abundant anion in the Earth’s crust. Thus, the crust can be seen as a tight package of oxygen anions (O2-), which are bonded by larger cations, such as Si4+, Mg2+, or Al3+. diff --git a/three_d_viewer/templates/three_d_viewer/theory/structure.html b/three_d_viewer/templates/three_d_viewer/theory/structure.html index b47e76a..ad3e1b2 100644 --- a/three_d_viewer/templates/three_d_viewer/theory/structure.html +++ b/three_d_viewer/templates/three_d_viewer/theory/structure.html @@ -13,7 +13,7 @@

    The Earth's structure is differentiated in three distinct layers: the core, mantle, and crust. The layers are distinguished - by a change in the velocity of seismic waves at their boundaries. + by a change in the velocity of seismic waves at their boundaries (? Seismic profile). The crust is the upper most part of the earth, with depths ranging from an average of 7 km in the oceans, to an average of 38 km in continental crust. The crust thickens underneath mountain ranges, and can reach depths of 90 km underneath the Himalayas. The composition of the crust also differs between oceanic and continental diff --git a/three_d_viewer/views.py b/three_d_viewer/views.py index bd96b1d..5aef501 100644 --- a/three_d_viewer/views.py +++ b/three_d_viewer/views.py @@ -291,9 +291,6 @@ class TheoryTemplateView(generic.TemplateView): context['plag'] = Mineral.objects.filter(name='Plagioclase')[0] context['diopside'] = Mineral.objects.filter(name='Diopside')[0] context['actinolite'] = Mineral.objects.filter(name='Actinolite')[0] - - context['silicates_theory'] = 'three_d_viewer:theory_silicates' - context['structure_theory'] = 'three_d_viewer:theory_structure' return context class ERB101TheoryTemplateView(generic.TemplateView): @@ -307,8 +304,5 @@ class ERB101TheoryTemplateView(generic.TemplateView): context['plag'] = Mineral.objects.filter(name='Plagioclase')[0] context['diopside'] = Mineral.objects.filter(name='Diopside')[0] context['actinolite'] = Mineral.objects.filter(name='Actinolite')[0] - - context['silicates_theory'] = 'three_d_viewer:erb101_theory_silicates' - context['structure_theory'] = 'three_d_viewer:erb101_theory_structure' return context