Changed Melinder coefficients, fixes #161

Web/fluid_properties/Incompressibles.rst

@@ -32,7 +32,7 @@ specific fluid. To get an overview over all the fits, there are also combined
 documents with all the
 :download:`pure fluids and all the aqueous solutions</_static/fluid_properties/incompressible/report/all_incompressibles.pdf>`.
 You can read more about these reports in a dedicated
-:ref:`section<FittingReports>` called :ref:`Fitting Reports<FittingReports>` below.
+:ref:`section<FittingReports>` called :ref:`Fitting Reports<FittingReports>`.
 
 All incompressible fluids have an arbitrary reference state for enthalpy and entropy.
 During initialisation, the reference state is defined as a temperature of 20 °C
@@ -146,10 +146,10 @@ A file with all fitting reports for the incompressible fluids can be obtained
 from :download:`here</_static/fluid_properties/incompressible/report/all_incompressibles.pdf>`. These reports help you to
 get an overview over the different incompressible fluids
 included in CoolProp. The reports start with some basic information about
-the fluid. There is the name by which it can be accessed through the
-interface in the title "Fitting Report for *FluidName*" as well as a description
-of what the fluid actually is, this could also be a trade name or a commonly
-used non-scientific name. The next item tells you where we got the data from. This
+the fluid. The fluid name used in CoolProp is in the title "Fitting Report for *FluidName*"
+and there is also a description of what the fluid actually is. The latter
+could also be a trade name or a commonly used non-scientific name. The next item
+tells you where we got the data from. This
 would typically be a data sheet from a manufacturers homepage, some other software
 database, a scientific publication or experimental data.
 

dev/incompressible_liquids/CPIncomp/MelinderFluids.py

@@ -30,7 +30,7 @@ class DEBLiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([3.5503,-0.0566396,7.03331e-05]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000189132,-2.06364e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.189132,-2.06364e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -64,7 +64,7 @@ class HCMLiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([18.3237,-0.14706,0.000209096]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000153716,-1.51212e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.153716,-1.51212e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -98,7 +98,7 @@ class HFELiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([-4.22878,-0.0114765,7.39823e-06]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([9.92958e-05,-8.33333e-08]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([9.92958e-01,-8.33333e-05]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -132,7 +132,7 @@ class PMS1LiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([6.36183,-0.0636352,7.51428e-05]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000207526,-2.84167e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.207526,-2.84167e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -166,7 +166,7 @@ class PMS2LiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([5.66926,-0.065582,8.09988e-05]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000172305,-2.11212e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.172305,-2.11212e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -200,7 +200,7 @@ class SABLiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([5.21288,-0.0665792,8.5066e-05]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000208374,-2.61667e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.208374,-2.61667e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -234,7 +234,7 @@ class HCBLiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([7.16819,-0.0863212,0.000130604]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000203186,-2.3869e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.203186,-2.3869e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS
@@ -268,7 +268,7 @@ class TCOLiquidClass(CoefficientData,PureData):
         _,_,self.viscosity.coeffs = IncompressibleFitter.shapeArray(np.array([-3.47971,-0.0107031,1.14086e-06]))
 
         self.conductivity.type = self.conductivity.INCOMPRESSIBLE_POLYNOMIAL
-        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0.000174156,-1.85052e-07]))
+        _,_,self.conductivity.coeffs = IncompressibleFitter.shapeArray(np.array([0000.174156,-1.85052e-04]))
 
         self.density.source           = self.density.SOURCE_COEFFS
         self.specific_heat.source     = self.specific_heat.SOURCE_COEFFS

dev/incompressible_liquids/json/DEB.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        1.891320e-04
+        1.891320e-01
       ], 
       [
-        -2.063640e-07
+        -2.063640e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/HCB.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        2.031860e-04
+        2.031860e-01
       ], 
       [
-        -2.386900e-07
+        -2.386900e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/HCM.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        1.537160e-04
+        1.537160e-01
       ], 
       [
-        -1.512120e-07
+        -1.512120e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/HFE.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        9.929580e-05
+        9.929580e-01
       ], 
       [
-        -8.333330e-08
+        -8.333330e-05
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/PMS1.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        2.075260e-04
+        2.075260e-01
       ], 
       [
-        -2.841670e-07
+        -2.841670e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/PMS2.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        1.723050e-04
+        1.723050e-01
       ], 
       [
-        -2.112120e-07
+        -2.112120e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/SAB.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        2.083740e-04
+        2.083740e-01
       ], 
       [
-        -2.616670e-07
+        -2.616670e-04
       ]
     ], 
     "type": "polynomial"

dev/incompressible_liquids/json/TCO.json

@@ -10,10 +10,10 @@
   "conductivity": {
     "coeffs": [
       [
-        1.741560e-04
+        1.741560e-01
       ], 
       [
-        -1.850520e-07
+        -1.850520e-04
       ]
     ], 
     "type": "polynomial"