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

applications/utilities/parallelProcessing/decomposePar/decomposeParDict

@@ -45,7 +45,7 @@ multiLevelCoeffs
 
     level0
     {
-        numberOfSubdomains  2;
+        numberOfSubdomains  64;
         //method simple;
         //simpleCoeffs
         //{

src/meshTools/indexedOctree/treeDataPoint.C

@@ -37,7 +37,8 @@ defineTypeNameAndDebug(Foam::treeDataPoint, 0);
 
 Foam::treeDataPoint::treeDataPoint(const pointField& points)
 :
-    points_(points)
+    points_(points),
+    useSubset_(false)
 {}
 
 
@@ -48,7 +49,8 @@ Foam::treeDataPoint::treeDataPoint
 )
 :
     points_(points),
-    pointLabels_(pointLabels)
+    pointLabels_(pointLabels),
+    useSubset_(true)
 {}
 
 
@@ -56,7 +58,7 @@ Foam::treeDataPoint::treeDataPoint
 
 Foam::pointField Foam::treeDataPoint::shapePoints() const
 {
-    if (pointLabels_.size())
+    if (useSubset_)
     {
         return pointField(points_, pointLabels_);
     }
@@ -86,7 +88,7 @@ bool Foam::treeDataPoint::overlaps
     const treeBoundBox& cubeBb
 ) const
 {
-    label pointI = (pointLabels_.size() ? pointLabels_[index] : index);
+    label pointI = (useSubset_ ? pointLabels_[index] : index);
     return cubeBb.contains(points_[pointI]);
 }
 
@@ -106,7 +108,7 @@ void Foam::treeDataPoint::findNearest
     forAll(indices, i)
     {
         const label index = indices[i];
-        label pointI = (pointLabels_.size() ? pointLabels_[index] : index);
+        label pointI = (useSubset_ ? pointLabels_[index] : index);
 
         const point& pt = points_[pointI];
 
@@ -141,7 +143,7 @@ void Foam::treeDataPoint::findNearest
     forAll(indices, i)
     {
         const label index = indices[i];
-        label pointI = (pointLabels_.size() ? pointLabels_[index] : index);
+        label pointI = (useSubset_ ? pointLabels_[index] : index);
 
         const point& shapePt = points_[pointI];
 

src/meshTools/indexedOctree/treeDataPoint.H

@@ -65,6 +65,8 @@ class treeDataPoint
         //- Subset of points to work on (or empty)
         const labelList pointLabels_;
 
+        const bool useSubset_;
+
 public:
 
     // Declare name of the class and its debug switch
@@ -88,7 +90,7 @@ public:
             {
                 return
                 (
-                    pointLabels_.size()
+                    useSubset_
                   ? pointLabels_.size()
                   : points_.size()
                 );

src/sampling/Make/options

@@ -11,5 +11,5 @@ LIB_LIBS = \
     -lmeshTools \
     -lsurfMesh \
     -ltriSurface \
-    -lconversion \
-    -llagrangian
+    -llagrangian \
+    -lconversion

src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C

@@ -55,7 +55,7 @@ Foam::C3H6O::C3H6O()
         1.9774e+4
     ),
     rho_(71.426784, 0.2576, 508.2, 0.29903),
-    pv_(70.72, -5.685, -7.351, 6.3e-06, 2.0),
+    pv_(70.72, -5685, -7.351, 6.3e-06, 2.0),
     hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0),
     Cp_
     (