Updated documentation

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>

CoolPropBibTeXLibrary.bib

@@ -71,7 +71,9 @@
 
 @ARTICLE{Akasaka-PREPINT-2014,
   author = {Ryo Akasaka and Lemmon, E.W.},
-  title = {Equation of State for R245fa (unpublished, to be submitted)},
+  title = {{Equation of State for R245fa (unpublished, to be submitted)}},
+  journal = {J. Phys. Chem. Ref. Data},
+  year = {2015},
   note = {Provided by Ryo Akasaka},
   owner = {Belli},
   timestamp = {2014.08.09}
@@ -308,7 +310,7 @@
 }
 
 @ARTICLE{Datchi-PRB-2000,
-  author = {Fr{\'e}d{\'e}ric Datchi  and Paul Loubeyre and Ren{\'e} LeToullec},
+  author = {Fr{\'e}d{\'e}ric Datchi and Paul Loubeyre and Ren{\'e} LeToullec},
   title = {{Extended and accurate determination of the melting curves of argon,
 	helium, ice (H$_2$O) and hydrogen (H$_2$)}},
   journal = {Physical Review B},
@@ -386,6 +388,7 @@
   author = {Holger Gedanitz and Mar{\'i}a J. D{\'a}vila and Eric W. Lemmon},
   title = {{Speed of sound measurements and a fundamental equation of state
 	for cyclopentane}},
+  journal = {J. Chem. Eng. Data},
   year = {To be published, preprint provided by Eric Lemmon},
   owner = {Belli},
   timestamp = {2013.04.10}
@@ -1330,7 +1333,7 @@
 
 @ARTICLE{Richardson-JPCRD-2013,
   author = {I.A. Richardson and J.W. Leachman and E.W. Lemmon},
-  title = {Fundamental Equation of State for Deuterium},
+  title = {{Fundamental Equation of State for Deuterium}},
   journal = {J. Phys. Chem. Ref. Data},
   year = {2013},
   volume = {In Press},
@@ -1366,8 +1369,8 @@
 @ARTICLE{SantamariaPerez-PRB-2010,
   author = {David Santamar{\'i}a-P{\'e}rez and Goutam Dev Mukherjee and Beate
 	Schwager and Reinhard Boehler},
-  title = {High-pressure melting curve of helium and neon: Deviations from corresponding
-	states theory},
+  title = {{High-pressure melting curve of helium and neon: Deviations from
+	corresponding states theory}},
   journal = {Physical Review B},
   year = {2010},
   volume = {81},
@@ -1790,8 +1793,8 @@
 
 @TECHREPORT{Younglove-NIST-1982,
   author = {Younglove, Ben A},
-  title = {Thermophysical properties of fluids. I. Argon, ethylene, parahydrogen,
-	nitrogen, nitrogen trifluoride, and oxygen},
+  title = {{Thermophysical properties of fluids. I. Argon, ethylene, parahydrogen,
+	nitrogen, nitrogen trifluoride, and oxygen}},
   institution = {DTIC Document},
   year = {1982}
 }
@@ -1835,6 +1838,8 @@
 	
 	Sublimation Curves of Ordinary Water Substance}},
   organization = {{IAPWS}},
+  institution = {{IAPWS}},
+  year = {2011},
   owner = {Belli},
   timestamp = {2014.10.02}
 }

Web/fluid_properties/Mixtures.rst

@@ -1,11 +1,11 @@
 .. _mixtures:
 
-.. contents:: :depth: 2
-
 ********
 Mixtures
 ********
 
+.. contents:: :depth: 2
+
 Theoretical description
 -----------------------
 The mixture modeling used in CoolProp is based on the work of Kunz et al. :cite:`Kunz-BOOK-2007,Kunz-JCED-2012` and Lemmon :cite:`Lemmon-JPCRD-2000,Lemmon-JPCRD-2004,Lemmon-IJT-1999`

Web/fluid_properties/PurePseudoPure.rst

@@ -3,6 +3,8 @@
 Pure and Pseudo-Pure fluid properties
 =====================================
 
+.. contents:: :depth: 2
+
 Introduction
 ------------
 
@@ -90,3 +92,22 @@ The EOS is set up with temperature and density as the two independent properties
 #. No solution for density as a function of temperature and pressure if the fluid is two-phase
     
 The documentation of the :mod:`CoolProp.CoolProp` module, or the :mod:`CoolProp.State` module are also available.
+
+.. _list_of_fluids:
+
+List of Fluids
+--------------
+
+.. note::
+   You can click on the fluid name to get more information about the fluid
+
+.. csv-table:: All the fluids included in CoolProp
+   :header-rows: 1
+   :file: Fluids.csv
+   
+References
+----------
+
+.. bibliography:: ../../CoolPropBibTeXLibrary.bib
+   :filter: docname in docnames
+   :style: unsrt

Web/index.rst

@@ -5,10 +5,10 @@ What is CoolProp?
 
 CoolProp is a C++ library that implements:
 
-- Pure and pseudo-pure fluid equations of state and transport properties for 114 components
-- Mixture properties using high-accuracy Helmholtz energy formulations (or cubic EOS)
-- Correlations of properties of incompressible fluids and brines
-- Highest accuracy psychrometric routines
+- :ref:`Pure and pseudo-pure fluid equations of state and transport properties for 114 components <list_of_fluids>`
+- :ref:`Mixture properties using high-accuracy Helmholtz energy formulations (or cubic EOS) <mixtures>`
+- :ref:`Correlations of properties of incompressible fluids and brines <incompressibles>`
+- :ref:`Highest accuracy psychrometric routines <Humid-Air>`
 
 ======================
 Environments Supported

dev/fluids/n-Dodecane.json

@@ -416,7 +416,7 @@
   }, 
   "TRANSPORT": {
     "conductivity": {
-      "BibTeX": "Huber-FPE-2005", 
+      "BibTeX": "Huber-EF-2004", 
       "critical": {
         "GAMMA": 0.0496, 
         "R0": 1.03, 

dev/mixtures/mixture_binary_pairs.json

@@ -87,7 +87,7 @@
     "Name2": "Nitrogen", 
     "betaT": 0.994140013, 
     "betaV": 1.107654104, 
-    "function": "CarbonDioxide-Nitrogen", 
+    "function": "Nitrogen-CarbonDioxide", 
     "gammaT": 1.022709642, 
     "gammaV": 1.047578256
   },