Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

src/thermophysicalModels/liquids/H2O/H2O.C

@@ -96,7 +96,7 @@ Foam::H2O::H2O()
     K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
     Kg_(6.977e-05, 1.1243, 844.9, -148850),
     sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
-    D_(147.18, 20.1, 18.015, 28) // note: Same as nHeptane
+    D_(15.0, 15.0, 18.015, 28)
 {}
 
 

src/thermophysicalModels/liquids/liquid/liquid.H

@@ -273,6 +273,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "liquidI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //