From 8cf346a9c592ec492edd34e430abd0e11eeaf803 Mon Sep 17 00:00:00 2001
From: Jonathan Cranford <>
Date: Mon, 6 Apr 2020 15:27:03 +0200
Subject: [PATCH] ENH: PDRsetFields adjustments

- missing minThreshold in activePressureForceBaffleVelocity

- update names of cyclics

- increase tolerance for zero-thickness baffles

- velocity field "U" instead of "UBet"

- viscosity field "nut" instead of "mut"
---
 .../PDRsetFields/PDRarraysAnalyse.C             |  6 +++---
 .../preProcessing/PDRsetFields/PDRarraysCalc.C  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C b/applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C
index a72c769ab1f..f64d7d5a870 100644
--- a/applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C
+++ b/applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C
@@ -673,15 +673,15 @@ void Foam::PDRarrays::addBlockage
             p.patchType = obs.blowoff_type;
             p.blowoffPress = obs.blowoff_press;
             p.blowoffTime = obs.blowoff_time;
-            if (obs.span.x() < 1e-5)
+            if (obs.span.x() < 0.01)
             {
                 indir = 1;
             }
-            else if (obs.span.y() < 1e-5)
+            else if (obs.span.y() < 0.01)
             {
                 indir = 2;
             }
-            else if (obs.span.z() < 1e-5)
+            else if (obs.span.z() < 0.01)
             {
                 indir = 3;
             }
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
index a4d8f73f494..6a063f0563d 100644
--- a/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
+++ b/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
@@ -934,9 +934,9 @@ void Foam::PDRarrays::calculateAndWrite
         );
         write_uniformField
         (
-            "mut", 0, MUT_WALL_FN,
+            "nut", 0, NUT_WALL_FN,
             meshIndexing, patches,
-            dimDynamicViscosity, casepath
+            dimViscosity, casepath
         );
         // combustFlag is 1 in rectangular region, 0 or 1 elsewhere
         // (although user could set it to another value)
@@ -1312,9 +1312,9 @@ void write_uniformField
     // outer
     {
         os.beginBlock("outer");
-        if (fieldName == "alphat" || fieldName == "mut")
+        if (fieldName == "alphat" || fieldName == "nut")
         {
-            // Different b.c. for alphat & mut
+            // Different b.c. for alphat & nut
             os.writeEntry("type", "calculated");
         }
         else
@@ -1346,10 +1346,10 @@ void write_pU_fields
 {
     // Velocity field
     {
-        OFstream os(casepath / pars.timeName / "Ubet");
+        OFstream os(casepath / pars.timeName / "U");
         os.precision(outputPrecision);
 
-        make_header(os, "", volVectorField::typeName, "Ubet");
+        make_header(os, "", volVectorField::typeName, "U");
 
         os.writeEntry("dimensions", dimVelocity);
 
@@ -1406,6 +1406,7 @@ void write_pU_fields
                 os.writeEntry("cyclicPatch", word(patchName + "Cyclic_half0"));
                 os.writeEntry("openFraction", 0); // closed
                 os.writeEntry("openingTime", p.blowoffTime);
+                os.writeEntry("minThresholdValue", p.blowoffPress);
                 os.writeEntry("maxOpenFractionDelta", 0.1);
                 os.writeEntry("forceBased", "false");
                 os.writeEntry("opening", "true");
@@ -1865,8 +1866,8 @@ void write_blocked_face_list
             if (p.patchType > 0)  // Panel
             {
                 os.beginBlock(setName);
-                os.writeEntry("wallPatchName", word(patchName + "Wall"));
-                os.writeEntry("cyclicMasterPatchName", patchName);
+                os.writeEntry("wallPatch", word(patchName + "Wall"));
+                os.writeEntry("cyclicMasterPatch", word(patchName + "Cyclic_half0"));
                 os.endBlock();
             }
         }
-- 
GitLab