Merge remote-tracking branch 'origin/master'

CoolPropBibTeXLibrary.bib

@@ -1351,6 +1351,16 @@
   Timestamp                = {2013.03.19}
 }
 
+@Article{Lemmon-JCED-2016-365227,
+  Title                    = {Thermodynamic Properties of R-227ea, R-365mfc, R-115, and R13I1},
+  Author                   = {Eric W. Lemmon and Roland Span},
+  Journal                  = {J. Chem. Eng. Data},
+  Year                     = {2016, submitted},
+
+  Owner                    = {Belli},
+  Timestamp                = {2015.11.24}
+}
+
 @Article{Lemmon-FPE-1999,
   Title                    = {{A Helmholtz energy equation of state for calculating the thermodynamic properties of fluid mixtures}},
   Author                   = {Eric W. Lemmon and Reiner Tillner-Roth},
@@ -1401,16 +1411,6 @@
   Timestamp                = {2013.05.20}
 }
 
-@Article{McLinden-PREPRINT-2013,
-  Title                    = {{Thermodynamic Properties of R-227ea, R-365mfc, R-115, and R-13I1}},
-  Author                   = {M.O. McLinden and E.W. Lemmon},
-  Journal                  = {J. Chem. Eng. Data},
-  Year                     = {To be submitted},
-
-  Owner                    = {Belli},
-  Timestamp                = {2013.04.09}
-}
-
 @Article{McLinden-IJR-2000,
   Title                    = {{An extended corresponding states model for the thermal conductivity of refrigerants and refrigerant mixtures}},
   Author                   = {Mark O. McLinden and Sanford A. Klein and Richard A. Perkins},

dev/fluids/R115.json

@@ -91,7 +91,7 @@
   "EOS": [
     {
       "BibTeX_CP0": "", 
-      "BibTeX_EOS": "McLinden-PREPRINT-2013", 
+      "BibTeX_EOS": "Lemmon-JCED-2016-365227", 
       "STATES": {
         "hs_anchor": {
           "T": 388.4100000000001, 

dev/fluids/R13I1.json

@@ -91,7 +91,7 @@
   "EOS": [
     {
       "BibTeX_CP0": "", 
-      "BibTeX_EOS": "McLinden-PREPRINT-2013", 
+      "BibTeX_EOS": "Lemmon-JCED-2016-365227", 
       "STATES": {
         "hs_anchor": {
           "T": 436.08400000000006, 
@@ -142,7 +142,7 @@
           "smolar_units": "J/mol/K"
         }
       }, 
-      "T_max": 550, 
+      "T_max": 420, 
       "T_max_units": "K", 
       "Ttriple": 120, 
       "Ttriple_units": "K", 
@@ -239,7 +239,7 @@
       "gas_constant_units": "J/mol/K", 
       "molar_mass": 0.1959104, 
       "molar_mass_units": "kg/mol", 
-      "p_max": 60000000.0, 
+      "p_max": 50000000.0, 
       "p_max_units": "Pa", 
       "pseudo_pure": false
     }

dev/fluids/R227EA.json

@@ -200,7 +200,7 @@
   "EOS": [
     {
       "BibTeX_CP0": "", 
-      "BibTeX_EOS": "McLinden-PREPRINT-2013", 
+      "BibTeX_EOS": "Lemmon-JCED-2016-365227", 
       "STATES": {
         "hs_anchor": {
           "T": 412.39, 
@@ -259,8 +259,8 @@
       "acentric_units": "-", 
       "alpha0": [
         {
-          "a1": 0, 
-          "a2": 0, 
+          "a1": -15.8291124137, 
+          "a2": 11.0879509962, 
           "type": "IdealGasHelmholtzLead"
         }, 
         {
@@ -277,12 +277,6 @@
             3.809015737530008
           ], 
           "type": "IdealGasHelmholtzPlanckEinstein"
-        }, 
-        {
-          "a1": -15.8290880642424, 
-          "a2": 11.087938006383, 
-          "reference": "IIR", 
-          "type": "IdealGasHelmholtzEnthalpyEntropyOffset"
         }
       ], 
       "alphar": [
@@ -427,7 +421,7 @@
         "rhomolar_max": 3618.508261092158, 
         "rhomolar_min": 3362.517912603551
       }, 
-      "gas_constant": 8.314472, 
+      "gas_constant": 8.3144621, 
       "gas_constant_units": "J/mol/K", 
       "molar_mass": 0.17002886, 
       "molar_mass_units": "kg/mol", 

dev/fluids/R365MFC.json

@@ -196,7 +196,7 @@
   "EOS": [
     {
       "BibTeX_CP0": "", 
-      "BibTeX_EOS": "McLinden-PREPRINT-2013", 
+      "BibTeX_EOS": "Lemmon-JCED-2016-365227", 
       "STATES": {
         "hs_anchor": {
           "T": 506.00000000000006, 
@@ -255,8 +255,8 @@
       "acentric_units": "-", 
       "alpha0": [
         {
-          "a1": 0, 
-          "a2": 0, 
+          "a1": -16.3423704513, 
+          "a2": 10.2889710846, 
           "type": "IdealGasHelmholtzLead"
         }, 
         {
@@ -273,12 +273,6 @@
             4.852173913043479
           ], 
           "type": "IdealGasHelmholtzPlanckEinstein"
-        }, 
-        {
-          "a1": -16.3423492459187, 
-          "a2": 10.2889618649051, 
-          "reference": "IIR", 
-          "type": "IdealGasHelmholtzEnthalpyEntropyOffset"
         }
       ], 
       "alphar": [
@@ -383,7 +377,7 @@
           "type": "ResidualHelmholtzGaussian"
         }
       ], 
-      "gas_constant": 8.314472, 
+      "gas_constant": 8.3144621, 
       "gas_constant_units": "J/mol/K", 
       "molar_mass": 0.14807452, 
       "molar_mass_units": "kg/mol",