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 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/constantDiameter/constantDiameter.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/diameterModel/newDiameterModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/diameterModels/isothermalDiameter/isothermalDiameter.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H 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 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H 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..09acb9d22c 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C @@ -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/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/Uoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air index 4f5e766638..abef789c9c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/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/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/Uair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil index e6cb214d17..1820dbd6d6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/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/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/damBreak4phase/0.org/alphaair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/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/damBreak4phase/0.org/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphamercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury index 598b083fef..d224de9509 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/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/damBreak4phaseFine/0.org/alphawater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water index a91b1a5968..cf96bb9d9f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/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/Uair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air index e6cb214d17..abef789c9c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/Uair +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/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/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/Uoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil index 4f5e766638..1820dbd6d6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Uoil +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/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/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/damBreak4phaseFine/0.org/alphaair b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphaair rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air index ba8f818579..be8307fdf2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/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/damBreak4phaseFine/0.org/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphamercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury index 598b083fef..d224de9509 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/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/multiphaseEulerFoam/damBreak4phase/0.org/alphaoil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphaoil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/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/damBreak4phase/0.org/alphawater b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphawater rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water index a91b1a5968..cf96bb9d9f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/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/damBreak4phase/0.org/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/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/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil similarity index 97% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil index 21ce07a42c..bfcff63aed 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/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 ); } );