From b51e0d4c1c0b4f3c6239b9507eac32ff10fc9295 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Jun 2022 18:28:34 +0200
Subject: [PATCH] STYLE: verbose point field decompose/reconstruct (#120)

TUT: use redistributePar for multiphase/interFoam/RAS/DTCHull
---
 .../redistributePar/parLagrangianDistributor.C              | 5 +++++
 .../redistributePar/parLagrangianDistributor.H              | 4 ++++
 .../redistributePar/parLagrangianDistributorTemplates.C     | 6 ------
 .../redistributePar/parPointFieldDistributor.C              | 2 +-
 .../parallelProcessing/redistributePar/redistributePar.C    | 5 ++---
 tutorials/multiphase/interFoam/RAS/DTCHull/Allrun           | 6 ++++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
index 2d8bb57a2d..08b7977b27 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
@@ -30,6 +30,11 @@ License
 #include "parLagrangianDistributor.H"
 #include "passivePositionParticleCloud.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+int Foam::parLagrangianDistributor::verbose_ = 1;
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::parLagrangianDistributor::parLagrangianDistributor
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
index 344c323a04..ad1bfbfe38 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
@@ -91,6 +91,10 @@ class parLagrangianDistributor
 
 public:
 
+    //- Output verbosity when writing
+    static int verbose_;
+
+
     // Constructors
 
         //- Construct from components
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
index c30fd6f7b6..bf786a2912 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
@@ -174,8 +174,6 @@ Foam::label Foam::parLagrangianDistributor::distributeFieldFields
         )
     );
 
-    const bool verbose_ = true;
-
     label nFields = 0;
     for (const word& objectName : fieldNames)
     {
@@ -263,8 +261,6 @@ Foam::label Foam::parLagrangianDistributor::readFields
         )
     );
 
-    const bool verbose_ = true;
-
     label nFields = 0;
     for (const word& objectName : fieldNames)
     {
@@ -313,8 +309,6 @@ Foam::label Foam::parLagrangianDistributor::distributeStoredFields
         cloud.lookupClass<Container>()
     );
 
-    const bool verbose_ = true;
-
     label nFields = 0;
     forAllIters(fields, iter)
     {
diff --git a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
index ade2b7a237..08e6c6be17 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-int Foam::parPointFieldDistributor::verbose_ = 0;
+int Foam::parPointFieldDistributor::verbose_ = 1;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 9010cd6db2..15e57b0bef 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -1087,13 +1087,11 @@ int main(int argc, char *argv[])
       : fileHandler()
     );
 
-
-
     // Make sure to call findTimes on all processors to force caching of
     // time directories
     (void)fileHandler().findTimes(args.path(), "constant");
 
-
+    // Need this line since we don't include "setRootCase.H"
     #include "foamDlOpenLibs.H"
 
     const bool reconstruct = args.found("reconstruct");
@@ -1109,6 +1107,7 @@ int main(int argc, char *argv[])
     if (optVerbose)
     {
         // Report on output
+        faMeshDistributor::verbose_ = 1;
         parPointFieldDistributor::verbose_ = 1;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
index 439656a35e..5e5e58ab7a 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
@@ -29,12 +29,14 @@ restore0Dir
 
 runApplication setFields
 
-runApplication decomposePar
+# runApplication decomposePar
+runParallel -s decompose redistributePar -decompose
 
 runParallel renumberMesh -overwrite
 
 runParallel $(getApplication)
 
-runApplication reconstructPar
+# runApplication reconstructPar
+runParallel -s reconstruct redistributePar -reconstruct
 
 #------------------------------------------------------------------------------