From 2780df8365be3052ed72d388ffc7b61eca9ddcd6 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 Aug 2013 23:21:46 +0100
Subject: [PATCH] multiphase: Update phase-naming to use the new convention
e.g. alpha.water
---
.../multiphase/cavitatingFoam/alphavPsi.H | 11 ++++
.../cavitatingFoam/cavitatingFoam.C | 2 +-
.../cavitatingFoam/continuityErrs.H | 2 +-
.../multiphase/cavitatingFoam/createFields.H | 14 ++---
.../multiphase/cavitatingFoam/gammaPsi.H | 11 ----
.../solvers/multiphase/cavitatingFoam/pEqn.H | 16 +++---
.../twoPhaseMixtureThermo.C | 4 +-
.../phaseChangeTwoPhaseMixtures/Kunz/Kunz.C | 5 +-
.../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H | 3 +-
.../Merkle/Merkle.C | 5 +-
.../Merkle/Merkle.H | 3 +-
.../SchnerrSauer/SchnerrSauer.C | 5 +-
.../SchnerrSauer/SchnerrSauer.H | 3 +-
.../newPhaseChangeTwoPhaseMixture.C | 5 +-
.../phaseChangeTwoPhaseMixture.C | 5 +-
.../phaseChangeTwoPhaseMixture.H | 11 ++--
.../multiphase/twoLiquidMixingFoam/alphaEqn.H | 2 +-
...tFlowRateInletVelocityFvPatchVectorField.C | 19 ++++---
...tFlowRateInletVelocityFvPatchVectorField.H | 5 ++
.../incompressibleTwoPhaseMixture.C | 10 ++--
.../incompressibleTwoPhaseMixture.H | 4 +-
.../twoPhaseMixture/twoPhaseMixture.C | 22 ++------
.../twoPhaseMixture/twoPhaseMixture.H | 4 +-
.../0/{alpha1.org => alpha.water.org} | 0
.../LTSInterFoam/wigleyHull/Allclean | 2 +-
.../multiphase/LTSInterFoam/wigleyHull/Allrun | 2 +-
.../wigleyHull/constant/transportProperties | 6 ++-
.../LTSInterFoam/wigleyHull/system/fvSchemes | 2 +-
.../LTSInterFoam/wigleyHull/system/fvSolution | 2 +-
.../wigleyHull/system/setFieldsDict | 4 +-
.../mixerVessel2D/0/{alpha1 => alpha.water} | 2 +-
.../0/{alpha1.org => alpha.water.org} | 2 +-
.../constant/transportProperties | 6 ++-
.../mixerVessel2D/system/fvSchemes | 2 +-
.../mixerVessel2D/system/fvSolution | 2 +-
.../mixerVessel2D/system/setFieldsDict | 4 +-
.../0/gamma => les/throttle/0/alpha.vapour} | 2 +-
.../les/throttle/constant/transportProperties | 11 ++--
.../les/throttle/system/controlDict | 2 +-
.../throttle3D/0.org/{gamma => alpha.vapour} | 2 +-
.../cavitatingFoam/les/throttle3D/0/U | 48 -----------------
.../cavitatingFoam/les/throttle3D/0/gamma | 48 -----------------
.../cavitatingFoam/les/throttle3D/0/k | 47 ----------------
.../cavitatingFoam/les/throttle3D/0/nuSgs | 47 ----------------
.../cavitatingFoam/les/throttle3D/0/p | 51 ------------------
.../cavitatingFoam/les/throttle3D/0/rho | 46 ----------------
.../cavitatingFoam/les/throttle3D/Allclean | 1 -
.../throttle3D/constant/transportProperties | 11 ++--
.../les/throttle3D/system/controlDict | 2 +-
.../0/gamma => ras/throttle/0/alpha.vapour} | 2 +-
.../ras/throttle/constant/transportProperties | 11 ++--
.../0/alpha.water.org} | 2 +-
.../laminar/depthCharge2D/Allclean | 2 +-
.../laminar/depthCharge2D/Allrun | 2 +-
...ertiesair => thermophysicalProperties.air} | 0
...eswater => thermophysicalProperties.water} | 0
.../laminar/depthCharge2D/system/fvSchemes | 4 +-
.../laminar/depthCharge2D/system/fvSolution | 2 +-
.../depthCharge2D/system/setFieldsDict | 6 +--
.../laminar/depthCharge3D/0/T.air.gz | Bin 0 -> 5080 bytes
.../laminar/depthCharge3D/0/T.water.gz | Bin 0 -> 5082 bytes
.../0/alpha.water.org} | 0
.../laminar/depthCharge3D/Allclean | 2 +-
.../laminar/depthCharge3D/Allrun | 2 +-
...ertiesair => thermophysicalProperties.air} | 0
...eswater => thermophysicalProperties.water} | 0
.../laminar/depthCharge3D/system/fvSchemes | 4 +-
.../laminar/depthCharge3D/system/fvSolution | 2 +-
.../depthCharge3D/system/setFieldsDict | 6 +--
.../0.org/{alpha1.org => alpha.water} | 2 +-
.../0.org/{alpha1 => alpha.water.org} | 2 +-
.../constant/dynamicMeshDict | 2 +-
.../constant/transportProperties | 6 ++-
.../damBreakWithObstacle/system/fvSolution | 2 +-
.../damBreakWithObstacle/system/setFieldsDict | 4 +-
.../0.org/{alpha1 => alpha.water} | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/floatingObject/system/fvSolution | 2 +-
.../ras/floatingObject/system/setFieldsDict | 6 +--
.../0.org/{alpha1 => alpha.water} | 2 +-
.../constant/transportProperties | 11 ++--
.../ras/mixerVesselAMI/system/fvSolution | 2 +-
.../ras/mixerVesselAMI/system/setFieldsDict | 4 +-
.../0/{alpha1.org => alpha.water.org} | 2 +-
.../interDyMFoam/ras/sloshingTank2D/Allclean | 2 +-
.../interDyMFoam/ras/sloshingTank2D/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/sloshingTank2D/system/fvSolution | 2 +-
.../ras/sloshingTank2D/system/setFieldsDict | 4 +-
.../0/{alpha1.org => alpha.water.org} | 2 +-
.../ras/sloshingTank2D3DoF/Allclean | 2 +-
.../ras/sloshingTank2D3DoF/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/sloshingTank2D3DoF/system/fvSolution | 2 +-
.../sloshingTank2D3DoF/system/setFieldsDict | 4 +-
.../0/alpha.water.org} | 2 +-
.../interDyMFoam/ras/sloshingTank3D/Allclean | 2 +-
.../interDyMFoam/ras/sloshingTank3D/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/sloshingTank3D/system/fvSolution | 2 +-
.../ras/sloshingTank3D/system/setFieldsDict | 4 +-
.../0/{alpha1.org => alpha.water.org} | 2 +-
.../ras/sloshingTank3D3DoF/Allclean | 2 +-
.../ras/sloshingTank3D3DoF/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/sloshingTank3D3DoF/system/fvSolution | 2 +-
.../sloshingTank3D3DoF/system/setFieldsDict | 4 +-
.../0/alpha.water.org} | 2 +-
.../ras/sloshingTank3D6DoF/Allclean | 2 +-
.../ras/sloshingTank3D6DoF/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/sloshingTank3D6DoF/system/fvSolution | 2 +-
.../sloshingTank3D6DoF/system/setFieldsDict | 4 +-
.../0/alpha.water.org} | 2 +-
.../interDyMFoam/ras/testTubeMixer/Allclean | 2 +-
.../interDyMFoam/ras/testTubeMixer/Allrun | 2 +-
.../constant/transportProperties | 6 ++-
.../ras/testTubeMixer/system/fvSolution | 2 +-
.../ras/testTubeMixer/system/setFieldsDict | 4 +-
.../multiphase/interFoam/laminar/Allclean | 2 +-
tutorials/multiphase/interFoam/laminar/Allrun | 6 +--
.../0/{alpha1.org => alpha.water.org} | 0
.../constant/transportProperties | 6 ++-
.../laminar/capillaryRise/system/fvSchemes | 2 +-
.../laminar/capillaryRise/system/fvSolution | 2 +-
.../capillaryRise/system/setFieldsDict | 4 +-
.../damBreak/0/alpha.water.org} | 2 +-
.../damBreak/constant/transportProperties | 6 ++-
.../laminar/damBreak/system/fvSchemes | 2 +-
.../laminar/damBreak/system/fvSolution | 2 +-
.../laminar/damBreak/system/setFieldsDict | 4 +-
.../les/nozzleFlow2D/0/{alpha1 => alpha.fuel} | 2 +-
.../nozzleFlow2D/constant/transportProperties | 11 ++--
.../les/nozzleFlow2D/system/fvSolution | 2 +-
tutorials/multiphase/interFoam/ras/Allclean | 4 +-
tutorials/multiphase/interFoam/ras/Allrun | 5 +-
.../ras/damBreak/0/{alpha1 => alpha.water} | 2 +-
.../damBreak/0/alpha.water.org} | 2 +-
.../ras/damBreak/constant/transportProperties | 11 ++--
.../interFoam/ras/damBreak/system/fvSolution | 2 +-
.../ras/damBreak/system/setFieldsDict | 4 +-
.../0/{alpha1 => alpha.water} | 2 +-
.../0/{alpha1.org => alpha.water.org} | 2 +-
.../ras/damBreakPorousBaffle/0/epsilon | 3 ++
.../ras/damBreakPorousBaffle/0/p_rgh | 3 ++
.../constant/transportProperties | 11 ++--
.../damBreakPorousBaffle/system/fvSolution | 2 +-
.../damBreakPorousBaffle/system/setFieldsDict | 4 +-
.../0/{alpha1.org => alpha.water.org} | 0
.../interFoam/ras/waterChannel/Allclean | 2 +-
.../interFoam/ras/waterChannel/Allrun | 2 +-
.../LTSInterFoam/system/fvSchemes | 2 +-
.../LTSInterFoam/system/fvSolution | 2 +-
.../LTSInterFoam/system/setFieldsDict | 6 +--
.../waterChannel/constant/transportProperties | 6 ++-
.../ras/waterChannel/system/fvSchemes | 2 +-
.../ras/waterChannel/system/fvSolution | 2 +-
.../ras/waterChannel/system/setFieldsDict | 4 +-
.../interFoam/ras/weirOverflow/0.org/U | 1 +
.../0.org/{alpha1.org => alpha.water.org} | 2 +-
.../interFoam/ras/weirOverflow/Allrun | 2 +-
.../weirOverflow/constant/transportProperties | 11 ++--
.../ras/weirOverflow/system/fvSolution | 2 +-
.../ras/weirOverflow/system/setFieldsDict | 4 +-
.../propeller/0.org/{alpha1 => alpha.water} | 2 +-
.../propeller/constant/transportProperties | 6 ++-
.../propeller/system/fvSchemes | 2 +-
.../propeller/system/fvSolution | 2 +-
.../0/{alpha1 => alpha.water} | 2 +-
.../constant/transportProperties | 6 ++-
.../cavitatingBullet/system/fvSchemes | 2 +-
.../cavitatingBullet/system/fvSolution | 2 +-
.../0.org/{alpha1 => alpha.sludge} | 2 +-
.../lockExchange/constant/transportProperties | 6 ++-
.../lockExchange/system/fvSchemes | 4 +-
.../lockExchange/system/fvSolution | 2 +-
.../lockExchange/system/setFieldsDict | 4 +-
177 files changed, 313 insertions(+), 622 deletions(-)
create mode 100644 applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
delete mode 100644 applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
rename tutorials/multiphase/LTSInterFoam/wigleyHull/0/{alpha1.org => alpha.water.org} (100%)
rename tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/{alpha1 => alpha.water} (99%)
rename tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/{alpha1.org => alpha.water.org} (97%)
rename tutorials/multiphase/cavitatingFoam/{ras/throttle/0/gamma => les/throttle/0/alpha.vapour} (97%)
rename tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/{gamma => alpha.vapour} (97%)
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
rename tutorials/multiphase/cavitatingFoam/{les/throttle/0/gamma => ras/throttle/0/alpha.vapour} (97%)
rename tutorials/multiphase/compressibleInterFoam/laminar/{depthCharge3D/0/alphawater.org => depthCharge2D/0/alpha.water.org} (97%)
rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/{thermophysicalPropertiesair => thermophysicalProperties.air} (100%)
rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/{thermophysicalPropertieswater => thermophysicalProperties.water} (100%)
create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz
create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz
rename tutorials/multiphase/compressibleInterFoam/laminar/{depthCharge2D/0/alphawater.org => depthCharge3D/0/alpha.water.org} (100%)
rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/{thermophysicalPropertiesair => thermophysicalProperties.air} (100%)
rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/{thermophysicalPropertieswater => thermophysicalProperties.water} (100%)
rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/{alpha1.org => alpha.water} (97%)
rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/{alpha1 => alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/{alpha1.org => alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/{alpha1.org => alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/{testTubeMixer/0/alpha1.org => sloshingTank3D/0/alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/{alpha1.org => alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/{sloshingTank3D/0/alpha1.org => sloshingTank3D6DoF/0/alpha.water.org} (97%)
rename tutorials/multiphase/interDyMFoam/ras/{sloshingTank3D6DoF/0/alpha1.org => testTubeMixer/0/alpha.water.org} (97%)
rename tutorials/multiphase/interFoam/laminar/capillaryRise/0/{alpha1.org => alpha.water.org} (100%)
rename tutorials/multiphase/interFoam/{ras/damBreak/0/alpha1.org => laminar/damBreak/0/alpha.water.org} (97%)
rename tutorials/multiphase/interFoam/les/nozzleFlow2D/0/{alpha1 => alpha.fuel} (97%)
rename tutorials/multiphase/interFoam/ras/damBreak/0/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/interFoam/{laminar/damBreak/0/alpha1.org => ras/damBreak/0/alpha.water.org} (97%)
rename tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/{alpha1.org => alpha.water.org} (97%)
rename tutorials/multiphase/interFoam/ras/waterChannel/0/{alpha1.org => alpha.water.org} (100%)
rename tutorials/multiphase/interFoam/ras/weirOverflow/0.org/{alpha1.org => alpha.water.org} (98%)
rename tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/{alpha1 => alpha.water} (97%)
rename tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/{alpha1 => alpha.sludge} (97%)
diff --git a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
new file mode 100644
index 00000000000..e988d307373
--- /dev/null
+++ b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
@@ -0,0 +1,11 @@
+{
+ alphav = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
+ alphal = 1.0 - alphav;
+
+ Info<< "max-min alphav: " << max(alphav).value()
+ << " " << min(alphav).value() << endl;
+
+ psiModel->correct();
+
+ //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
+}
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 73e9577029b..c4453df391c 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
while (pimple.loop())
{
#include "rhoEqn.H"
- #include "gammaPsi.H"
+ #include "alphavPsi.H"
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
index ce618ee40f2..14b0ef77861 100644
--- a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
+++ b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
@@ -1,5 +1,5 @@
{
- volScalarField thermoRho = psi*p + gamma2*rhol0;
+ volScalarField thermoRho = psi*p + alphal*rhol0;
dimensionedScalar totalMass = fvc::domainIntegrate(rho);
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 8958dc3c5ed..605c0deece7 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -44,19 +44,19 @@
Info<< "Reading transportProperties\n" << endl;
- incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
+ incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv);
- volScalarField& gamma(twoPhaseProperties.alpha1());
- gamma.oldTime();
+ volScalarField& alphav(twoPhaseProperties.alpha1());
+ alphav.oldTime();
- volScalarField& gamma2(twoPhaseProperties.alpha2());
+ volScalarField& alphal(twoPhaseProperties.alpha2());
Info<< "Creating compressibilityModel\n" << endl;
autoPtr<barotropicCompressibilityModel> psiModel =
barotropicCompressibilityModel::New
(
thermodynamicProperties,
- gamma
+ alphav
);
const volScalarField& psi = psiModel->psi();
@@ -64,8 +64,8 @@
rho == max
(
psi*p
- + gamma2*rhol0
- + ((gamma*psiv + gamma2*psil) - psi)*pSat,
+ + alphal*rhol0
+ + ((alphav*psiv + alphal*psil) - psi)*pSat,
rhoMin
);
diff --git a/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H b/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
deleted file mode 100644
index 4edda7336de..00000000000
--- a/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- gamma = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
- gamma2 = 1.0 - gamma;
-
- Info<< "max-min gamma: " << max(gamma).value()
- << " " << min(gamma).value() << endl;
-
- psiModel->correct();
-
- //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
-}
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index b2c7d953b53..da43e67ce7b 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -4,8 +4,8 @@
p =
(
rho
- - gamma2*rhol0
- - ((gamma*psiv + gamma2*psil) - psi)*pSat
+ - alphal*rhol0
+ - ((alphav*psiv + alphal*psil) - psi)*pSat
)/psi;
}
@@ -29,7 +29,7 @@
fvScalarMatrix pEqn
(
fvm::ddt(psi, p)
- - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(gamma) - pSat*fvc::ddt(psi)
+ - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(alphav) - pSat*fvc::ddt(psi)
+ fvc::div(phiv, rho)
+ fvc::div(phiGradp)
- fvm::laplacian(rAUf, p)
@@ -49,18 +49,18 @@
rho == max
(
psi*p
- + gamma2*rhol0
- + ((gamma*psiv + gamma2*psil) - psi)*pSat,
+ + alphal*rhol0
+ + ((alphav*psiv + alphal*psil) - psi)*pSat,
rhoMin
);
- #include "gammaPsi.H"
+ #include "alphavPsi.H"
p =
(
rho
- - gamma2*rhol0
- - ((gamma*psiv + gamma2*psil) - psi)*pSat
+ - alphal*rhol0
+ - ((alphav*psiv + alphal*psil) - psi)*pSat
)/psi;
p.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
index d81f5ccb1f2..e9c5322c79f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
@@ -49,12 +49,12 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo
thermo2_(NULL)
{
{
- volScalarField T1("T" + phase1Name(), T_);
+ volScalarField T1(IOobject::groupName("T", phase1Name()), T_);
T1.write();
}
{
- volScalarField T2("T" + phase2Name(), T_);
+ volScalarField T2(IOobject::groupName("T", phase2Name()), T_);
T2.write();
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
index 0e9e8ae3496..f7cc2eae211 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
@@ -42,11 +42,10 @@ namespace phaseChangeTwoPhaseMixtures
Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
)
:
- phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+ phaseChangeTwoPhaseMixture(typeName, U, phi),
UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 39ccad53825..f0290efc959 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -91,8 +91,7 @@ public:
Kunz
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1"
+ const surfaceScalarField& phi
);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
index 87c261da9b8..72fdb7245eb 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
@@ -42,11 +42,10 @@ namespace phaseChangeTwoPhaseMixtures
Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
)
:
- phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+ phaseChangeTwoPhaseMixture(typeName, U, phi),
UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index 7dd8e841c83..e675c83df75 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -85,8 +85,7 @@ public:
Merkle
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1"
+ const surfaceScalarField& phi
);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
index 36cb56a0c25..f157fa75e00 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
@@ -49,11 +49,10 @@ namespace phaseChangeTwoPhaseMixtures
Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::SchnerrSauer
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
)
:
- phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+ phaseChangeTwoPhaseMixture(typeName, U, phi),
n_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("n")),
dNuc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("dNuc")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index beef7fc7fce..ce096105d90 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -98,8 +98,7 @@ public:
SchnerrSauer
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1"
+ const surfaceScalarField& phi
);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 08728c8f926..0a86459705c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -32,8 +32,7 @@ Foam::autoPtr<Foam::phaseChangeTwoPhaseMixture>
Foam::phaseChangeTwoPhaseMixture::New
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
)
{
IOdictionary transportPropertiesDict
@@ -73,7 +72,7 @@ Foam::phaseChangeTwoPhaseMixture::New
<< exit(FatalError);
}
- return autoPtr<phaseChangeTwoPhaseMixture>(cstrIter()(U, phi, alpha1Name));
+ return autoPtr<phaseChangeTwoPhaseMixture>(cstrIter()(U, phi));
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
index c08eba93906..d25fbdfec9c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
@@ -39,11 +39,10 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture
(
const word& type,
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
)
:
- incompressibleTwoPhaseMixture(U, phi, alpha1Name),
+ incompressibleTwoPhaseMixture(U, phi),
phaseChangeTwoPhaseMixtureCoeffs_(subDict(type + "Coeffs")),
pSat_(lookup("pSat"))
{}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index e05476390b6..227768ac8d3 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -91,10 +91,9 @@ public:
components,
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name
+ const surfaceScalarField& phi
),
- (U, phi, alpha1Name)
+ (U, phi)
);
@@ -104,8 +103,7 @@ public:
static autoPtr<phaseChangeTwoPhaseMixture> New
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1"
+ const surfaceScalarField& phi
);
@@ -116,8 +114,7 @@ public:
(
const word& type,
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1"
+ const surfaceScalarField& phi
);
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
index c68a0e56c5c..adca48e9652 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
@@ -1,5 +1,5 @@
{
- word alphaScheme("div(phi,alpha1)");
+ word alphaScheme("div(phi,alpha)");
surfaceScalarField phiAlpha
(
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 72af0d8d9c0..1fcc5feb7df 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -39,7 +39,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(p, iF),
- flowRate_(0)
+ flowRate_(0),
+ alphaName_("none")
{}
@@ -53,7 +54,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
- flowRate_(ptf.flowRate_)
+ flowRate_(ptf.flowRate_),
+ alphaName_(ptf.alphaName_)
{}
@@ -66,7 +68,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(p, iF, dict),
- flowRate_(readScalar(dict.lookup("flowRate")))
+ flowRate_(readScalar(dict.lookup("flowRate"))),
+ alphaName_(dict.lookup("alpha"))
{}
@@ -77,7 +80,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(ptf),
- flowRate_(ptf.flowRate_)
+ flowRate_(ptf.flowRate_),
+ alphaName_(ptf.alphaName_)
{}
@@ -89,7 +93,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(ptf, iF),
- flowRate_(ptf.flowRate_)
+ flowRate_(ptf.flowRate_),
+ alphaName_(ptf.alphaName_)
{}
@@ -104,7 +109,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
}
scalarField alphap =
- patch().lookupPatchField<volScalarField, scalar>("alpha1");
+ patch().lookupPatchField<volScalarField, scalar>(alphaName_);
alphap = max(alphap, scalar(0));
alphap = min(alphap, scalar(1));
@@ -129,6 +134,8 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
os.writeKeyword("flowRate") << flowRate_
<< token::END_STATEMENT << nl;
+ os.writeKeyword("alpha") << alphaName_
+ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
index 10e6a2c8899..34742c7567b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
@@ -39,6 +39,7 @@ Description
\table
Property | Description | Required | Default value
flowRate | volumetric flow rate [m3/s] | yes |
+ alpha | phase-fraction field | yes |
\endtable
Example of the boundary condition specification:
@@ -47,6 +48,7 @@ Description
{
type variableHeightFlowRateInletVelocity;
flowRate 0.2;
+ alpha alpha.water;
value uniform (0 0 0); // placeholder
}
\endverbatim
@@ -87,6 +89,9 @@ class variableHeightFlowRateInletVelocityFvPatchVectorField
//- Inlet integral flow rate
scalar flowRate_;
+ //- Name of the phase-fraction field
+ word alphaName_;
+
public:
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index 36c9076486a..5aa56a10626 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -53,9 +53,7 @@ void Foam::incompressibleTwoPhaseMixture::calcNu()
Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name,
- const word& alpha2Name
+ const surfaceScalarField& phi
)
:
IOdictionary
@@ -69,14 +67,14 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
IOobject::NO_WRITE
)
),
- twoPhaseMixture(U.mesh(), *this, alpha1Name, alpha2Name),
+ twoPhaseMixture(U.mesh(), *this),
nuModel1_
(
viscosityModel::New
(
"nu1",
- subDict(phase1Name_ == "1" ? "phase1": phase1Name_),
+ subDict(phase1Name_),
U,
phi
)
@@ -86,7 +84,7 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
viscosityModel::New
(
"nu2",
- subDict(phase2Name_ == "2" ? "phase2": phase2Name_),
+ subDict(phase2Name_),
U,
phi
)
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
index 8ec33989c98..5c4920e17f4 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
@@ -86,9 +86,7 @@ public:
incompressibleTwoPhaseMixture
(
const volVectorField& U,
- const surfaceScalarField& phi,
- const word& alpha1Name = "alpha1",
- const word& alpha2Name = "alpha2"
+ const surfaceScalarField& phi
);
diff --git a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
index 7b95752f370..253b1092e75 100644
--- a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
@@ -31,29 +31,17 @@ License
Foam::twoPhaseMixture::twoPhaseMixture
(
const fvMesh& mesh,
- const dictionary& dict,
- const word& alpha1Name,
- const word& alpha2Name
+ const dictionary& dict
)
:
- phase1Name_
- (
- dict.found("phases")
- ? wordList(dict.lookup("phases"))[0]
- : "1"
- ),
- phase2Name_
- (
- dict.found("phases")
- ? wordList(dict.lookup("phases"))[1]
- : "2"
- ),
+ phase1Name_(wordList(dict.lookup("phases"))[0]),
+ phase2Name_(wordList(dict.lookup("phases"))[1]),
alpha1_
(
IOobject
(
- dict.found("phases") ? word("alpha" + phase1Name_) : alpha1Name,
+ IOobject::groupName("alpha", phase1Name_),
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
@@ -66,7 +54,7 @@ Foam::twoPhaseMixture::twoPhaseMixture
(
IOobject
(
- dict.found("phases") ? word("alpha" + phase2Name_) : alpha2Name,
+ IOobject::groupName("alpha", phase2Name_),
mesh.time().timeName(),
mesh
),
diff --git a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
index 668c4f2cfd2..aa5ae24d04b 100644
--- a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
@@ -67,9 +67,7 @@ public:
twoPhaseMixture
(
const fvMesh& mesh,
- const dictionary& dict,
- const word& alpha1Name = "alpha1",
- const word& alpha2Name = "alpha2"
+ const dictionary& dict
);
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha1.org b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha1.org
rename to tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
index 333348ffdf0..99318580f37 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # run from this directory
\rm -f constant/triSurface/wigley-scaled-oriented.stl.gz
cleanCase
-rm 0/alpha1.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
+rm 0/alpha.water.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
> /dev/null 2>&1
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
index 28fec41b1fa..2924a2cd45d 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
@@ -13,7 +13,7 @@ if [ ! -e log.transformPoints ]
then
transformPoints -scale '(2 1 1)' > log.transformPoints 2>&1
fi
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
index aa9b560484a..8c6e7a2008d 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
index 7018c5eaa73..de873558162 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
@@ -55,7 +55,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index 76eaf8fd2a3..e59fb400df2 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
index b2491279962..75a2dfccb82 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (-100 -100 -100) (100 100 0);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1 b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
similarity index 99%
rename from tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1
rename to tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
index 1b5529949ca..766d8c14624 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org
rename to tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
index 0f3dcd46393..e1483e3c1ea 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
index ff55cf97dad..15e0e327a49 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water oir);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-4;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
}
-phase2
+oir
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-4;
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
index 3827ac6548c..568660217fe 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
default no;
p_rgh ;
pcorr ;
- alpha1 ;
+ alpha.water ;
}
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
index 87856ee3ca1..4d0d8915585 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
index 75b90a3695a..c5884201fc7 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (0 0 -1) (1 1 1);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
index 14593028c1e..0adb2cfd3a7 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha.vapour;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
index b37439a124f..c5ea29f7a5d 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -19,14 +19,9 @@ mul mul [ 1 -1 -1 0 0 ] 0.0065;
muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (vapour water);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
}
}
-phase2
+vapour
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 234af680caf..4507e794d2f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -73,7 +73,7 @@ functions
base time;
}
- gamma
+ alpha.vapour
{
mean on;
prime2Mean off;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
index 669af89cbff..40cd251c1c2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha.vapour;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
deleted file mode 100644
index 5321455943c..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
+++ /dev/null
@@ -1,48 +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;
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- inlet
- {
- type zeroGradient;
- value uniform (0 0 0);
- }
-
- outlet
- {
- type zeroGradient;
- value uniform (0 0 0);
- }
-
- walls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- frontBack
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
deleted file mode 100644
index 669af89cbff..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
+++ /dev/null
@@ -1,48 +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;
- object gamma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- inlet
- {
- type calculated;
- value uniform 0;
- }
-
- outlet
- {
- type calculated;
- value uniform 0;
- }
-
- walls
- {
- type calculated;
- value uniform 0;
- }
-
- frontBack
- {
- type calculated;
- value uniform 0;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
deleted file mode 100644
index 9df6a831bf7..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
+++ /dev/null
@@ -1,47 +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;
- object k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0];
-
-internalField uniform 10;
-
-boundaryField
-{
- inlet
- {
- type turbulentIntensityKineticEnergyInlet;
- intensity 0.05;
- value uniform 0.05;
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- walls
- {
- type kqRWallFunction;
- value uniform 10;
- }
-
- frontBack
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
deleted file mode 100644
index c4d32cf2ff7..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
+++ /dev/null
@@ -1,47 +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 nuSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -1 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- inlet
- {
- type calculated;
- value uniform 0;
- }
- outlet
- {
- type calculated;
- value uniform 0;
- }
- walls
- {
- type nutUSpaldingWallFunction;
- value uniform 0;
- }
- frontBack
- {
- type nutUSpaldingWallFunction;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
deleted file mode 100644
index 58cc484ff7c..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
+++ /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 volScalarField;
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0];
-
-internalField uniform 300e5;
-
-boundaryField
-{
- inlet
- {
- type totalPressure;
- U U;
- phi phiv;
- rho rho;
- psi none;
- gamma 1;
- p0 uniform 300e5;
- }
-
- outlet
- {
- type fixedValue;
- value uniform 100e5;
- }
-
- walls
- {
- type zeroGradient;
- }
-
- frontBack
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
deleted file mode 100644
index ae5f186cb51..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
+++ /dev/null
@@ -1,46 +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;
- object rho;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -3 0 0 0];
-
-internalField uniform 845;
-
-boundaryField
-{
- inlet
- {
- type fixedValue;
- value uniform 845;
- }
-
- outlet
- {
- type fixedValue;
- value uniform 835;
- }
-
- walls
- {
- type zeroGradient;
- }
-
- frontBack
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
index b5c25b61f84..06e40c886cf 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # run from this directory
rm -rf constant/polyMesh/sets > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
-cp -r 0.org 0
rm system/topoSetDict > /dev/null 2>&1
rm -rf processor[0-9] > /dev/null 2>&1
cleanCase
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
index b37439a124f..c5ea29f7a5d 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -19,14 +19,9 @@ mul mul [ 1 -1 -1 0 0 ] 0.0065;
muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (vapour water);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
}
}
-phase2
+vapour
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index e068adbb61a..b78ee601a85 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -73,7 +73,7 @@ functions
base time;
}
- gamma
+ alpha.vapour
{
mean on;
prime2Mean off;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
index 14593028c1e..0adb2cfd3a7 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha.vapour;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
index b37439a124f..c5ea29f7a5d 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -19,14 +19,9 @@ mul mul [ 1 -1 -1 0 0 ] 0.0065;
muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (vapour water);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
}
}
-phase2
+vapour
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
index d90b720092a..6a1b3d978fe 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alphawater;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 8821d7e1cc1..78f3e40ad83 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -3,4 +3,4 @@ cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T*.gz
+rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T*.gz
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index ac803d715f9..5d2fadf4120 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
runApplication blockMesh
-cp 0/alphawater.org 0/alphawater
+cp 0/alpha.water.org 0/alpha.water
cp 0/p_rgh.org 0/p_rgh
cp 0/p.org 0/p
cp 0/T.org 0/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index 3582eeafa1a..b44890f3896 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
div(phirb,alpha) Gauss interfaceCompression 1;
div(rho*phi,U) Gauss upwind;
- div(phi,thermo:rhowater) Gauss upwind;
- div(phi,thermo:rhoair) Gauss upwind;
+ div(phi,thermo:rho.water) Gauss upwind;
+ div(phi,thermo:rho.air) Gauss upwind;
div(rho*phi,T) Gauss upwind;
div(rho*phi,K) Gauss upwind;
div(phi,p) Gauss upwind;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 4e1aa83dc74..7a04bf3624c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alphawater
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index f312b4e9725..87fd2375773 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alphawater 1
+ volScalarFieldValue alpha.water 1
volScalarFieldValue p_rgh 1e5
volScalarFieldValue p 1e5
volScalarFieldValue T 300
@@ -31,7 +31,7 @@ regions
radius 0.1;
fieldValues
(
- volScalarFieldValue alphawater 0
+ volScalarFieldValue alpha.water 0
volScalarFieldValue p_rgh 1e6
volScalarFieldValue p 1e6
volScalarFieldValue T 578
@@ -42,7 +42,7 @@ regions
box (-10 1 -1) (10 10 1);
fieldValues
(
- volScalarFieldValue alphawater 0
+ volScalarFieldValue alpha.water 0
);
}
);
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz
new file mode 100644
index 0000000000000000000000000000000000000000..df712a5aac5a12e63a5700cfab0c51796a2c0f82
GIT binary patch
literal 5080
zcmeH{TTEJa9LJeHxY&3}I-}F6TeGc~EWtJ?6RMagx-`MowP;iXZ9)}YK%K(CidkG}
zCaukCvbI?26op#6MZ856wisu$F?xDH=a{z{TCiNAoMAZ#?98nXeOYoIx~KDhI8Xn4
z&NrXm@B2@bzKuIN!M3L~UTk@c1n?cU<mLA(V(#z>ii!SrdafEzNwe%-jv&)W&xy!y
z;>Rz*o5zB$oJ}4*p8im<{BB)jDOCH__6ndN4=8dxt{V}q9D%L|UIA^He*6AH!C*u{
zXdZYm15JUTXD9!mU|-Cu-UEdAO}9jTcZqp^krmibcbEsW3wB&g|CFoIFCxS~xaDW0
z@@lrAi9@!3jObvxb7p3R6!$M}R*gz11{wrQjjrJGIrGx~_Uv5KV$-fXO-|A2bm`22
zw1ittUcE~hvNC7J?>mM9?#iKiFH?QF&OOb#msH7?=N-^g6bsv_SqqtJ4^dNW^EKXX
z@!l%%l6Fw5`;naLJa~@ph?s1fzxt~d*fI(Q%khG1dds1+8Sv=!v(4^ik5r+dh@ML|
z%tV2Ar_JW<GcMd7<5!Ii+qwcu;)BNTXLTJWkIg-y;{|H(uzlNX-g#R%NgDWRyW;C)
z+meps&upsoEOz@-HqC20?zTabo$sc)jZnfrGr_)?0n7kq05gCYKx1HQIf_k}ZU9+N
z__5rL+)Q6rT(*;Q!j6W4+zrpn%OADG(=@iRGopgyeO0PXF<>Vc@RMbb&R`waN&u}a
zn~0A3L(A~w2cnCY`}kl@!x2m_fvtBFeD2jGQTb!Y)Hq{lq;<xjqIUP5QWrt39~Y(+
zpA@kc9F?l=X9)YEe&l*3IqXj<H)fic3|pgV+I8a1jnxljZ=t~t(Wr&%h=JXe`qwgt
z`yg;|Z3M*2_*#3+^f5Hd_oJwV#x4P2et3-pc)#Emki&?)SE&itx&NjnM;)d1CEwh*
zf6hL(c}^69<}X7fNb<;O)#-e#bwbW1?cTj`1V#o4&w}`YGRSeoG9His4VM+0Vp6uV
zDs&wUe=8}9U9Yy3^cJtu=Io<jwTmCS8@-Nf93)kBh~eaRK1>C<O<@XwG8fgNe9Cy;
z`R`N6no!5VOBCN9Rs_AMl#7886KlpI?*+rqWDYOR%O_?zIW0ymiK}XFg?pa<-4GM!
zQHOXBl2*k`Bhu~qGHAnK8SiKXyt2>GCI9mOm~6%wq(^jUz|j9fx#Rwg^N3Z4Ocun)
z!&Vhb!%?vacE0JXC>o6!+>OpRS)+`iH&K0@x@Gt=)mb59kJFLosI=tOf&*cSgPvUd
zI#L}YVG>p0ak%#+U44}RSyr)@JF|$a2CHtyl1A%}N2L?Hj2XZTU<NP)n1TN`P@TxS
zcCwJ4G8xOPn`^3vr+=op)1RnT>jg>o47Z;xm9Ls9>Q6qWX9UrEsU8RQyVLi3g&(by
d(nlGi3<d*+LyHVSp)kzA>Eo2mxNp;Oe*ui+pdkPN
literal 0
HcmV?d00001
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e8108f6babb69340f8a9c065fff37deb0d29ab50
GIT binary patch
literal 5082
zcmeH|T})eL9LDR2!)!s8uo>*AOU%@|WflUg@>v;B$gr?(1L9CRmH=ystst~gLYZPp
zq?;x~Kw+h$h1RV=rv=&++C#+31_5?<fXPQ&2tf+;BhX`^Ee9;P7`;3f^TwWw_v+;N
zKlwe+|9wvgUc&5uewHT`7Pc^$4<g&O)T~ZP@NIU4MBRC`{n{j6kYp9x4$OA9zkcL%
zoa(&WblC55SY%I7d<*CCtEES-!X=+BOo5V^E=h{ZQ4{D$;pmFpQ;;Qb$GS0`tq9yL
zU+P*Lg!>`LwV2hy+2FB0SqIArCMRFmIG!6jO4~KcMN0~D_M#(qr{7Vz!;Qe+xwZ3Q
z6sve1R&VF;^b&2k&XhrYIm!8J-HK9H&I2nr<CPA-!l9+{jRpNs)o9hKFiuF)>2&eA
zU2(77s`3C1ssGf_5@EykVAsib@ZDAvl5SsD8a&aAd?9s{A|sje?aFEY{$_tU$?~Y!
z)5cqW3T{z0OLTW*qU@W?1W}--?$Nd1`oQ_ga?WEMrvNZ-+p9qr0O+fo)h>ZVN#ZUG
zl({Ep974rnoyFcUIs8p8yQt?Ui+EQ`yi-}P|5-HavN+W`)^5q|d}IMu))*2B*Gcb&
z1St5(G-tHRobe9u{e)?`FScTiw^7z-7}Gt}H5vW>O2v2j2>1y22>1y22%sSlq7ip6
zz?i1%)9Hhwv-BTmrGw@;N*fN11_m>bhabNGidI5zFk~g$8DErHBPIwMA>W-$ylHHV
zM%Yh7x!I8UAS%^?i_|P)lAT^V$&6+y_QX`s1rqW^V%ouy?eEv~`dGnQ#oMK*Uceg>
z$MQ1;M)2fF!CI0%ZTcf?#9Y5ud!?}<<6~JX4-AlOO35TdOjmjMpr<J*9F^zZdw6+H
zvi-b4^KZ|sBAz?4ne9%7m@1rv^8y;tHZfj)1^)WY56<Si#ib3~7_x=m|8~tEf99Ga
zJGbu|;Da%jqy}dW*^XuirdN)a9~W;%=ov(u3ZkSS7wLOAyg_CFpSkssH;uwWh|?6x
zWijB{j3IL+rS&+P0U=Ux2lJTrblI9_MXhCHna1=)MC@&xh_?<y89)J)4qTtHD)Qj5
zi4{~usqs4hC-Y`+O#m|+yDFo_A~2+w?uH0WY)?_JHoQ!OhWtR@>ETtrcO8D5p$u6|
zAu4crW^Y4c0{(yqExh6Yi5EJ6cq`tFMVwF=mv#wV#cMkMi)2%isadL8W4)%#P&$|E
zH7{U#lXbTzk`TD)tQ8hW4a^v_{Q#OY=R=P^&oxR-dk(9QxtdAM>M`ReN=xr4Zgx;d
z(X)aRG<mRYVnx-*2m6}HL^K>Qm>Yu^zRf(tO$j<POIMfg(+$?jzUoGGE1?_d``bsr
zN5DtGN8o=*z_vJIIXN;$&K?xlwiM|AQT@<Z=z=x2mk-vt!EKjCvt3yK;=MzucTe@;
pO<H`|8{v_PU$7nb8{`cFK^l#gAh_~g0!?%nGi5#3c;L%;%%9N`sRIB2
literal 0
HcmV?d00001
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index 3ec07f62c5c..f33fd89a62d 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T.gz
+rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T.gz
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 11b84a3251a..33c1da4fd30 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
runApplication blockMesh
-cp 0/alphawater.org 0/alphawater
+cp 0/alpha.water.org 0/alpha.water
cp 0/p_rgh.org 0/p_rgh
cp 0/p.org 0/p
cp 0/T.org 0/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index 3582eeafa1a..b44890f3896 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
div(phirb,alpha) Gauss interfaceCompression 1;
div(rho*phi,U) Gauss upwind;
- div(phi,thermo:rhowater) Gauss upwind;
- div(phi,thermo:rhoair) Gauss upwind;
+ div(phi,thermo:rho.water) Gauss upwind;
+ div(phi,thermo:rho.air) Gauss upwind;
div(rho*phi,T) Gauss upwind;
div(rho*phi,K) Gauss upwind;
div(phi,p) Gauss upwind;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index 4e1aa83dc74..7a04bf3624c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alphawater
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
index dc90a362c06..2103e99c137 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alphawater 1
+ volScalarFieldValue alpha.water 1
volScalarFieldValue p_rgh 1e5
volScalarFieldValue p 1e5
volScalarFieldValue T 300
@@ -31,7 +31,7 @@ regions
radius 0.1;
fieldValues
(
- volScalarFieldValue alphawater 0
+ volScalarFieldValue alpha.water 0
volScalarFieldValue p_rgh 1e6
volScalarFieldValue p 1e6
volScalarFieldValue T 578
@@ -42,7 +42,7 @@ regions
box (-10 1 -1) (10 10 1);
fieldValues
(
- volScalarFieldValue alphawater 0
+ volScalarFieldValue alpha.water 0
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
index f1ad15f1c26..e0eda6f9eb7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
index f1ad15f1c26..e0eda6f9eb7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
index 64223ec7b8f..f9baf8b3e1d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
@@ -22,7 +22,7 @@ dynamicRefineFvMeshCoeffs
// How often to refine
refineInterval 1;
// Field to be refinement on
- field alpha1;
+ field alpha.water;
// Refine field inbetween lower..upper
lowerRefineLevel 0.001;
upperRefineLevel 0.999;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
index ba430bce29b..81106f5ea4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -37,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index 63d54a7c3db..f47969d4bfa 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
index 0af0cd2da7b..47ad1566011 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
volVectorFieldValue U ( 0 0 0 )
);
@@ -28,7 +28,7 @@ regions
box ( 0 0 0 ) ( 0.6 0.1875 0.75 );
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
index c3b0586036e..e09e2739bd7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index 1202013c58c..d3c114226bc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -29,7 +29,7 @@ solvers
mergeLevels 1;
}
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
index 22fcdc05b52..2506a693af0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -25,13 +25,13 @@ regions
boxToCell
{
box ( -100 -100 -100 ) ( 100 100 0.5368 );
- fieldValues ( volScalarFieldValue alpha1 1 );
+ fieldValues ( volScalarFieldValue alpha.water 1 );
}
boxToCell
{
box ( 0.7 0.8 -100 ) ( 100 100 0.65 );
- fieldValues ( volScalarFieldValue alpha1 1 );
+ fieldValues ( volScalarFieldValue alpha.water 1 );
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
index cee67a8884f..17678343e2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
index c74dee04a79..0d7bbe9e603 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
@@ -15,21 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (water air);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 300;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-6;
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
index 7e8fa0fb1ae..946d84ed62c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
index 7415f2fc768..defca08b47f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
regions
@@ -27,7 +27,7 @@ regions
box (-4 -4 -1) (4 4 0.74);
fieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
index 452b5dd51c8..70366ec29f7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
index 4ee30b518c6..faacf01f182 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
index 3b8cb649c2c..7ea0ac7744a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 696ba9cc798..0f9b3004994 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
index ec8d1717d50..410a0a6f103 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box ( -100 -100 -100 ) ( 100 100 0 );
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
index 452b5dd51c8..70366ec29f7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
index 4ee30b518c6..faacf01f182 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
index 3b8cb649c2c..7ea0ac7744a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index 696ba9cc798..0f9b3004994 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
index ec8d1717d50..410a0a6f103 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box ( -100 -100 -100 ) ( 100 100 0 );
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
index f40309af2ed..bdebcf1ab45 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
index 4ee30b518c6..faacf01f182 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
index 3b8cb649c2c..7ea0ac7744a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index 696ba9cc798..0f9b3004994 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
index ec8d1717d50..410a0a6f103 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box ( -100 -100 -100 ) ( 100 100 0 );
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
index f40309af2ed..bdebcf1ab45 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
index 4ee30b518c6..faacf01f182 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
index 3b8cb649c2c..7ea0ac7744a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index 696ba9cc798..0f9b3004994 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
index ec8d1717d50..410a0a6f103 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box ( -100 -100 -100 ) ( 100 100 0 );
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
index f40309af2ed..bdebcf1ab45 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
index 4ee30b518c6..faacf01f182 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
index 3b8cb649c2c..7ea0ac7744a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index 696ba9cc798..0f9b3004994 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
index 7ff571c6d13..5ea2a373526 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -25,7 +25,7 @@ regions
boxToCell
{
box ( -100 -100 -100 ) ( 100 100 0 );
- fieldValues ( volScalarFieldValue alpha1 1 );
+ fieldValues ( volScalarFieldValue alpha.water 1 );
}
);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
index f40309af2ed..bdebcf1ab45 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
index 82e093ec03d..5874c7a0509 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -rf 0/alpha1
+rm -rf 0/alpha.water
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
index 0f2a6dea43a..4e10bfcacc9 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
index 02287f422b5..3729fc7648b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index 54f20e5253f..39d907fa792 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
index 8229dc2582c..3b3ed7f9981 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -25,7 +25,7 @@ regions
boxToCell
{
box ( -100 -100 -100 ) ( 100 100 -0.0025);
- fieldValues ( volScalarFieldValue alpha1 1 );
+ fieldValues ( volScalarFieldValue alpha.water 1 );
}
);
diff --git a/tutorials/multiphase/interFoam/laminar/Allclean b/tutorials/multiphase/interFoam/laminar/Allclean
index 909068ce6c3..d5d1e50d10f 100755
--- a/tutorials/multiphase/interFoam/laminar/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/Allclean
@@ -9,7 +9,7 @@ loseCases="damBreakFine"
for case in $keepCases
do
- (cd $case && foamCleanTutorials && rm -rf 0/alpha1)
+ (cd $case && foamCleanTutorials && rm -rf 0/alpha.water)
done
for case in $loseCases
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 510e4498db1..c0e6661c4b4 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -28,7 +28,7 @@ setDamBreakFine ()
cd damBreak || exit
runApplication blockMesh
- cp 0/alpha1.org 0/alpha1
+ cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
)
@@ -44,7 +44,7 @@ cloneCase damBreak damBreakFine
# And execute
runApplication blockMesh
- cp ../damBreak/0/alpha1.org 0/alpha1
+ cp ../damBreak/0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication decomposePar
runParallel `getApplication` 4
@@ -56,7 +56,7 @@ cloneCase damBreak damBreakFine
cd capillaryRise || exit
runApplication blockMesh
- cp 0/alpha1.org 0/alpha1
+ cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`
)
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha1.org
rename to tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index 2b39cb45eb9..73d4778c971 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1e-06;
@@ -36,7 +38,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index 2a580ed9eb9..aded32f1953 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index 6bea5720564..36156e86145 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
index b6a5cdd65a8..91bd1156596 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -28,7 +28,7 @@ regions
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
index df85d650551..b2319f1aa5f 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
index ba430bce29b..81106f5ea4c 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -37,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index 986a20eebeb..1d9632b6746 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index 6bea5720564..36156e86145 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index 3152d483478..2a577a3c7d0 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (0 0 -1) (0.1461 0.292 1);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
similarity index 97%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
index 94befdfae81..baf41e0bb39 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.fuel;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
index fa41fd38c38..c74376aa3f2 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (fuel air);
-phase1
+fuel
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 5.952e-06;
@@ -44,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 8.5e-07;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index d7383123a6a..479dee58a2a 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.fuel
{
nAlphaCorr 1;
nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index 63a607fe3ff..f76151df3d2 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -13,12 +13,12 @@ do
if [ "$case" = "damBreak" ]
then
- cp $case/0/alpha1.org $case/0/alpha1
+ cp $case/0/alpha.water.org $case/0/alpha.water
fi
if [ "$case" = "damBreakPorousBaffle" ]
then
- cp $case/0/alpha1.org $case/0/alpha1
+ cp $case/0/alpha.water.org $case/0/alpha.water
fi
done
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index f130490987b..0378faad394 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -23,9 +23,6 @@ setDamBreakFine ()
mv temp.$$ $controlDict
}
-# Do damBreakPorousBaffle
-(cd damBreakPorousBaffle && foamRunTutorials)
-
# Do damBreak
(cd damBreak && foamRunTutorials)
@@ -37,7 +34,7 @@ cloneCase damBreak damBreakFine
# Modify case
setDamBreakFine
- cp ../damBreak/0/alpha1.org 0/alpha1
+ cp ../damBreak/0/alpha.water.org 0/alpha.water
# And execute
runApplication blockMesh
runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
index df85d650551..b2319f1aa5f 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
index 5dc1b6e2d0a..b2319f1aa5f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
index ef3e8c7b4b6..81106f5ea4c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (water air);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index a30ce4ddb8c..f6725a947bd 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
index 3152d483478..2a577a3c7d0 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (0 0 -1) (0.1461 0.292 1);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1 b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1
rename to tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
index bf6106677fc..e083c1f7927 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1.org;
+ object alpha.water.org;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
index bf6106677fc..e083c1f7927 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1.org;
+ object alpha.water.org;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
index e8f209f7c1c..3142dc8a64e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
@@ -24,6 +24,7 @@ boundaryField
leftWall
{
type epsilonWallFunction;
+ value uniform 0.1;
Cmu 0.09;
kappa 0.41;
E 9.8;
@@ -32,6 +33,7 @@ boundaryField
rightWall
{
type epsilonWallFunction;
+ value uniform 0.1;
Cmu 0.09;
kappa 0.41;
E 9.8;
@@ -40,6 +42,7 @@ boundaryField
lowerWall
{
type epsilonWallFunction;
+ value uniform 0.1;
Cmu 0.09;
kappa 0.41;
E 9.8;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index cb36fb3b7df..0b3ae667f02 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -25,16 +25,19 @@ boundaryField
{
type fixedFluxPressure;
gradient uniform 0;
+ value uniform 0;
}
rightWall
{
type fixedFluxPressure;
gradient uniform 0;
+ value uniform 0;
}
lowerWall
{
type fixedFluxPressure;
gradient uniform 0;
+ value uniform 0;
}
atmosphere
{
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
index ef3e8c7b4b6..81106f5ea4c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (water air);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
index 96c64a2a1c9..a7103f6d626 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
index 3152d483478..2a577a3c7d0 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (0 0 -1) (0.1461 0.292 1);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
index 0c04649fe1b..72f44cb9eaf 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm 0/alpha1.gz 0/alpha1 2>/dev/null
+rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
rm -rf *Flux
cleanCase
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
index 813ad03d793..7eef6a06be0 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@@ -17,7 +17,7 @@ while [ "$i" -lt 3 ] ; do
i=`expr $i + 1`
done
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication $application
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
index 7018c5eaa73..de873558162 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
@@ -55,7 +55,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
index 62774a76104..cc69de4db59 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
index 468fd9778ba..0caad94498f 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (0 0 0) (50 130 27);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
@@ -36,7 +36,7 @@ regions
box (0 0 0) (50 10.0001 24);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
index c90677dd56f..b86717bf8d7 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phase1
+phases (water air);
+
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
index bb536c017ce..40a4e9640d2 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -56,7 +56,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
index e2db3124d4d..d2428017c40 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
index f4f1c444762..2258df9f4ff 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
box (-10 -20 -10) (200 20 4);
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
index 92b06fe0a61..6c087afc7da 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@@ -26,6 +26,7 @@ boundaryField
{
type variableHeightFlowRateInletVelocity;
flowRate $inletFlowRate;
+ alpha alpha.water;
value uniform (0 0 0);
}
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
similarity index 98%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
rename to tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
index deeaf2f3dff..180c83d03e3 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
index da58c047f11..858f3882436 100755
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
@@ -7,7 +7,7 @@ cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
index ef3e8c7b4b6..81106f5ea4c 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
+phases (water air);
-phase1
+water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
}
}
-phase2
+air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
index 3693fa3dfe4..dc48e429db3 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
nAlphaCorr 1;
nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
index 26d6b7f2a6c..76fa077e7fb 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
@@ -16,7 +16,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.water 0
);
regions
@@ -27,7 +27,7 @@ regions
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1 b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1
rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
index a2e32cc8e87..3a2097df24a 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index 92e543ecce0..be3d97f20ac 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -15,20 +15,22 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+phases (water vapour);
+
phaseChangeTwoPhaseMixture SchnerrSauer;
pSat pSat [1 -1 -2 0 0] 2300; // saturation pressure
sigma sigma [1 0 -2 0 0 0 0] 0.07;
-phase1
+water
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 9e-07;
rho rho [1 -3 0 0 0 0 0] 1000;
}
-phase2
+vapour
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 4.273e-04;
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index 733980447c9..e60864d7f5d 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -60,7 +60,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index 8673ec26254..e7a73630a83 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
cAlpha 0;
nAlphaCorr 2;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1 b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1
rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
index c3754beb680..6ca929b8551 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1;
+ object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index c78a74d48df..a9e6e6525d1 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -14,20 +14,22 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+phases (water vapour);
+
phaseChangeTwoPhaseMixture SchnerrSauer;
pSat pSat [1 -1 -2 0 0] 2300; // saturation pressure
sigma sigma [1 0 -2 0 0 0 0] 0.07;
-phase1
+water
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 9e-07;
rho rho [1 -3 0 0 0 0 0] 1000;
}
-phase2
+vapour
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 4.273e-04;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index 8ddd1fe903d..ded24b94b60 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -56,7 +56,7 @@ fluxRequired
default none;
p_rgh;
pcorr;
- alpha1;
+ alpha.water;
}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index a1f8f8ffd5e..41c0ac39c6a 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
solvers
{
- alpha1
+ alpha.water
{
cAlpha 0;
nAlphaCorr 2;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1 b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
similarity index 97%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1
rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
index 65b89ea284a..0b43750be0c 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha1;
+ object alpha.sludge;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index df0c151c83f..5c4f2ad6c66 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -18,14 +18,16 @@ FoamFile
Dab Dab [0 2 -1 0 0 0 0] 1e-06;
alphatab alphatab [0 0 0 0 0 0 0] 1;
-phase1
+phases (sludge water);
+
+sludge
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1e-06;
rho rho [1 -3 0 0 0 0 0] 1000;
}
-phase2
+water
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1e-06;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 35930b92037..c4837bb39f9 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(rho*phi,U) Gauss linear;
- div(phi,alpha1) Gauss vanLeer;
+ div(phi,alpha) Gauss vanLeer;
div(phi,k) Gauss limitedLinear 1;
div((muEff*dev(T(grad(U))))) Gauss linear;
}
@@ -55,7 +55,7 @@ fluxRequired
{
default no;
p_rgh;
- alpha1;
+ alpha.sludge;
}
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index af87b0880fb..6ad387f7159 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- "alpha1.*"
+ "alpha.sludge.*"
{
nAlphaSubCycles 2;
nAlphaCorr 1;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
index 2c45b1faae3..12f879946c7 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
@@ -16,7 +16,7 @@ FoamFile
defaultFieldValues
(
- volScalarFieldValue alpha1 0
+ volScalarFieldValue alpha.sludge 0
volVectorFieldValue U (0 0 0)
);
@@ -28,7 +28,7 @@ regions
fieldValues
(
- volScalarFieldValue alpha1 1
+ volScalarFieldValue alpha.sludge 1
);
}
);
--
GitLab