From e1f2329222f240b396bfae20bff31b5ae190cb98 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 3 Jun 2016 09:16:34 -0700 Subject: [PATCH] STY: Updating function in pEq, ErrorInFunction and tutorial web site name --- .../interCondensingEvaporatingFoam/pEqn.H | 14 +++----------- .../newtemperaturePhaseChangeTwoPhaseMixture.C | 6 ++---- .../condensatingVessel/0/T | 4 ++-- .../condensatingVessel/0/U | 4 ++-- .../condensatingVessel/0/alpha.liquid | 4 ++-- .../condensatingVessel/0/k | 4 ++-- .../condensatingVessel/0/nut | 4 ++-- .../condensatingVessel/0/omega | 4 ++-- .../condensatingVessel/0/p_rgh | 4 ++-- .../condensatingVessel/constant/g | 4 ++-- .../constant/phaseChangeProperties | 4 ++-- .../constant/thermophysicalProperties | 4 ++-- .../constant/transportProperties | 4 ++-- .../constant/turbulenceProperties | 4 ++-- .../condensatingVessel/system/blockMeshDict | 2 +- .../condensatingVessel/system/controlDict | 4 ++-- .../condensatingVessel/system/fvSchemes | 4 ++-- .../condensatingVessel/system/fvSolution | 4 ++-- 18 files changed, 36 insertions(+), 46 deletions(-) diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H index 254c7801a7..c2b043c57b 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H @@ -2,8 +2,7 @@ volScalarField rAU("rAU", 1.0/UEqn.A()); surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU)); - volVectorField HbyA("HbyA", U); - HbyA = rAU*UEqn.H(); + volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh)); surfaceScalarField phiHbyA ( @@ -23,15 +22,8 @@ phiHbyA += phig; - // Update the fixedFluxPressure BCs to ensure flux consistency - setSnGrad - ( - p_rgh.boundaryField(), - ( - phiHbyA.boundaryField() - - (mesh.Sf().boundaryField() & U.boundaryField()) - )/(mesh.magSf().boundaryField()*rAUf.boundaryField()) - ); + // Update the pressure BCs to ensure flux consistency + constrainPressure(p_rgh, U, phiHbyA, rAUf); Pair > vDot = mixture->vDot(); const volScalarField& vDotc = vDot[0](); diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C index a43b164bd1..8dbb7c038c 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C @@ -65,10 +65,8 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New if (cstrIter == componentsConstructorTablePtr_->end()) { - FatalErrorIn - ( - "temperaturePhaseChangeTwoPhaseMixture::New" - ) << "Unknown temperaturePhaseChangeTwoPhaseMixture type " + FatalErrorInFunction + << "Unknown temperaturePhaseChangeTwoPhaseMixture type " << temperaturePhaseChangeTwoPhaseMixtureTypeName << endl << endl << "Valid temperaturePhaseChangeTwoPhaseMixtures are : " << endl << componentsConstructorTablePtr_->sortedToc() diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T index b9eb18ab4e..1c3c7eb1b5 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U index 78f898c918..5c8dd4ae38 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid index 945b4a7dbf..dd161e0e15 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k index 477ea8b0c4..7d9331b849 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut index b66f88e63a..b84e26897a 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega index ef28765034..c040ee5282 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh index f7da7b27bd..df33f57bab 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g index 371140f708..4702e33f63 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties index 4b460bbbb3..df309ff74c 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties index 095d02e683..928e6bcdff 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties index 7c5b0e47bf..7b11306833 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties index 72d5f5c4d4..9907248c08 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict index c198f8665a..85ac05af58 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict index bd31bba570..108ca5fe82 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes index 919c38770f..305d727946 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution index 08cc0ed7ce..52d1527ecc 100644 --- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution +++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile