From 5fda35882efe9c7f330b95a3301dc3ca001b8212 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 11 May 2013 11:56:42 +0100 Subject: [PATCH 1/3] fvcSup: Change field argument to const --- src/finiteVolume/finiteVolume/fvc/fvcSup.C | 16 ++++++++-------- src/finiteVolume/finiteVolume/fvc/fvcSup.H | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.C b/src/finiteVolume/finiteVolume/fvc/fvcSup.C index d1af6ad007..67b0e11df7 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSup.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ tmp > Su ( const GeometricField& su, - GeometricField& vf + const GeometricField& vf ) { return su; @@ -54,7 +54,7 @@ tmp > Su ( const tmp >& tsu, - GeometricField& vf + const GeometricField& vf ) { return tsu; @@ -66,7 +66,7 @@ tmp > Sp ( const volScalarField& sp, - GeometricField& vf + const GeometricField& vf ) { return sp*vf; @@ -77,7 +77,7 @@ tmp > Sp ( const tmp& tsp, - GeometricField& vf + const GeometricField& vf ) { return tsp*vf; @@ -89,7 +89,7 @@ tmp > Sp ( const dimensionedScalar& sp, - GeometricField& vf + const GeometricField& vf ) { return sp*vf; @@ -101,7 +101,7 @@ tmp > SuSp ( const volScalarField& sp, - GeometricField& vf + const GeometricField& vf ) { return sp*vf; @@ -112,7 +112,7 @@ tmp > SuSp ( const tmp& tsp, - GeometricField& vf + const GeometricField& vf ) { return tsp*vf; diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.H b/src/finiteVolume/finiteVolume/fvc/fvcSup.H index 8ac75a2150..2958d676b9 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSup.H +++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,14 +55,14 @@ namespace fvc tmp > Su ( const GeometricField&, - GeometricField& + const GeometricField& ); template tmp > Su ( const tmp >&, - GeometricField& + const GeometricField& ); @@ -72,14 +72,14 @@ namespace fvc tmp > Sp ( const volScalarField&, - GeometricField& + const GeometricField& ); template tmp > Sp ( const tmp&, - GeometricField& + const GeometricField& ); @@ -87,7 +87,7 @@ namespace fvc tmp > Sp ( const dimensionedScalar&, - GeometricField& + const GeometricField& ); @@ -97,14 +97,14 @@ namespace fvc tmp > SuSp ( const volScalarField&, - GeometricField& + const GeometricField& ); template tmp > SuSp ( const tmp&, - GeometricField& + const GeometricField& ); } From f18c1c53b23d71795292191611daa620cd171b7c Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 11 May 2013 11:56:57 +0100 Subject: [PATCH 2/3] phaseChangeTwoPhaseMixtures: Correct docs for mDotP function --- .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H | 7 +++---- .../phaseChangeTwoPhaseMixtures/Merkle/Merkle.H | 9 ++++----- .../SchnerrSauer/SchnerrSauer.H | 7 +++---- .../phaseChangeTwoPhaseMixture.H | 10 ++++------ 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H index 74f8f2b931..39ccad5382 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,9 +108,8 @@ public: // and a coefficient to multiply alphal for the vaporisation rate virtual Pair > mDotAlphal() const; - //- Return the mass condensation and vaporisation rates as an - // explicit term for the condensation rate and a coefficient to - // multiply (p - pSat) for the vaporisation rate + //- Return the mass condensation and vaporisation rates as coefficients + // to multiply (p - pSat) virtual Pair > mDotP() const; //- Correct the Kunz phaseChange model diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H index 9351afd2de..7dd8e841c8 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H @@ -1,8 +1,8 @@ /*---------------------------------------------------------------------------*\ - ========Merkle= | + ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,9 +102,8 @@ public: // and a coefficient to multiply alphal for the vaporisation rate virtual Pair > mDotAlphal() const; - //- Return the mass condensation and vaporisation rates as an - // explicit term for the condensation rate and a coefficient to - // multiply (p - pSat) for the vaporisation rate + //- Return the mass condensation and vaporisation rates as coefficients + // to multiply (p - pSat) virtual Pair > mDotP() const; //- Correct the Merkle phaseChange model diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H index dd676b8fd0..beef7fc7fc 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,9 +115,8 @@ public: // and a coefficient to multiply alphal for the vaporisation rate virtual Pair > mDotAlphal() const; - //- Return the mass condensation and vaporisation rates as an - // explicit term for the condensation rate and a coefficient to - // multiply (p - pSat) for the vaporisation rate + //- Return the mass condensation and vaporisation rates as coefficients + // to multiply (p - pSat) virtual Pair > mDotP() const; //- Correct the SchnerrSauer phaseChange model diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H index fc81d080d3..e05476390b 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H @@ -139,9 +139,8 @@ public: // and a coefficient to multiply alphal for the vaporisation rate virtual Pair > mDotAlphal() const = 0; - //- Return the mass condensation and vaporisation rates as an - // explicit term for the condensation rate and a coefficient to - // multiply (p - pSat) for the vaporisation rate + //- Return the mass condensation and vaporisation rates as coefficients + // to multiply (p - pSat) virtual Pair > mDotP() const = 0; //- Return the volumetric condensation and vaporisation rates as a @@ -149,9 +148,8 @@ public: // and a coefficient to multiply alphal for the vaporisation rate Pair > vDotAlphal() const; - //- Return the volumetric condensation and vaporisation rates as an - // explicit term for the condensation rate and a coefficient to - // multiply (p - pSat) for the vaporisation rate + //- Return the volumetric condensation and vaporisation rates as + // coefficients to multiply (p - pSat) Pair > vDotP() const; //- Correct the phaseChange model From 1c0b73055d37a315e6d9338becc7c27ab8aff75e Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 11 May 2013 11:57:10 +0100 Subject: [PATCH 3/3] multiphaseMixture: Remove alphaTable which is no longer used --- .../multiphaseMixture/multiphaseMixture.C | 5 ----- .../multiphaseMixture/multiphaseMixture.H | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 76b4dab8dd..a154565747 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -111,11 +111,6 @@ Foam::multiphaseMixture::multiphaseMixture { calcAlphas(); alphas_.write(); - - forAllIter(PtrDictionary, phases_, iter) - { - alphaTable_.add(iter()); - } } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index 19b436ef2a..ce97221eea 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,6 @@ SourceFiles #include "PtrDictionary.H" #include "volFields.H" #include "surfaceFields.H" -#include "multivariateSurfaceInterpolationScheme.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -156,9 +155,6 @@ private: //- Conversion factor for degrees into radians static const scalar convertToRad; - //- Phase-fraction field table for multivariate discretisation - multivariateSurfaceInterpolationScheme::fieldTable alphaTable_; - // Private member functions