diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C index 35930d3340f1359a7c182595d778796cec3b306e..72d4e767814707db2a079509048cae0cfd6fdba2 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 a061f0da4c3649cde693c9cf91926e5a3c49743d..110ea4ef40de603dd9173f9dd29935ef8847ee4b 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 d7830cd44e123fe5f2b57bd0d3dc8af76503ebd4..a5128ba625b0b9f3f974f0452aa1fba948c77a71 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 2dafc678c24781673141ce1f3ade762f9dfd66ef..3d8f12afb4012c6280e4676f756cffa80a3a67de 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 35a78300b4cbeef158894a0328d730222c53af69..3fc2b5374091bd3bcb41fcb3cb011b4bef4fbc13 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 d7830cd44e123fe5f2b57bd0d3dc8af76503ebd4..a5128ba625b0b9f3f974f0452aa1fba948c77a71 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 2dafc678c24781673141ce1f3ade762f9dfd66ef..3d8f12afb4012c6280e4676f756cffa80a3a67de 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 35a78300b4cbeef158894a0328d730222c53af69..3fc2b5374091bd3bcb41fcb3cb011b4bef4fbc13 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 d7830cd44e123fe5f2b57bd0d3dc8af76503ebd4..a5128ba625b0b9f3f974f0452aa1fba948c77a71 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 2dafc678c24781673141ce1f3ade762f9dfd66ef..3d8f12afb4012c6280e4676f756cffa80a3a67de 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 b26b2d3c9aef69340154a48b11df8e40940eca7c..431d62254a25725b97abc80ee62b24592b194ce4 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 35a78300b4cbeef158894a0328d730222c53af69..3fc2b5374091bd3bcb41fcb3cb011b4bef4fbc13 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 965308f8aa792b64afcccd68fdc88cda952c9774..6753d9822cef6bc993ddc29c066007c62b9ff05c 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; }