From 9a40fb787ebf91541978c4efce6d856a1ca05c6e Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 21 Jan 2015 20:07:15 +0000 Subject: [PATCH] multiphase solvers: print phase-name rather than alpha1/2 when printing max and min phase-fraction --- .../solvers/multiphase/compressibleInterFoam/alphaEqns.H | 4 ++-- applications/solvers/multiphase/driftFluxFoam/alphaEqn.H | 8 ++++---- .../solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H | 4 ++-- applications/solvers/multiphase/interFoam/alphaEqn.H | 8 ++++---- .../multiphase/interFoam/interMixingFoam/alphaEqns.H | 8 ++++---- .../solvers/multiphase/interPhaseChangeFoam/alphaEqn.H | 8 ++++---- .../solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H | 4 ++-- .../twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H index f5717a654d..41ed1cf9c0 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H +++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H @@ -82,7 +82,7 @@ Info<< "Liquid phase volume fraction = " << alpha1.weightedAverage(mesh.V()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Min(alpha2) = " << min(alpha2).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Min(" << alpha2.name() << ") = " << min(alpha2).value() << endl; } diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H index d9345cd9c2..faf164638c 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H @@ -23,8 +23,8 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; tmp tphiAlphaUD(alpha1Eqn.flux()); @@ -150,7 +150,7 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H index 4d889f12dd..956bacf48d 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H @@ -64,8 +64,8 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H index b25d12511c..13543ad4f7 100644 --- a/applications/solvers/multiphase/interFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/alphaEqn.H @@ -47,8 +47,8 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; tmp tphiAlphaUD(alpha1Eqn.flux()); @@ -144,7 +144,7 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H index a327809020..6bdb9b66f7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H @@ -163,13 +163,13 @@ Info<< "Air phase volume fraction = " << alpha1.weightedAverage(mesh.V()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; Info<< "Liquid phase volume fraction = " << alpha2.weightedAverage(mesh.V()).value() - << " Min(alpha2) = " << min(alpha2).value() - << " Max(alpha2) = " << max(alpha2).value() + << " Min(" << alpha2.name() << ") = " << min(alpha2).value() + << " Max(" << alpha2.name() << ") = " << max(alpha2).value() << endl; } diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H index 5d915ecc14..bf506c2a70 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H @@ -33,8 +33,8 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; tphiAlpha = alpha1Eqn.flux(); @@ -117,7 +117,7 @@ Info<< "Liquid phase volume fraction = " << alpha1.weightedAverage(mesh.V()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H index adca48e965..d7a5fa13de 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H @@ -17,7 +17,7 @@ Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index dcc3595b7a..f536e93a60 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -547,8 +547,8 @@ void Foam::twoPhaseSystem::solve() Info<< alpha1.name() << " volume fraction = " << alpha1.weightedAverage(mesh_.V()).value() - << " Min(alpha1) = " << min(alpha1).value() - << " Max(alpha1) = " << max(alpha1).value() + << " Min(" << alpha1.name() << ") = " << min(alpha1).value() + << " Max(" << alpha1.name() << ") = " << max(alpha1).value() << endl; } }