diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean index a1a5b83bfa..f9d9eaad2b 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean @@ -2,7 +2,6 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wclean libso phaseModel wclean libso multiphaseSystem wclean libso interfacialModels wclean diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake index 4ab7ebbfb9..bc9227ddcb 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake @@ -2,9 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso phaseModel -wmake libso interfacialModels +wmakeLnInclude interfacialModels wmake libso multiphaseSystem +wmake libso interfacialModels wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index 7cd8f48ee4..ab8d970994 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -IphaseModel/lnInclude \ -ImultiphaseSystem/lnInclude \ -ImultiphaseFixedFluxPressure \ -IinterfacialModels/lnInclude \ @@ -15,7 +14,6 @@ EXE_INC = \ EXE_LIBS = \ -lmultiphaseSystem \ - -lcompressibleMultiPhaseModel \ -linterfaceProperties \ -lincompressibleTransportModels \ -lcompressibleMultiphaseEulerianInterfacialModels \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options index 67811850d7..682a236843 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I../phaseModel/lnInclude + -I../multiphaseSystem/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lcompressibleMultiPhaseModel + -lmultiphaseSystem diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files index 1f6106038e..e14922c0e3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files @@ -1,3 +1,9 @@ +phaseModel/phaseModel.C +diameterModels/diameterModel/diameterModel.C +diameterModels/diameterModel/newDiameterModel.C +diameterModels/constantDiameter/constantDiameter.C +diameterModels/isothermalDiameter/isothermalDiameter.C + alphaContactAngle/alphaContactAngleFvPatchScalarField.C multiphaseSystem.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options index 231ff8a2ce..ce7e7a2d85 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options @@ -8,7 +8,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lcompressibleMultiPhaseModel \ -linterfaceProperties \ -lincompressibleTransportModels \ -lcompressibleMultiphaseEulerianInterfacialModels \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C similarity index 96% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C index 7be2be6d56..315f160893 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 97% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H index 5ce8c9a3d9..071820c319 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 95% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C index 800c700dce..2618815d24 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 97% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H index 3af7bd18ff..0c8364b461 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C similarity index 96% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/newDiameterModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C index 01d685ad56..b9014f3f46 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 96% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C index 39d6f1afbd..4b9e571503 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 97% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H index 29fe2c8642..0d155ad16e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C similarity index 94% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C index a4c5a87bbe..3d6f3dde00 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C @@ -34,7 +34,7 @@ License Foam::phaseModel::phaseModel ( - const word& name, + const word& phaseName, const dictionary& phaseDict, const fvMesh& mesh ) @@ -43,7 +43,7 @@ Foam::phaseModel::phaseModel ( IOobject ( - "alpha" + name, + IOobject::groupName("alpha", phaseName), mesh.time().timeName(), mesh, IOobject::MUST_READ, @@ -51,7 +51,7 @@ Foam::phaseModel::phaseModel ), mesh ), - name_(name), + name_(phaseName), phaseDict_(phaseDict), nu_ ( @@ -81,7 +81,7 @@ Foam::phaseModel::phaseModel ( IOobject ( - "U" + name, + IOobject::groupName("U", phaseName), mesh.time().timeName(), mesh, IOobject::MUST_READ, @@ -93,7 +93,7 @@ Foam::phaseModel::phaseModel ( IOobject ( - "DDtU" + name, + IOobject::groupName("DDtU", phaseName), mesh.time().timeName(), mesh ), @@ -104,7 +104,7 @@ Foam::phaseModel::phaseModel ( IOobject ( - "phiAlpha" + name, + IOobject::groupName("phiAlpha", phaseName), mesh.time().timeName(), mesh ), @@ -112,7 +112,7 @@ Foam::phaseModel::phaseModel dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) ) { - const word phiName = "phi" + name; + const word phiName = IOobject::groupName("phi", name_); IOobject phiHeader ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H similarity index 98% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H index cd50760aff..abaab320f6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/files deleted file mode 100644 index 216ae9a5e9..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/files +++ /dev/null @@ -1,7 +0,0 @@ -phaseModel/phaseModel.C -diameterModels/diameterModel/diameterModel.C -diameterModels/diameterModel/newDiameterModel.C -diameterModels/constantDiameter/constantDiameter.C -diameterModels/isothermalDiameter/isothermalDiameter.C - -LIB = $(FOAM_LIBBIN)/libcompressibleMultiPhaseModel diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/options deleted file mode 100644 index 0ec1139209..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude - -LIB_LIBS = \ - -lincompressibleTransportModels diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C index 8827b9a808..08e7c0b043 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.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 @@ -29,7 +29,7 @@ License Foam::phase::phase ( - const word& name, + const word& phaseName, const dictionary& phaseDict, const volVectorField& U, const surfaceScalarField& phi @@ -39,7 +39,7 @@ Foam::phase::phase ( IOobject ( - "alpha" + name, + IOobject::groupName("alpha", phaseName), U.mesh().time().timeName(), U.mesh(), IOobject::MUST_READ, @@ -47,9 +47,18 @@ Foam::phase::phase ), U.mesh() ), - name_(name), + name_(phaseName), phaseDict_(phaseDict), - nuModel_(viscosityModel::New("nu" + name, phaseDict_, U, phi)), + nuModel_ + ( + viscosityModel::New + ( + IOobject::groupName("nu", phaseName), + phaseDict_, + U, + phi + ) + ), rho_(phaseDict_.lookup("rho")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H index 864b9c7afb..21a38ea5a6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H @@ -57,16 +57,12 @@ + fvc::ddtPhiCorr(rAU2, alpha2, U2, phi2) ); - phi = alpha1f*phiHbyA1 + alpha2f*phiHbyA2; - mrfZones.makeRelative(phi); - phiHbyA1 += ( fvc::interpolate((1.0/rho1)*rAU1*dragCoeff)*phi2 - phiP1 + rAlphaAU1f*(g & mesh.Sf()) ); - mrfZones.makeRelative(phiHbyA1); phiHbyA2 += ( @@ -74,8 +70,9 @@ - phiP2 + rAlphaAU2f*(g & mesh.Sf()) ); - mrfZones.makeRelative(phiHbyA2); + mrfZones.makeRelative(phiHbyA1); + mrfZones.makeRelative(phiHbyA2); mrfZones.makeRelative(phi1.oldTime()); mrfZones.makeRelative(phi1); mrfZones.makeRelative(phi2.oldTime()); @@ -83,6 +80,16 @@ surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2); + // Update phi BCs before pEqn + phi.boundaryField() = + mrfZones.relative + ( + alpha1f.boundaryField() + *(mesh.Sf().boundaryField() & U1.boundaryField()) + + alpha2f.boundaryField() + *(mesh.Sf().boundaryField() & U2.boundaryField()) + ); + HbyA1 += (1.0/rho1)*rAU1*dragCoeff*U2; HbyA2 += (1.0/rho2)*rAU2*dragCoeff*U1; @@ -171,11 +178,17 @@ surfaceScalarField mSfGradp(pEqnIncomp.flux()/Dp); phi1.boundaryField() == - (mesh.Sf().boundaryField() & U1.boundaryField()); + mrfZones.relative + ( + mesh.Sf().boundaryField() & U1.boundaryField() + ); phi1 = phiHbyA1 + rAlphaAU1f*mSfGradp/fvc::interpolate(rho1); phi2.boundaryField() == - (mesh.Sf().boundaryField() & U2.boundaryField()); + mrfZones.relative + ( + mesh.Sf().boundaryField() & U2.boundaryField() + ); phi2 = phiHbyA2 + rAlphaAU2f*mSfGradp/fvc::interpolate(rho2); phi = alpha1f*phi1 + alpha2f*phi2; diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index a53a6142cf..a6b18b6114 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -602,8 +602,13 @@ int main(int argc, char *argv[]) dictList.set(sz++, iter().clone()); } - Info<< "Writing modified fieldDict " << fieldName << endl; - dictList.write(); + Info<< "Writing modified " << fieldName << endl; + dictList.writeObject + ( + runTime.writeFormat(), + runTime.writeFormat(), + IOstream::UNCOMPRESSED + ); } else { diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C index 1dd395cee0..778de9a92f 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C @@ -50,10 +50,7 @@ Foam::Ostream& Foam::operator<< } // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const CSV&)" - ); + os.check("Ostream& operator<<(Ostream&, const CSV&)"); return os; } @@ -83,11 +80,15 @@ void Foam::CSV::writeData(Ostream& os) const os << componentColumns_; os.format(IOstream::BINARY); } + else + { + os << componentColumns_; + } os << token::END_STATEMENT << nl; os.writeKeyword("separator") << string(separator_) << token::END_STATEMENT << nl; - os.writeKeyword("mergeSeparators") << string(mergeSeparators_) + os.writeKeyword("mergeSeparators") << mergeSeparators_ << token::END_STATEMENT << nl; os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl; os << decrIndent << indent << token::END_BLOCK << endl; diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C index 90561b5f3b..70ce53da1e 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C @@ -35,7 +35,7 @@ License namespace Foam { -defineTypeNameAndDebug(MRFZone, 0); + defineTypeNameAndDebug(MRFZone, 0); } @@ -423,7 +423,7 @@ void Foam::MRFZone::addCoriolis } -void Foam::MRFZone::relativeVelocity(volVectorField& U) const +void Foam::MRFZone::makeRelative(volVectorField& U) const { const volVectorField& C = mesh_.C(); @@ -461,7 +461,7 @@ void Foam::MRFZone::relativeVelocity(volVectorField& U) const } -void Foam::MRFZone::absoluteVelocity(volVectorField& U) const +void Foam::MRFZone::makeAbsolute(volVectorField& U) const { const volVectorField& C = mesh_.C(); @@ -501,7 +501,13 @@ void Foam::MRFZone::absoluteVelocity(volVectorField& U) const void Foam::MRFZone::makeRelative(surfaceScalarField& phi) const { - relativeRhoFlux(geometricOneField(), phi); + makeRelativeRhoFlux(geometricOneField(), phi); +} + + +void Foam::MRFZone::makeRelative(FieldField& phi) const +{ + return makeRelativeRhoFlux(oneFieldField(), phi); } @@ -511,13 +517,13 @@ void Foam::MRFZone::makeRelative surfaceScalarField& phi ) const { - relativeRhoFlux(rho, phi); + makeRelativeRhoFlux(rho, phi); } void Foam::MRFZone::makeAbsolute(surfaceScalarField& phi) const { - absoluteRhoFlux(geometricOneField(), phi); + makeAbsoluteRhoFlux(geometricOneField(), phi); } @@ -527,7 +533,7 @@ void Foam::MRFZone::makeAbsolute surfaceScalarField& phi ) const { - absoluteRhoFlux(rho, phi); + makeAbsoluteRhoFlux(rho, phi); } diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H index bf9ea3341a..97e59e2f6d 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H @@ -45,7 +45,7 @@ SourceFiles #include "dimensionedScalar.H" #include "dimensionedVector.H" #include "volFieldsFwd.H" -#include "surfaceFieldsFwd.H" +#include "surfaceFields.H" #include "fvMatricesFwd.H" #include "mapPolyMesh.H" #include "DataEntry.H" @@ -114,15 +114,23 @@ class MRFZone //- Make the given absolute mass/vol flux relative within the MRF region template - void relativeRhoFlux + void makeRelativeRhoFlux ( const RhoFieldType& rho, surfaceScalarField& phi ) const; + //- Make the given absolute mass/vol flux relative within the MRF region + template + void makeRelativeRhoFlux + ( + const RhoFieldType& rho, + FieldField& phi + ) const; + //- Make the given relative mass/vol flux absolute within the MRF region template - void absoluteRhoFlux + void makeAbsoluteRhoFlux ( const RhoFieldType& rho, surfaceScalarField& phi @@ -208,14 +216,18 @@ public: ) const; //- Make the given absolute velocity relative within the MRF region - void relativeVelocity(volVectorField& U) const; + void makeRelative(volVectorField& U) const; //- Make the given relative velocity absolute within the MRF region - void absoluteVelocity(volVectorField& U) const; + void makeAbsolute(volVectorField& U) const; //- Make the given absolute flux relative within the MRF region void makeRelative(surfaceScalarField& phi) const; + //- Make the given absolute boundary flux relative + // within the MRF region + void makeRelative(FieldField& phi) const; + //- Make the given absolute mass-flux relative within the MRF region void makeRelative ( diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C index 2b9eb7211a..8ab2aa1731 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C @@ -160,20 +160,20 @@ void Foam::MRFZoneList::addCoriolis } -void Foam::MRFZoneList::relativeVelocity(volVectorField& U) const +void Foam::MRFZoneList::makeRelative(volVectorField& U) const { forAll(*this, i) { - operator[](i).relativeVelocity(U); + operator[](i).makeRelative(U); } } -void Foam::MRFZoneList::absoluteVelocity(volVectorField& U) const +void Foam::MRFZoneList::makeAbsolute(volVectorField& U) const { forAll(*this, i) { - operator[](i).absoluteVelocity(U); + operator[](i).makeAbsolute(U); } } @@ -187,6 +187,23 @@ void Foam::MRFZoneList::makeRelative(surfaceScalarField& phi) const } +Foam::tmp > +Foam::MRFZoneList::relative +( + const tmp >& phi +) const +{ + tmp > rphi(phi); + + forAll(*this, i) + { + operator[](i).makeRelative(rphi()); + } + + return rphi; +} + + void Foam::MRFZoneList::makeRelative ( const surfaceScalarField& rho, diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H index a7d8e74f77..4965d85e39 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H @@ -103,14 +103,21 @@ public: void addCoriolis(const volScalarField& rho, fvVectorMatrix& UEqn) const; //- Make the given absolute velocity relative within the MRF region - void relativeVelocity(volVectorField& U) const; + void makeRelative(volVectorField& U) const; //- Make the given relative velocity absolute within the MRF region - void absoluteVelocity(volVectorField& U) const; + void makeAbsolute(volVectorField& U) const; //- Make the given absolute flux relative within the MRF region void makeRelative(surfaceScalarField& phi) const; + //- Return the given absolute boundary flux relative within + // the MRF region + tmp > relative + ( + const tmp >& tphi + ) const; + //- Make the given absolute mass-flux relative within the MRF region void makeRelative ( diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C index bc0087826c..ff056fb3b3 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void Foam::MRFZone::relativeRhoFlux +void Foam::MRFZone::makeRelativeRhoFlux ( const RhoFieldType& rho, surfaceScalarField& phi @@ -54,6 +54,22 @@ void Foam::MRFZone::relativeRhoFlux phii[facei] -= rho[facei]*(Omega ^ (Cfi[facei] - origin_)) & Sfi[facei]; } + makeRelativeRhoFlux(rho.boundaryField(), phi.boundaryField()); +} + + +template +void Foam::MRFZone::makeRelativeRhoFlux +( + const RhoFieldType& rho, + FieldField& phi +) const +{ + const surfaceVectorField& Cf = mesh_.Cf(); + const surfaceVectorField& Sf = mesh_.Sf(); + + const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_; + // Included patches forAll(includedFaces_, patchi) { @@ -61,7 +77,7 @@ void Foam::MRFZone::relativeRhoFlux { label patchFacei = includedFaces_[patchi][i]; - phi.boundaryField()[patchi][patchFacei] = 0.0; + phi[patchi][patchFacei] = 0.0; } } @@ -72,8 +88,8 @@ void Foam::MRFZone::relativeRhoFlux { label patchFacei = excludedFaces_[patchi][i]; - phi.boundaryField()[patchi][patchFacei] -= - rho.boundaryField()[patchi][patchFacei] + phi[patchi][patchFacei] -= + rho[patchi][patchFacei] * (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin_)) & Sf.boundaryField()[patchi][patchFacei]; } @@ -82,7 +98,7 @@ void Foam::MRFZone::relativeRhoFlux template -void Foam::MRFZone::absoluteRhoFlux +void Foam::MRFZone::makeAbsoluteRhoFlux ( const RhoFieldType& rho, surfaceScalarField& phi diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 68d19890dd..a8003d43be 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -64,31 +64,40 @@ void Foam::ParticleCollector::makeLogFile outputFilePtr_() << "# Source : " << type() << nl + << "# Bins : " << faces.size() << nl << "# Total area : " << sum(area) << nl; - outputFilePtr_() << "# Geometry :" << nl; + outputFilePtr_() + << "# Geometry :" << nl + << '#' + << tab << "Bin" + << tab << "(Centre_x Centre_y Centre_z)" + << tab << "Area" + << nl; + forAll(faces, i) { - word id = Foam::name(i); - outputFilePtr_() - << '#' << tab << "point[" << id << "] = " - << faces[i].centre(points) << nl; + << '#' + << tab << i + << tab << faces[i].centre(points) + << tab << area[i] + << nl; } - outputFilePtr_()<< '#' << nl << "# Time"; + outputFilePtr_() + << '#' << nl + << "# Output format:" << nl; forAll(faces, i) { word id = Foam::name(i); - - if (i != 0) - { - outputFilePtr_() << "#"; - } + word binId = "bin_" + id; outputFilePtr_() - << tab << "area[" << id << "]" + << '#' + << tab << "Time" + << tab << binId << tab << "mass[" << id << "]" << tab << "massFlowRate[" << id << "]" << endl; @@ -406,12 +415,6 @@ void Foam::ParticleCollector::write() Info<< type() << " output:" << nl; - if (outputFilePtr_.valid()) - { - outputFilePtr_() << time.timeName(); - } - - Field faceMassTotal(mass_.size(), 0.0); this->getModelProperty("massTotal", faceMassTotal); @@ -439,7 +442,8 @@ void Foam::ParticleCollector::write() if (outputFilePtr_.valid()) { outputFilePtr_() - << tab << area_[faceI] + << time.timeName() + << tab << faceI << tab << faceMassTotal[faceI] << tab << faceMassFlowRate[faceI] << endl; diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C index abfdc581ac..870dc31ffc 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.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 @@ -59,7 +59,6 @@ Foam::HeatTransferModel::HeatTransferModel {} - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index 2f99a1872d..50d1c7c1ef 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -1049,6 +1049,7 @@ void kinematicSingleLayer::info() const { Info<< "\nSurface film: " << type() << endl; + const scalarField& deltaInternal = delta_.internalField(); const vectorField& Uinternal = U_.internalField(); Info<< indent << "added mass = " @@ -1057,8 +1058,8 @@ void kinematicSingleLayer::info() const << gSum((deltaRho_*magSf())()) << nl << indent << "min/max(mag(U)) = " << gMin(mag(Uinternal)) << ", " << gMax(mag(Uinternal)) << nl - << indent << "min/max(delta) = " << min(delta_).value() << ", " - << max(delta_).value() << nl + << indent << "min/max(delta) = " << gMin(deltaInternal) << ", " + << gMax(deltaInternal) << nl << indent << "coverage = " << gSum(alpha_.internalField()*magSf())/gSum(magSf()) << nl; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2 new file mode 100644 index 0000000000..2fef379ec7 --- /dev/null +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2 @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object CO2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + fuel + { + type fixedValue; + value uniform 0; + } + air + { + type fixedValue; + value uniform 0; + } + outlet + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O new file mode 100644 index 0000000000..ca22735630 --- /dev/null +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object H2O; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + fuel + { + type fixedValue; + value uniform 0; + } + air + { + type fixedValue; + value uniform 0; + } + outlet + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 index ac188ad505..8b2b2e8b5d 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 @@ -17,21 +17,26 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.77; +internalField uniform 1; boundaryField { fuel { - type calculated; + type fixedValue; + value uniform 0.0; } air { - type calculated; + type fixedValue; + value uniform 0.77; } outlet { - type calculated; + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } frontAndBack { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 index d7ab36547c..95649fdac4 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.23; +internalField uniform 0; boundaryField { @@ -34,8 +34,8 @@ boundaryField outlet { type inletOutlet; - inletValue uniform 0.23; - value uniform 0.23; + inletValue uniform 0; + value uniform 0; } frontAndBack { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat index f2b4a35b53..c74018bbdb 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat @@ -17,19 +17,19 @@ FoamFile dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.0; +internalField uniform 0; boundaryField { fuel { type fixedValue; - value uniform 0.0; + value uniform 0; } air { type fixedValue; - value uniform 0.0; + value uniform 0; } outlet { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon index e536911162..ad65f7ea0f 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon @@ -24,12 +24,12 @@ boundaryField fuel { type fixedValue; - value uniform 1.e-5; + value uniform 1e-05; } air { type fixedValue; - value uniform 1.e-5; + value uniform 1e-05; } outlet { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k index ea9dd15921..3dcedaa2da 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k @@ -17,19 +17,19 @@ FoamFile dimensions [0 2 -2 0 0 0 0]; -internalField uniform 3.75e-5; +internalField uniform 3.75e-05; boundaryField { fuel { type fixedValue; - value uniform 3.75e-5; + value uniform 3.75e-05; } air { type fixedValue; - value uniform 3.75e-5; + value uniform 3.75e-05; } outlet { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut index 1cf2a1efca..47d65d567d 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut @@ -17,19 +17,19 @@ FoamFile dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.0; +internalField uniform 0; boundaryField { fuel { type fixedValue; - value uniform 0.0; + value uniform 0; } air { type fixedValue; - value uniform 0.0; + value uniform 0; } outlet { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p index 52393be19b..79f071ce31 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p @@ -15,7 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [1 -1 -2 0 0 0 0]; internalField uniform 1e5; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/rho b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/rho new file mode 100644 index 0000000000..d1620aaeb0 --- /dev/null +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/rho @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object rho; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 0 0 0 0 0]; + +internalField uniform 1.18001; + +boundaryField +{ + fuel + { + type calculated; + value uniform 0.243121; + } + air + { + type calculated; + value uniform 0.438564; + } + outlet + { + type calculated; + value uniform 1.18001; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties index 6c1f0e9cf3..9c283d5933 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties @@ -22,7 +22,7 @@ active true; PaSRCoeffs { Cmix 0.1; - turbulentReaction on; + turbulentReaction off; } diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions index 839b5e4e45..e548bae90f 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions @@ -11,10 +11,10 @@ reactions { methaneReaction { - type irreversibleArrheniusReaction; - reaction "CH4 + 2O2 = CO2 + 2H2O"; - A 5.2e16; - beta 0; - Ta 14906; + type irreversibleArrheniusReaction; + reaction "CH4 + 2O2 = CO2 + 2H2O"; + A 5.2e16; + beta 0; + Ta 14906; } } diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes index 6d4a329ff2..3731c816a3 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes @@ -23,7 +23,6 @@ ddtSchemes gradSchemes { default Gauss linear; - grad(p) Gauss linear; } divSchemes @@ -42,13 +41,7 @@ divSchemes laplacianSchemes { - default Gauss linear uncorrected; - laplacian(muEff,U) Gauss linear uncorrected; - laplacian(mut,U) Gauss linear uncorrected; - laplacian(DkEff,k) Gauss linear uncorrected; - laplacian(DepsilonEff,epsilon) Gauss linear uncorrected; - laplacian((rho*(1|A(U))),p) Gauss linear uncorrected; - laplacian(alphaEff,h) Gauss linear uncorrected; + default Gauss linear orthogonal; } interpolationSchemes @@ -58,7 +51,7 @@ interpolationSchemes snGradSchemes { - default uncorrected; + default orthogonal; } fluxRequired diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U index 711702f987..21b0d542ec 100644 --- a/tutorials/incompressible/icoFoam/cavity/0/U +++ b/tutorials/incompressible/icoFoam/cavity/0/U @@ -22,8 +22,17 @@ boundaryField { movingWall { - type fixedValue; - value uniform (1 0 0); + type uniformFixedValue; + uniformValue csvFile; + csvFileCoeffs + { + nHeaderLine 1; + refColumn 0; + componentColumns (1 2 3); + mergeSeparators no; + fileName "$FOAM_CASE/csvData"; + separator " "; + } } fixedWalls diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Alltest b/tutorials/incompressible/pisoFoam/les/motorBike/Alltest new file mode 100755 index 0000000000..51909283a5 --- /dev/null +++ b/tutorials/incompressible/pisoFoam/les/motorBike/Alltest @@ -0,0 +1,10 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Do the Spalart-Allmaras steady-state case +(cd motorBike && foamRunTutorials) + +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 index 3c48882346..8b2b2e8b5d 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 @@ -34,7 +34,6 @@ boundaryField outlet { type inletOutlet; -// inletValue uniform 0.77; inletValue uniform 1; value uniform 1; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 index 29b38fbb21..95649fdac4 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 @@ -34,7 +34,6 @@ boundaryField outlet { type inletOutlet; -// inletValue uniform 0.23; inletValue uniform 0; value uniform 0; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun deleted file mode 100755 index b729092026..0000000000 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# create mesh -runApplication blockMesh - -# run the solver -runApplication `getApplication` diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties index 754f22dad2..06715e90f1 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties @@ -22,7 +22,7 @@ active true; PaSRCoeffs { Cmix 0.1; - turbulentReaction on; + turbulentReaction off; useReactionRate true; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.compressibleGas new file mode 100644 index 0000000000..ff00e560b4 --- /dev/null +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.compressibleGas @@ -0,0 +1,129 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermo.compressibleGas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +O2 +{ + specie + { + nMoles 1; + molWeight 31.9988; + } + thermodynamics + { + Tlow 200; + Thigh 5000; + Tcommon 1000; + highCpCoeffs ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 ); + lowCpCoeffs ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 ); + } + transport + { + As 1.67212e-06; + Ts 170.672; + } +} + +H2O +{ + specie + { + nMoles 1; + molWeight 18.0153; + } + thermodynamics + { + Tlow 200; + Thigh 5000; + Tcommon 1000; + highCpCoeffs ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 ); + lowCpCoeffs ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 ); + } + transport + { + As 1.67212e-06; + Ts 170.672; + } +} + +CH4 +{ + specie + { + nMoles 1; + molWeight 16.0428; + } + thermodynamics + { + Tlow 200; + Thigh 6000; + Tcommon 1000; + highCpCoeffs ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 ); + lowCpCoeffs ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 ); + } + transport + { + As 1.67212e-06; + Ts 170.672; + } +} + +CO2 +{ + specie + { + nMoles 1; + molWeight 44.01; + } + thermodynamics + { + Tlow 200; + Thigh 5000; + Tcommon 1000; + highCpCoeffs ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 ); + lowCpCoeffs ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 ); + } + transport + { + As 1.67212e-06; + Ts 170.672; + } +} + +N2 +{ + specie + { + nMoles 1; + molWeight 28.0134; + } + thermodynamics + { + Tlow 200; + Thigh 5000; + Tcommon 1000; + highCpCoeffs ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 ); + lowCpCoeffs ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 ); + } + transport + { + As 1.67212e-06; + Ts 170.672; + } +} + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 deleted file mode 100644 index b25328716a..0000000000 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 +++ /dev/null @@ -1,139 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object thermo.icoPoly8; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -O2 -{ - specie - { - nMoles 1; - molWeight 31.9988; - } - equationOfState - { - rhoCoeffs<8> ( 4.1388 -0.016603 3.3039e-05 -3.6455e-08 2.3302e-11 -8.5664e-15 1.6783e-18 -1.356e-22 ); - } - thermodynamics - { - Hf 0; - Sf 6407.93; - CpCoeffs<8> ( 904.2 -0.35136 0.0019339 -2.6639e-06 1.8222e-09 -6.75e-13 1.2962e-16 -1.0131e-20 ); - } - transport - { - muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 ); - kappaCoeffs<8> ( -0.0017889 9.5996e-05 -3.129e-08 7.9407e-12 -8.1996e-16 0 0 0 ); - } -} - -H2O -{ - specie - { - nMoles 1; - molWeight 18.0153; - } - equationOfState - { - rhoCoeffs<8> ( 2.3302 -0.0093477 1.8601e-05 -2.0524e-08 1.3119e-11 -4.8229e-15 9.4489e-19 -7.6342e-23 ); - } - thermodynamics - { - Hf -13424600; - Sf 10475.4; - CpCoeffs<8> ( 1570.5 1.6886 -0.0039382 6.2482e-06 -4.9342e-09 2.0513e-12 -4.3361e-16 3.6812e-20 ); - } - transport - { - muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 ); - kappaCoeffs<8> ( 0.0069975 0.00013726 8.6579e-09 -7.1514e-12 8.441e-16 0 0 0 ); - } -} - -CH4 -{ - specie - { - nMoles 1; - molWeight 16.043; - } - equationOfState - { - rhoCoeffs<8> ( 2.0751 -0.0083243 1.6564e-05 -1.8277e-08 1.1683e-11 -4.2949e-15 8.4144e-19 -6.7984e-23 ); - } - thermodynamics - { - Hf -4.66836e+06; - Sf 11597.7; - CpCoeffs<8> ( 996.92 4.0854 -0.00092999 1.957e-06 -2.9777e-09 1.7459e-12 -4.5594e-16 4.4774e-20 ); - } - transport - { - muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 ); - kappaCoeffs<8> ( -0.018501 0.00021332 1.4678e-07 -7.7129e-11 1.0936e-14 0 0 0 ); - } -} - -CO2 -{ - specie - { - nMoles 1; - molWeight 44.01; - } - equationOfState - { - rhoCoeffs<8> ( 5.6924 -0.022836 4.544e-05 -5.014e-08 3.2048e-11 -1.1782e-14 2.3083e-18 -1.865e-22 ); - } - thermodynamics - { - Hf -8.9423e+06; - Sf 4856.6; - CpCoeffs<8> ( 462.23 1.5803 -0.0010515 7.4618e-08 3.216e-10 -1.9646e-13 4.7679e-17 -4.3027e-21 ); - } - transport - { - muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 ); - kappaCoeffs<8> ( -0.0076857 0.00010773 -2.7043e-08 4.4967e-12 -3.0218e-16 0 0 0 ); - } -} - -N2 -{ - specie - { - nMoles 1; - molWeight 28.0134; - } - equationOfState - { - rhoCoeffs<8> ( 3.6234 -0.014535 2.8924e-05 -3.1915e-08 2.0399e-11 -7.4994e-15 1.4693e-18 -1.1871e-22 ); - } - thermodynamics - { - Hf 51.2816; - Sf 6836.49; - CpCoeffs<8> ( 1049.8 -0.16537 0.00036105 2.0824e-07 -5.3568e-10 3.2274e-13 -8.3335e-17 8.054e-21 ); - } - transport - { - muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 ); - kappaCoeffs<8> ( 0.0028213 8.6668e-05 -1.5148e-08 1.2499e-12 3.1675e-17 0 0 0 ); - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties index 8b36a40f5d..4c54af61d5 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties @@ -19,10 +19,10 @@ thermoType { type heRhoThermo; mixture reactingMixture; - transport polynomial; - thermo hPolynomial; + transport sutherland; + thermo janaf; energy sensibleEnthalpy; - equationOfState icoPolynomial; + equationOfState perfectGas; specie specie; } @@ -32,7 +32,7 @@ chemistryReader foamChemistryReader; foamChemistryFile "$FOAM_CASE/constant/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.icoPoly8"; +foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes index 58be93e54d..dd00d8dd67 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes @@ -23,31 +23,26 @@ ddtSchemes gradSchemes { default Gauss linear; - grad(p) Gauss linear; } divSchemes { default none; - div(phi,U) Gauss upwind; - div(phi,Yi_h) Gauss upwind; - div(phi,h) Gauss upwind; - div(phi,K) Gauss upwind; - div(phi,epsilon) Gauss upwind; - div(phi,k) Gauss upwind; + div(phi,U) Gauss limitedLinearV 1; + div(phi,Yi_h) Gauss limitedLinear01 1; + div(phi,h) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,epsilon) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes { default Gauss linear orthogonal; - laplacian(muEff,U) Gauss linear orthogonal; - laplacian(mut,U) Gauss linear orthogonal; - laplacian(DkEff,k) Gauss linear orthogonal; - laplacian(DepsilonEff,epsilon) Gauss linear orthogonal; - laplacian((rho*(1|A(U))),p) Gauss linear orthogonal; - laplacian(alphaEff,h) Gauss linear orthogonal; } interpolationSchemes diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index f1e4568f0e..552f948a84 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -86,9 +86,9 @@ PIMPLE rhoMin 0.1; rhoMax 1.5; - maxCo 0.5; + maxCo 0.1; rDeltaTSmoothingCoeff 0.1; - maxDeltaT 1; + maxDeltaT 2e-4; alphaTemp 0.005; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties index 94ede2729a..2ba702faa8 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties @@ -41,7 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; - kapppa cell; + kappa cell; p cell; } diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/U b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/U new file mode 100644 index 0000000000..7ed7234005 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/U @@ -0,0 +1,37 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + location "constant"; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + atmosphere + { + type pressureInletOutletVelocity; + value uniform (0 0 0); + } + walls + { + type fixedValue; + value uniform (0 0 0); + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water new file mode 100644 index 0000000000..31402a0144 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water @@ -0,0 +1,37 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "constant"; + object alpha.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + walls + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water.org new file mode 100644 index 0000000000..33b377faf6 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water.org @@ -0,0 +1,37 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "constant"; + object alpha.water.org; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + walls + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/p_rgh new file mode 100644 index 0000000000..85bfb4aef1 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/p_rgh @@ -0,0 +1,43 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "constant"; + object p_rgh; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + atmosphere + { + type totalPressure; + rho rho; + psi none; + gamma 1; + p0 uniform 0; + value uniform 0; + } + walls + { + type fixedFluxPressure; + gradient uniform 0; + phi phiAbs; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Tair b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Tair rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air index 25bc08d671..f704d27aa3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Tair +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object Tair; + object T.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +27,7 @@ boundaryField outlet { type inletOutlet; - phi phiair; + phi phi.air; inletValue $internalField; value $internalField; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Twater b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Twater rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water index f0f366c7dc..d19f29f191 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Twater +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object Twater; + object T.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +27,7 @@ boundaryField outlet { type inletOutlet; - phi phiwater; + phi phi.water; inletValue uniform 300; value $internalField; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uair b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uair rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air index 001c7c1f3b..53d6ef460f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air @@ -10,7 +10,7 @@ FoamFile version 2.0; format binary; class volVectorField; - object Uair; + object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,7 +28,7 @@ boundaryField outlet { type pressureInletOutletVelocity; - phi phiair; + phi phi.air; value $internalField; } walls diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uwater b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uwater rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water index 22ed59a0ef..aab00fd78b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Uwater +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water @@ -10,7 +10,7 @@ FoamFile version 2.0; format binary; class volVectorField; - object Uwater; + object U.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,7 +28,7 @@ boundaryField outlet { type pressureInletOutletVelocity; - phi phiwater; + phi phi.water; value $internalField; } walls diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air index 11b988820d..1b1a35684a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaair; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -1908,7 +1908,7 @@ boundaryField outlet { type inletOutlet; - phi phiair; + phi phi.air; inletValue uniform 1; value uniform 1; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair.org b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair.org rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org index 62088eca23..f4f9f0cf3b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphaair.org +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org @@ -28,7 +28,7 @@ boundaryField outlet { type inletOutlet; - phi phiair; + phi phi.air; inletValue uniform 1; value uniform 1; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water index e2a093f9e4..92b1a774aa 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphawater; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -1908,7 +1908,7 @@ boundaryField outlet { type inletOutlet; - phi phiwater; + phi phi.water; inletValue uniform 0; value uniform 0; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater.org b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater.org rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org index 9b11653fea..75a49e4169 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphawater.org +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alphawater; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,7 +28,7 @@ boundaryField outlet { type inletOutlet; - phi phiwater; + phi phi.water; inletValue uniform 0; value uniform 0; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary index 56e0a545c1..bf47f69643 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary @@ -38,6 +38,7 @@ FoamFile defaultFaces { type empty; + inGroups 1(empty); nFaces 3750; startFace 3850; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict index a29fcd583d..d78ae2fd45 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict @@ -60,21 +60,21 @@ functions outputControl outputTime; fields ( - Uair + U.air { mean on; prime2Mean off; base time; } - Uwater + U.water { mean on; prime2Mean off; base time; } - alphaair + alpha.air { mean on; prime2Mean off; diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict index 755148a96e..10cbadf00d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alphaair 1 - volScalarFieldValue alphawater 0 + volScalarFieldValue alpha.air 1 + volScalarFieldValue alpha.water 0 ); regions @@ -28,8 +28,8 @@ regions box (0 0 -0.1) (0.15 0.701 0.1); fieldValues ( - volScalarFieldValue alphaair 0 - volScalarFieldValue alphawater 1 + volScalarFieldValue alpha.air 0 + volScalarFieldValue alpha.water 1 ); } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air index e6cb214d17..abef789c9c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object Uair; + object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Umercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Umercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury index 71ee76460b..c9a998697d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Umercury +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object Umercury; + object U.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil index 4f5e766638..1820dbd6d6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object Uoil; + object U.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uwater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uwater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaair; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphamercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury index 598b083fef..d224de9509 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphamercury +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphamercury; + object alpha.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaoil; + object alpha.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphawater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water index a91b1a5968..cf96bb9d9f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphawater +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphawater; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p index 037f82d0b0..a4f1d992e5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p @@ -42,8 +42,8 @@ boundaryField { type totalPressure; p0 uniform 0; - U Uair; - phi phiair; + U U.air; + phi phi.air; rho rho; psi none; gamma 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary index 41c06d5f3f..1b4dbb60aa 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary @@ -44,6 +44,7 @@ FoamFile defaultFaces { type empty; + inGroups 1(empty); nFaces 4536; startFace 4640; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict index 3abdf3f73a..0a139a98ec 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict @@ -17,10 +17,10 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alphaair 1 - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 + volScalarFieldValue alpha.air 1 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 volVectorFieldValue U ( 0 0 0 ) ); @@ -31,10 +31,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 1 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 1 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -42,10 +42,10 @@ regions box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 1 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 1 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -53,10 +53,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.1 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 1 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 1 + volScalarFieldValue alpha.air 0 ); } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air index 4f5e766638..abef789c9c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object Uoil; + object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury new file mode 100644 index 0000000000..c9a998697d --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + location "0"; + object U.mercury; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + leftWall + { + type fixedValue; + value uniform (0 0 0); + } + rightWall + { + type fixedValue; + value uniform (0 0 0); + } + lowerWall + { + type fixedValue; + value uniform (0 0 0); + } + atmosphere + { + type fluxCorrectedVelocity; + value uniform (0 0 0); + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil index e6cb214d17..1820dbd6d6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object Uair; + object U.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uwater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uwater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Umercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Umercury deleted file mode 100644 index 71ee76460b..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Umercury +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object Umercury; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - leftWall - { - type fixedValue; - value uniform (0 0 0); - } - rightWall - { - type fixedValue; - value uniform (0 0 0); - } - lowerWall - { - type fixedValue; - value uniform (0 0 0); - } - atmosphere - { - type fluxCorrectedVelocity; - value uniform (0 0 0); - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaair; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphamercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury index 598b083fef..d224de9509 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphamercury +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphamercury; + object alpha.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaoil; + object alpha.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphawater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water index a91b1a5968..cf96bb9d9f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphawater +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphawater; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p index 037f82d0b0..a4f1d992e5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p @@ -42,8 +42,8 @@ boundaryField { type totalPressure; p0 uniform 0; - U Uair; - phi phiair; + U U.air; + phi phi.air; rho rho; psi none; gamma 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary new file mode 100644 index 0000000000..a477fd3cba --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + leftWall + { + type wall; + nFaces 195; + startFace 68014; + } + rightWall + { + type wall; + nFaces 195; + startFace 68209; + } + lowerWall + { + type wall; + nFaces 206; + startFace 68404; + } + atmosphere + { + type patch; + nFaces 176; + startFace 68610; + } + defaultFaces + { + type empty; + inGroups 1(empty); + nFaces 68400; + startFace 68786; + } +) + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict index 3abdf3f73a..0a139a98ec 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict @@ -17,10 +17,10 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alphaair 1 - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 + volScalarFieldValue alpha.air 1 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 volVectorFieldValue U ( 0 0 0 ) ); @@ -31,10 +31,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 1 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 1 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -42,10 +42,10 @@ regions box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 1 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 1 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -53,10 +53,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.1 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 1 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 1 + volScalarFieldValue alpha.air 0 ); } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air index 5826f86061..6c91343655 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; - object Uair; + object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury index 964d72357e..44441b84d8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; - object Umercury; + object U.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil index 1b069b2057..9f6f8f999c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; - object Uoil; + object U.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water index c6e99512cd..65f9af410b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; - object Uwater; + object U.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air index 73fe2520c9..9296ad250a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alphaoil; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury index f444c16775..810fc552ab 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alphamercury; + object alpha.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil index c09ba884ec..d5d952a648 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alphaair; + object alpha.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water index 25b317fcff..6819da8b79 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alphawater; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary index 292f25b806..188a0f0c58 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary @@ -32,12 +32,14 @@ FoamFile front { type empty; + inGroups 1(empty); nFaces 3072; startFace 6336; } back { type empty; + inGroups 1(empty); nFaces 3072; startFace 9408; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaair rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaair +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaair; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury new file mode 100644 index 0000000000..d224de9509 --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alpha.mercury; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type zeroGradient; + } + rightWall + { + type zeroGradient; + } + lowerWall + { + type zeroGradient; + } + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaoil +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaoil; + object alpha.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water new file mode 100644 index 0000000000..cf96bb9d9f --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alpha.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type zeroGradient; + } + rightWall + { + type zeroGradient; + } + lowerWall + { + type zeroGradient; + } + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphamercury deleted file mode 100644 index 598b083fef..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphamercury +++ /dev/null @@ -1,49 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphamercury; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type inletOutlet; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphawater deleted file mode 100644 index a91b1a5968..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphawater +++ /dev/null @@ -1,49 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphawater; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type inletOutlet; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary index 41c06d5f3f..1b4dbb60aa 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary @@ -44,6 +44,7 @@ FoamFile defaultFaces { type empty; + inGroups 1(empty); nFaces 4536; startFace 4640; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict index 3abdf3f73a..0a139a98ec 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict @@ -17,10 +17,10 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alphaair 1 - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 + volScalarFieldValue alpha.air 1 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 volVectorFieldValue U ( 0 0 0 ) ); @@ -31,10 +31,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 1 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 1 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -42,10 +42,10 @@ regions box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 1 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 1 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -53,10 +53,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.1 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 1 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 1 + volScalarFieldValue alpha.air 0 ); } ); diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaair rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaair +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaair; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury new file mode 100644 index 0000000000..d224de9509 --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alpha.mercury; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type zeroGradient; + } + rightWall + { + type zeroGradient; + } + lowerWall + { + type zeroGradient; + } + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaoil +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alphaoil; + object alpha.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water new file mode 100644 index 0000000000..cf96bb9d9f --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alpha.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type zeroGradient; + } + rightWall + { + type zeroGradient; + } + lowerWall + { + type zeroGradient; + } + atmosphere + { + type inletOutlet; + inletValue uniform 0; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphamercury deleted file mode 100644 index 598b083fef..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphamercury +++ /dev/null @@ -1,49 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphamercury; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type inletOutlet; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphawater deleted file mode 100644 index a91b1a5968..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphawater +++ /dev/null @@ -1,49 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphawater; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type inletOutlet; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary index 04429b16df..a477fd3cba 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary @@ -44,6 +44,7 @@ FoamFile defaultFaces { type empty; + inGroups 1(empty); nFaces 68400; startFace 68786; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict index c43e612ae5..0a139a98ec 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict @@ -17,10 +17,11 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alphaair 1 - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 + volScalarFieldValue alpha.air 1 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 + volVectorFieldValue U ( 0 0 0 ) ); regions @@ -30,10 +31,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 1 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 1 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -41,10 +42,10 @@ regions box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 1 - volScalarFieldValue alphamercury 0 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 1 + volScalarFieldValue alpha.mercury 0 + volScalarFieldValue alpha.air 0 ); } boxToCell @@ -52,10 +53,10 @@ regions box ( 0 0 -1 ) ( 0.1461 0.1 1 ); fieldValues ( - volScalarFieldValue alphawater 0 - volScalarFieldValue alphaoil 0 - volScalarFieldValue alphamercury 1 - volScalarFieldValue alphaair 0 + volScalarFieldValue alpha.water 0 + volScalarFieldValue alpha.oil 0 + volScalarFieldValue alpha.mercury 1 + volScalarFieldValue alpha.air 0 ); } );