From 823ba60caebfdfdef76dcdeb8ab9eaea910da4a2 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 22 Sep 2017 16:45:45 -0700
Subject: [PATCH] ENH: correcting new thermo type for reactingParcelFoam
 tutorials. Correcting thermoSingleLayer.C mask field alpha to avoid heat
 sources where there is no film. Tunning fvSolution for alpha for
 twoPhasePachuka tutorial

---
 .../thermoSingleLayer/thermoSingleLayer.C                 | 8 +++-----
 .../reactingParcelFoam/hotBoxes/Allrun-parallel           | 3 ++-
 .../hotBoxes/constant/chemistryProperties                 | 2 +-
 .../hotBoxes/constant/combustionProperties                | 2 +-
 .../hotBoxes/constant/thermophysicalProperties            | 2 +-
 .../rivuletPanel/constant/chemistryProperties             | 2 +-
 .../rivuletPanel/constant/combustionProperties            | 2 +-
 .../rivuletPanel/constant/thermophysicalProperties        | 2 +-
 .../splashPanel/constant/chemistryProperties              | 2 +-
 .../splashPanel/constant/combustionProperties             | 2 +-
 .../splashPanel/constant/surfaceFilmProperties            | 2 +-
 .../splashPanel/constant/thermophysicalProperties         | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/fvSolution      | 4 ++--
 13 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 35930d3340f..72d4e767814 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -269,17 +269,15 @@ void thermoSingleLayer::updateSubmodels()
 
 tmp<fvScalarMatrix> thermoSingleLayer::q(volScalarField& hs) const
 {
-    const volScalarField alpha(pos(delta_ - deltaSmall_));
-
     return
     (
         // Heat-transfer to the primary region
       - fvm::Sp(htcs_->h()/Cp_, hs)
-      + htcs_->h()*(hs/Cp_ + alpha*(TPrimary_ - T_))
+      + htcs_->h()*(hs/Cp_ + alpha_*(TPrimary_ - T_))
 
         // Heat-transfer to the wall
       - fvm::Sp(htcw_->h()/Cp_, hs)
-      + htcw_->h()*(hs/Cp_ + alpha*(Tw_- T_))
+      + htcw_->h()*(hs/Cp_ + alpha_*(Tw_- T_))
     );
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel
index a061f0da4c3..110ea4ef40d 100755
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel
@@ -6,8 +6,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
 runApplication -s primaryRegion  decomposePar
+runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
+
 
 runParallel $(getApplication)
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
index d7830cd44e1..a5128ba625b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
index 2dafc678c24..3d8f12afb40 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
index 35a78300b4c..3fc2b537409 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
index d7830cd44e1..a5128ba625b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
index 2dafc678c24..3d8f12afb40 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
index 35a78300b4c..3fc2b537409 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
index d7830cd44e1..a5128ba625b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
index 2dafc678c24..3d8f12afb40 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
index b26b2d3c9ae..431d62254a2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
@@ -33,7 +33,7 @@ thermoSingleLayerCoeffs
 
     filmViscosityModel liquid;
 
-    deltaWet    1e-4;
+    deltaWet    2e-4;
     hydrophilic no;
 
     turbulence  laminar;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
index 35a78300b4c..3fc2b537409 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
index 965308f8aa7..6753d9822ce 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
@@ -24,7 +24,7 @@ solvers
         cAlpha          1;
 
         MULESCorr       yes;
-        nLimiterIter    2;
+        nLimiterIter    10;
 
         solver          smoothSolver;
         smoother        symGaussSeidel;
@@ -45,7 +45,7 @@ solvers
     {
         solver          PCG;
         preconditioner  DIC;
-        tolerance       1e-07;
+        tolerance       1e-08;
         relTol          0.05;
     }
 
-- 
GitLab