diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H index f5717a654dbe16677f62539fa427ba91011f82d5..41ed1cf9c0af6e7bf72c5936d4959f95452b7bd1 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 d9345cd9c2e1eddac7bd09d85907899ff9a2a58d..faf164638cb51d80071ff73af6d9b56d9d6618ec 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<surfaceScalarField> 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 4d889f12ddda29c0af82930524f59627e1b46d19..956bacf48dce00e2412aef5d62732cb077bddc5c 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 b25d12511c404ef8995f3089fe9b8e8d8560aa00..13543ad4f78063cec86233984074ca53c026f944 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<surfaceScalarField> 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 a3278090207d02ba65bf44a714c5903191c2280f..6bdb9b66f70a50a1b389fa9b7d4c81e5afc787cd 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 5d915ecc14a34b77035a9a4e78d9d7716d640248..bf506c2a70fa7a0d40532e96f9578068cea1ba52 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 adca48e96529294758a2a542d1e12c74240f248a..d7a5fa13de2b8764d735945bdfec2f34b6da4bdb 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 dcc3595b7aeb5311adacc3c2bdd6f1a063b012ae..f536e93a6086ba2965506b19077fb966c7ab8f2e 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; } }