diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C index c48990a721..d81f5ccb1f 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C @@ -35,6 +35,7 @@ namespace Foam defineTypeNameAndDebug(twoPhaseMixtureThermo, 0); } + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo @@ -44,9 +45,22 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo : psiThermo(mesh, word::null), twoPhaseMixture(mesh, *this), - thermo1_(rhoThermo::New(mesh, phase1Name())), - thermo2_(rhoThermo::New(mesh, phase2Name())) + thermo1_(NULL), + thermo2_(NULL) { + { + volScalarField T1("T" + phase1Name(), T_); + T1.write(); + } + + { + volScalarField T2("T" + phase2Name(), T_); + T2.write(); + } + + thermo1_ = rhoThermo::New(mesh, phase1Name()); + thermo2_ = rhoThermo::New(mesh, phase2Name()); + thermo1_->validate(phase1Name(), "e"); thermo2_->validate(phase2Name(), "e"); diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alphawater.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org new file mode 100644 index 0000000000..1e603613af --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org @@ -0,0 +1,35 @@ +/*--------------------------------*- 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 0 0]; + +internalField uniform 1e5; + +boundaryField +{ + walls + { + type calculated; + value uniform 1e5; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p_rgh.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean similarity index 67% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean index d6e8dce5df..8821d7e1cc 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/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/alphawater.gz 0/T.gz +rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T*.gz diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun similarity index 96% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun index 76547516b7..ac803d715f 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun @@ -10,6 +10,7 @@ application=`getApplication` runApplication blockMesh cp 0/alphawater.org 0/alphawater cp 0/p_rgh.org 0/p_rgh +cp 0/p.org 0/p cp 0/T.org 0/T runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/blockMeshDict diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/thermophysicalProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair new file mode 100644 index 0000000000..e61009c10b --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + nMoles 1; + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater new file mode 100644 index 0000000000..1ffcbddad7 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectFluid; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + nMoles 1; + molWeight 18.0; + } + equationOfState + { + R 3000; + rho0 1027; + } + thermodynamics + { + Cp 4195; + Hf 0; + } + transport + { + mu 3.645e-4; + Pr 2.289; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/turbulenceProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict similarity index 95% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict index 88198a4d24..f312b4e972 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict @@ -19,6 +19,7 @@ defaultFieldValues ( volScalarFieldValue alphawater 1 volScalarFieldValue p_rgh 1e5 + volScalarFieldValue p 1e5 volScalarFieldValue T 300 ); @@ -32,6 +33,7 @@ regions ( volScalarFieldValue alphawater 0 volScalarFieldValue p_rgh 1e6 + volScalarFieldValue p 1e6 volScalarFieldValue T 578 ); } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org similarity index 94% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org index 82284f267f..ce47bfaefc 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org @@ -24,6 +24,11 @@ boundaryField { type zeroGradient; } + + defaultFaces + { + type empty; + } } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U similarity index 94% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U index d37b2aea30..f267a870fc 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U @@ -25,6 +25,10 @@ boundaryField type fixedValue; value uniform (0 0 0); } + frontAndBack + { + type empty; + } } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org similarity index 94% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org index 62be61f403..d90b720092 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org @@ -24,6 +24,11 @@ boundaryField { type zeroGradient; } + + defaultFaces + { + type empty; + } } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org new file mode 100644 index 0000000000..1e603613af --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org @@ -0,0 +1,35 @@ +/*--------------------------------*- 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 0 0]; + +internalField uniform 1e5; + +boundaryField +{ + walls + { + type calculated; + value uniform 1e5; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org similarity index 94% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p_rgh.org rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org index 0394387374..396d380dad 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p_rgh.org +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org @@ -25,6 +25,11 @@ boundaryField type fixedFluxPressure; value uniform 1e5; } + + defaultFaces + { + type empty; + } } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean similarity index 74% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean index 539c772166..3ec07f62c5 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/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 0/p_rgh.gz 0/alphawater 0/alphawater.gz 0/T.gz +rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T.gz # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun similarity index 96% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun index 0941ac4aa1..11b84a3251 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun @@ -10,6 +10,7 @@ application=`getApplication` runApplication blockMesh cp 0/alphawater.org 0/alphawater cp 0/p_rgh.org 0/p_rgh +cp 0/p.org 0/p cp 0/T.org 0/T runApplication setFields runApplication decomposePar diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/blockMeshDict diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties similarity index 78% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties index b16c01a16f..9c14314414 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties @@ -9,20 +9,16 @@ FoamFile { version 2.0; format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; + class dictionary; + location "constant"; + object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -1 -( - walls - { - type wall; - nFaces 64000; - startFace 3040000; - } -) +phases (water air); + +pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000; + +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair new file mode 100644 index 0000000000..e61009c10b --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + nMoles 1; + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater new file mode 100644 index 0000000000..1ffcbddad7 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectFluid; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + nMoles 1; + molWeight 18.0; + } + equationOfState + { + R 3000; + rho0 1027; + } + thermodynamics + { + Cp 4195; + Hf 0; + } + transport + { + mu 3.645e-4; + Pr 2.289; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/transportProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/transportProperties diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/turbulenceProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict similarity index 95% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict index ec31deae03..dc90a362c0 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict @@ -19,6 +19,7 @@ defaultFieldValues ( volScalarFieldValue alphawater 1 volScalarFieldValue p_rgh 1e5 + volScalarFieldValue p 1e5 volScalarFieldValue T 300 ); @@ -32,6 +33,7 @@ regions ( volScalarFieldValue alphawater 0 volScalarFieldValue p_rgh 1e6 + volScalarFieldValue p 1e6 volScalarFieldValue T 578 ); }