From 7da2a5e0968782381aa0092d7608f250da33313c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 10 Dec 2021 15:22:24 +0000
Subject: [PATCH] ENH: redistributePar: reconstruct mode in collated. Fixes
 #2194

---
 .../redistributePar/redistributePar.C              | 14 ++++++++++----
 .../iglooWithFridges/Allrun                        | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index db5f26c773..73b3aeccbc 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -147,7 +147,7 @@ void createTimeDirs(const fileName& path)
 
     // Just to make sure remove all state and re-scan
     fileHandler().flush();
-    (void)fileHandler().findTimes(path, "constant");
+    (void)Time::findTimes(path, "constant");
 }
 
 
@@ -2665,9 +2665,11 @@ int main(int argc, char *argv[])
     // e.g. latestTime will pick up a different time (which causes createTime.H
     // to abort). So for now make sure to have master times on all
     // processors
-    Info<< "Creating time directories on all processors" << nl << endl;
-    createTimeDirs(args.path());
-
+    if (!reconstruct)
+    {
+        Info<< "Creating time directories on all processors" << nl << endl;
+        createTimeDirs(args.path());
+    }
 
     // Construct time
     // ~~~~~~~~~~~~~~
@@ -2932,6 +2934,10 @@ int main(int argc, char *argv[])
                 }
             }
 
+            // Make sure all is finished writing until re-reading in pass2
+            // below
+            fileHandler().flush();
+
 
             // Pass2 : read mesh and addressing and reconstruct fields
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index 1badf03590..e1ee4a1a57 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -27,8 +27,8 @@ cp -f \
 if [ "$parallel" = true ]
 then
 
-    runApplication decomposePar $fileHandler
-    #runParallel -s decompose redistributePar -decompose $fileHandler
+    #runApplication decomposePar $fileHandler
+    runParallel -s decompose redistributePar -decompose $fileHandler
 
     runParallel snappyHexMesh -overwrite $fileHandler
 
@@ -43,10 +43,10 @@ then
 
     ## Run reconstructParMesh with collated as well since writes
     ##     constant/polyMesh/cellProcAddressing
-    runApplication reconstructParMesh -constant $fileHandler
-    runApplication reconstructPar
+    #runApplication reconstructParMesh -constant $fileHandler
+    #runApplication reconstructPar
 
-    #runParallel -s reconstruct redistributePar -reconstruct $fileHandler
+    runParallel -s reconstruct redistributePar -reconstruct $fileHandler
 
 else