Merge remote-tracking branch 'origin/master' into develop

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=2012
-patch=0
+patch=210210

bin/paraFoam

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2020 OpenCFD Ltd.
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -140,8 +140,8 @@ do
             esac
         else
             echo "Ignore bad/invalid plugin-path: $pluginPath" 1>&2
-            unset pluginPath
         fi
+        unset pluginPath
         ;;
 
     -block*)  # Silently accepts -blockMesh
@@ -238,8 +238,11 @@ then
             ;;
         esac
 
-        if [ -n "$pluginError" ]
+        if [ -z "$pluginError" ]
         then
+            # Ensure plugin is also in the lib-path
+            LD_LIBRARY_PATH="${PV_PLUGIN_PATH}:$LD_LIBRARY_PATH"
+        else
             cat<< NO_PLUGIN 1>&2
 $pluginError
     See '${0##*/} -help-build' for more information

etc/colourTables

@@ -44,7 +44,7 @@ coldAndHot
 fire
 {
     // ParaView: Black-Body Radiation
-    interpolate rbg;
+    interpolate rgb;
 
     table
     (
@@ -70,7 +70,7 @@ rainbow
 greyscale
 {
     // ParaView: grayscale
-    interpolate rbg;
+    interpolate rgb;
 
     table
     (
@@ -82,7 +82,7 @@ greyscale
 xray
 {
     // ParaView: "X ray"
-    interpolate rbg;
+    interpolate rgb;
 
     table
     (

src/fileFormats/ensight/mesh/ensightMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -199,6 +199,9 @@ void Foam::ensightMesh::correct()
 
         if (returnReduce(!zn.empty(), orOp<bool>()))
         {
+            // Ensure full mesh coverage
+            cellSelection.resize(mesh_.nCells());
+
             cellSelection.set(zn);
 
             ensightCells& part = cellZoneParts_(zoneId);
@@ -267,6 +270,7 @@ void Foam::ensightMesh::correct()
 
     if (returnReduce(!cellSelection.empty(), orOp<bool>()))
     {
+        // Ensure full mesh coverage
         excludeFace.resize(mesh_.nFaces());
 
         const labelList& owner = mesh_.faceOwner();
@@ -288,6 +292,7 @@ void Foam::ensightMesh::correct()
 
     if (fzoneIds.size())
     {
+        // Ensure full mesh coverage
         excludeFace.resize(mesh_.nFaces());
 
         for (const polyPatch& p : mesh_.boundaryMesh())

src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C

@@ -434,6 +434,11 @@ Foam::scalar Foam::noiseModel::RAf(const scalar f) const
 
 Foam::scalar Foam::noiseModel::gainA(const scalar f) const
 {
+    if (f < SMALL)
+    {
+        return 0;
+    }
+
     return 20*log10(RAf(f)) - 20*log10(RAf(1000));
 }
 
@@ -456,6 +461,11 @@ Foam::scalar Foam::noiseModel::RBf(const scalar f) const
 
 Foam::scalar Foam::noiseModel::gainB(const scalar f) const
 {
+    if (f < SMALL)
+    {
+        return 0;
+    }
+
     return 20*log10(RBf(f)) - 20*log10(RBf(1000));
 }
 
@@ -473,6 +483,11 @@ Foam::scalar Foam::noiseModel::RCf(const scalar f) const
 
 Foam::scalar Foam::noiseModel::gainC(const scalar f) const
 {
+    if (f < SMALL)
+    {
+        return 0;
+    }
+
     return 20*log10(RCf(f)) - 20*log10(RCf(1000));
 }
 
@@ -492,6 +507,11 @@ Foam::scalar Foam::noiseModel::RDf(const scalar f) const
 
 Foam::scalar Foam::noiseModel::gainD(const scalar f) const
 {
+    if (f < SMALL)
+    {
+        return 0;
+    }
+
     return 20*log10(RDf(f));
 }