From dffac4d887bffa2f6a52a5c9ac4969e2dedba430 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 13 Oct 2022 11:57:27 +0100
Subject: [PATCH 1/3] BUG: distributedTriSurfaceMesh: locally empty surface.
 Fixes #2612

---
 .../distributedTriSurfaceMesh.C               | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 6fd7b09e87..6c2b3cbe60 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1650,8 +1650,8 @@ Foam::volumeType Foam::distributedTriSurfaceMesh::cachedVolumeType
             // Recurse
             volumeType subType = cachedVolumeType
             (
-                    indexedOctree<treeDataTriSurface>::getNode(index),
-                    sample
+                indexedOctree<treeDataTriSurface>::getNode(index),
+                sample
             );
 
             return subType;
@@ -4162,7 +4162,10 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
 
             // Collect midpoints
             DynamicField<point> midPoints(label(0.5*nodes.size()));
-            collectLeafMids(0, midPoints);
+            if (nodes.size())
+            {
+                collectLeafMids(0, midPoints);
+            }
 
             if (debug)
             {
@@ -4190,14 +4193,17 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
             }
 
             // Cache on local tree
-            label index = 0;
-            calcVolumeType
-            (
-                midVolTypes,
-                index,
-                nt,
-                0               // nodeI
-            );
+            if (nodes.size())
+            {
+                label index = 0;
+                calcVolumeType
+                (
+                    midVolTypes,
+                    index,
+                    nt,
+                    0               // nodeI
+                );
+            }
             if (debug)
             {
                 Pout<< "distributedTriSurfaceMesh::getVolumeType :"
@@ -4294,7 +4300,10 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
     DynamicList<label> fullSearchMap(localPoints.size());
     forAll(localPoints, i)
     {
-        volType[i] = cachedVolumeType(0, localPoints[i]);
+        if (tree().nodes().size())
+        {
+            volType[i] = cachedVolumeType(0, localPoints[i]);
+        }
         if (volType[i] == volumeType::UNKNOWN)
         {
             fullSearchMap.append(i);

From a4d235af6b327e9133c3d80ce71862906158db54 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 2 Nov 2022 14:55:38 +0000
Subject: [PATCH 2/3] BUG: porousBafflePressure: read fixedJump entries - apply
 under-relaxation (fixes #2626)

---
 .../porousBafflePressureFvPatchField.C        | 27 ++++++++++++++-----
 .../porousBafflePressureFvPatchField.H        |  3 ++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index f249e419bc..b045715f87 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,10 +53,11 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    const bool valueRequired
 )
 :
-    fixedJumpFvPatchField<scalar>(p, iF),
+    fixedJumpFvPatchField<scalar>(p, iF, dict, false),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
     D_(Function1<scalar>::New("D", dict, &db())),
@@ -64,10 +65,20 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     length_(dict.get<scalar>("length")),
     uniformJump_(dict.getOrDefault("uniformJump", false))
 {
-    fvPatchField<scalar>::operator=
-    (
-        Field<scalar>("value", dict, p.size())
-    );
+    if (valueRequired)
+    {
+        if (dict.found("value"))
+        {
+            fvPatchField<scalar>::operator=
+            (
+                Field<scalar>("value", dict, p.size())
+            );
+        }
+        else
+        {
+            this->evaluate(Pstream::commsTypes::blocking);
+        }
+    }
 }
 
 
@@ -178,6 +189,8 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
         );
     }
 
+    this->relax();
+
     if (debug)
     {
         scalar avePressureJump = gAverage(jump());
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
index f7fd802fc6..0fb4f64e3f 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
@@ -162,7 +162,8 @@ public:
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
-            const dictionary&
+            const dictionary&,
+            const bool valueRequired = true
         );
 
         //- Construct by mapping given porousBafflePressureFvPatchField

From 8993af73ac6e58fd9741a3accc8e52eeb37e40ee Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 6 Nov 2022 09:02:10 +0100
Subject: [PATCH 3/3] CONFIG: bump patch level

---
 META-INFO/api-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/META-INFO/api-info b/META-INFO/api-info
index 21371b5bfe..0f72c29f7b 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
 api=2206
-patch=220907
+patch=221104