diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 5b152b78a..5d8a42388 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -40,7 +40,7 @@ const dimensionedScalar& rho1 = mixture.rho1(); const dimensionedScalar& rho2 = mixture.rho2(); const dimensionedScalar& rho3 = mixture.rho3(); -dimensionedScalar D23(mixture.lookup("D23")); +dimensionedScalar D23("D23", dimViscosity, mixture); // Need to store rho for ddt(rho, U) volScalarField rho diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C index 9a1c7bc21..74f451968 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -168,8 +168,8 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties ).lookup("cAlpha") ) ), - sigma12_(mixture.lookup("sigma12")), - sigma13_(mixture.lookup("sigma13")), + sigma12_("sigma12", dimensionSet(1, 0, -2, 0, 0), mixture), + sigma13_("sigma13", dimensionSet(1, 0, -2, 0, 0), mixture), deltaN_ ( diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C index a4663ba48..74c0ec248 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,10 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz : phaseChangeTwoPhaseMixture(typeName, U, phi), - UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")), - tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")), - Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")), - Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")), + UInf_("UInf", dimVelocity, phaseChangeTwoPhaseMixtureCoeffs_), + tInf_("tInf", dimTime, phaseChangeTwoPhaseMixtureCoeffs_), + Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_), + Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), p0_("0", pSat().dimensions(), 0.0), diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C index cfe6b1b00..853884b79 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,10 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle : phaseChangeTwoPhaseMixture(typeName, U, phi), - UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")), - tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")), - Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")), - Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")), + UInf_("UInf", dimVelocity, phaseChangeTwoPhaseMixtureCoeffs_), + tInf_("tInf", dimTime, phaseChangeTwoPhaseMixtureCoeffs_), + Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_), + Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), p0_("0", pSat().dimensions(), 0.0), diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C index 3be86e0f5..7f7771cec 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,10 +54,10 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::SchnerrSauer : phaseChangeTwoPhaseMixture(typeName, U, phi), - n_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("n")), - dNuc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("dNuc")), - Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")), - Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")), + n_("n", dimless/dimVolume, phaseChangeTwoPhaseMixtureCoeffs_), + dNuc_("dNuc", dimLength, phaseChangeTwoPhaseMixtureCoeffs_), + Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_), + Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), p0_("0", pSat().dimensions(), 0.0) { diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties index a1b5e037d..2f23ef4fc 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties @@ -20,17 +20,17 @@ phases (phase1 phase2); phase1 { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 300; + nu 1e-06; + rho 300; } phase2 { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-6; - rho [1 -3 0 0 0 0 0] 1027; + nu 1e-6; + rho 1027; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties index eb43806c0..d066fd0ac 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties @@ -17,8 +17,8 @@ FoamFile phases (water air); -pMin [1 -1 -2 0 0 0 0] 1000; +pMin 1000; -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties index f746c0679..6db1662ce 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties index 69dc3521d..9391dc3d7 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties @@ -17,16 +17,16 @@ FoamFile phases (water oil mercury air); -pMin [1 -1 -2 0 0 0 0] 10000; +pMin 10000; sigmas ( - (air water) 0.07 - (air oil) 0.07 - (air mercury) 0.07 - (water oil) 0.07 + (air water) 0.07 + (air oil) 0.07 + (air mercury) 0.07 + (water oil) 0.07 (water mercury) 0.07 - (oil mercury) 0.07 + (oil mercury) 0.07 ); diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties index 7e4c459f6..c6a955649 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.09e-06; - rho [1 -3 0 0 0 0 0] 998.8; + nu 1.09e-06; + rho 998.8; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties index f746c0679..6db1662ce 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties index 35763b23e..d01edc3f3 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 300; + nu 1e-06; + rho 300; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-6; - rho [1 -3 0 0 0 0 0] 1027; + nu 1e-6; + rho 1027; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/damBreakWithObstacle/constant/transportProperties index 577be61a9..1926605ca 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/damBreakWithObstacle/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/damBreakWithObstacle/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/constant/transportProperties index 6c7844de6..8fa813d37 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/constant/transportProperties index e0fdefd56..daec936b7 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/constant/transportProperties index f746c0679..6db1662ce 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/constant/transportProperties index e0fdefd56..daec936b7 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/constant/transportProperties index f746c0679..6db1662ce 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/transportProperties index e0fdefd56..daec936b7 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/constant/transportProperties index f746c0679..6db1662ce 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 998.2; + nu 1e-06; + rho 998.2; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties index d3ee304bc..82859f78f 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties @@ -20,17 +20,17 @@ phases (fuel air); fuel { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 5.952e-06; - rho [1 -3 0 0 0 0 0] 840; + nu 5.952e-06; + rho 840; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 8.5e-07; - rho [1 -3 0 0 0 0 0] 20; + nu 8.5e-07; + rho 20; } -sigma [1 0 -2 0 0 0 0] 0.0261; +sigma 0.0261; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties index 7e4c459f6..c6a955649 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties @@ -20,17 +20,17 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.09e-06; - rho [1 -3 0 0 0 0 0] 998.8; + nu 1.09e-06; + rho 998.8; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0; +sigma 0; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties index 577be61a9..1926605ca 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties index 577be61a9..1926605ca 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties index 577be61a9..1926605ca 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties index 4c569fe73..1926605ca 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties index 577be61a9..1926605ca 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties index 5d5589105..19e03c6ee 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties @@ -20,18 +20,18 @@ phases (water air); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-06; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-06; + rho 1000; } air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } -sigma [1 0 -2 0 0 0 0] 0.0707106; +sigma 0.0707106; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties index 63f9f40e9..cedd954f7 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties @@ -20,18 +20,18 @@ phases (water oir); water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-4; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-4; + rho 1000; } oir { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-4; - rho [1 -3 0 0 0 0 0] 500; + nu 1e-4; + rho 500; } -sigma [1 0 -2 0 0 0 0] 0.05; +sigma 0.05; // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties index 307bc1aba..24172f6ba 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties @@ -20,29 +20,29 @@ phases (air other water); air { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1.48e-05; - rho [1 -3 0 0 0 0 0] 1; + nu 1.48e-05; + rho 1; } other { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-6; - rho [1 -3 0 0 0 0 0] 1010; + nu 1e-6; + rho 1010; } water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 1e-6; - rho [1 -3 0 0 0 0 0] 1000; + nu 1e-6; + rho 1000; } // Surface tension coefficients -sigma12 sigma12 [1 0 -2 0 0 0 0] 0.05; -sigma13 sigma13 [1 0 -2 0 0 0 0] 0.04; +sigma12 0.05; +sigma13 0.04; // Diffusivity between miscible phases -D23 D23 [0 2 -1 0 0 0 0] 3e-09; +D23 3e-09; // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties index d3523579d..bcab66481 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties @@ -19,46 +19,46 @@ phases (water vapour); phaseChangeTwoPhaseMixture SchnerrSauer; -pSat [1 -1 -2 0 0 0 0] 2300; // Saturation pressure +pSat 2300; // Saturation pressure -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; water { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 9e-07; - rho [1 -3 0 0 0 0 0] 1000; + nu 9e-07; + rho 1000; } vapour { transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 4.273e-04; - rho [1 -3 0 0 0 0 0] 0.02308; + nu 4.273e-04; + rho 0.02308; } KunzCoeffs { - UInf UInf [0 1 -1 0 0 0 0] 20.0; - tInf tInf [0 0 1 0 0 0 0] 0.005; // L = 0.1 m - Cc Cc [0 0 0 0 0 0 0] 1000; - Cv Cv [0 0 0 0 0 0 0] 1000; + UInf 20.0; + tInf 0.005; // L = 0.1 m + Cc 1000; + Cv 1000; } MerkleCoeffs { - UInf UInf [0 1 -1 0 0 0 0] 20.0; - tInf tInf [0 0 1 0 0 0 0] 0.005; // L = 0.1 m - Cc Cc [0 0 0 0 0 0 0] 80; - Cv Cv [0 0 0 0 0 0 0] 1e-03; + UInf 20.0; + tInf 0.005; // L = 0.1 m + Cc 80; + Cv 1e-03; } SchnerrSauerCoeffs { - n n [0 -3 0 0 0 0 0] 1.6e+13; - dNuc dNuc [0 1 0 0 0 0 0] 2.0e-06; - Cc Cc [0 0 0 0 0 0 0] 1; - Cv Cv [0 0 0 0 0 0 0] 1; + n 1.6e+13; + dNuc 2.0e-06; + Cc 1; + Cv 1; } // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties index e5342b55c..ec41a9b5a 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties @@ -18,46 +18,46 @@ phases (water vapour); phaseChangeTwoPhaseMixture SchnerrSauer; -pSat [1 -1 -2 0 0 0 0] 2300; // Saturation pressure +pSat 2300; // Saturation pressure -sigma [1 0 -2 0 0 0 0] 0.07; +sigma 0.07; water { - transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 9e-07; - rho [1 -3 0 0 0 0 0] 1000; + transportModel Newtonian; + nu 9e-07; + rho 1000; } vapour { - transportModel Newtonian; - nu [0 2 -1 0 0 0 0] 4.273e-04; - rho [1 -3 0 0 0 0 0] 0.02308; + transportModel Newtonian; + nu 4.273e-04; + rho 0.02308; } KunzCoeffs { - UInf UInf [0 1 -1 0 0 0 0] 20.0; - tInf tInf [0 0 1 0 0 0 0] 0.005; // L = 0.1 m - Cc Cc [0 0 0 0 0 0 0] 1000; - Cv Cv [0 0 0 0 0 0 0] 1000; + UInf U20.0; + tInf t0.005; // L = 0.1 m + Cc C1000; + Cv C1000; } MerkleCoeffs { - UInf UInf [0 1 -1 0 0 0 0] 20.0; - tInf tInf [0 0 1 0 0 0 0] 0.005; // L = 0.1 m - Cc Cc [0 0 0 0 0 0 0] 80; - Cv Cv [0 0 0 0 0 0 0] 1e-03; + UInf 20.0; + tInf 0.005; // L = 0.1 m + Cc 80; + Cv 1e-03; } SchnerrSauerCoeffs { - n n [0 -3 0 0 0 0 0] 1.6e+13; - dNuc dNuc [0 1 0 0 0 0 0] 2.0e-06; - Cc Cc [0 0 0 0 0 0 0] 1; - Cv Cv [0 0 0 0 0 0 0] 1; + n 1.6e+13; + dNuc 2.0e-06; + Cc 1; + Cv 1; }