diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun index 0e692e5175..d762106b7e 100755 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun @@ -17,7 +17,7 @@ setInertY() phase=${1#*.} [ $y != "none" ] && arg="-set $y" || arg="-remove" runApplication -a foamDictionary -entry defaultSpecie $arg \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase } for gY in $gYs diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.gas.orig b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.gas.orig similarity index 98% rename from test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.gas.orig rename to test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.gas.orig index 6c4a9008ed..b035590a04 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.gas.orig +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.gas.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.gas; + object physicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.liquid.orig similarity index 96% rename from test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig rename to test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.liquid.orig index afdc6c8442..b3f6c96986 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.liquid.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.liquid; + object physicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity index 1a5149b0aa..7386db8dd0 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity @@ -71,9 +71,9 @@ codeRead const volScalarField& alphaLiq = mesh().lookupObject("alpha.liquid"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.gas"); + mesh().lookupObject("physicalProperties.gas"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.liquid"); + mesh().lookupObject("physicalProperties.liquid"); *mass0Gas = alphaGas*thermoGas.rho(); *mass0Liq = alphaLiq*thermoLiq.rho(); @@ -125,9 +125,9 @@ codeExecute const volScalarField& alphaLiq = mesh().lookupObject("alpha.liquid"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.gas"); + mesh().lookupObject("physicalProperties.gas"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.liquid"); + mesh().lookupObject("physicalProperties.liquid"); dMassGas = alphaGas*thermoGas.rho() - mass0Gas; dMassLiq = alphaLiq*thermoLiq.rho() - mass0Liq; diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun index 6fb516a8cb..df7c78daf0 100755 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun @@ -20,7 +20,7 @@ setInertY() esac runApplication -a foamDictionary -entry defaultSpecie $arg \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase } setThermoAndEnergy() @@ -35,7 +35,7 @@ setThermoAndEnergy() esac runApplication -a foamDictionary -entry thermoType/thermo -set $thermo \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase case $he in e ) energy="sensibleInternalEnergy";; @@ -44,7 +44,7 @@ setThermoAndEnergy() esac runApplication -a foamDictionary -entry thermoType/energy -set $energy \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase } runApplication blockMesh diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.gas.orig b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.gas.orig similarity index 97% rename from test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.gas.orig rename to test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.gas.orig index fded8cffe0..84b65b60ee 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.gas.orig +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.gas.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.gas; + object physicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid.orig b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.liquid.orig similarity index 96% rename from test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid.orig rename to test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.liquid.orig index 0602baffe2..303ea6cc79 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid.orig +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.liquid.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.liquid; + object physicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity index 1a5149b0aa..7386db8dd0 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity @@ -71,9 +71,9 @@ codeRead const volScalarField& alphaLiq = mesh().lookupObject("alpha.liquid"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.gas"); + mesh().lookupObject("physicalProperties.gas"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.liquid"); + mesh().lookupObject("physicalProperties.liquid"); *mass0Gas = alphaGas*thermoGas.rho(); *mass0Liq = alphaLiq*thermoLiq.rho(); @@ -125,9 +125,9 @@ codeExecute const volScalarField& alphaLiq = mesh().lookupObject("alpha.liquid"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.gas"); + mesh().lookupObject("physicalProperties.gas"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.liquid"); + mesh().lookupObject("physicalProperties.liquid"); dMassGas = alphaGas*thermoGas.rho() - mass0Gas; dMassLiq = alphaLiq*thermoLiq.rho() - mass0Liq; diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air1 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air1 index df31076715..1c20ac8e0c 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air1 @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air1; + object physicalProperties.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air2 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air2 index 105b9e941a..6859eeb986 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air2 @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air3; + object physicalProperties.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air3 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air3 index f315d3b684..507a9a69e5 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.air3 @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air2; + object physicalProperties.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.water index b1d32276e3..e24db73980 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air1 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1 rename to test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air1 index df31076715..1c20ac8e0c 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air1 @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air1; + object physicalProperties.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air2 new file mode 100644 index 0000000000..6859eeb986 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air2 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air3 new file mode 100644 index 0000000000..507a9a69e5 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.air3 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.water index b1d32276e3..e24db73980 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2 deleted file mode 100644 index f315d3b684..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3 deleted file mode 100644 index 105b9e941a..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air1 new file mode 100644 index 0000000000..1c20ac8e0c --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air1 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air2 new file mode 100644 index 0000000000..6859eeb986 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air2 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air3 new file mode 100644 index 0000000000..507a9a69e5 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.air3 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.water index b1d32276e3..e24db73980 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1 deleted file mode 100644 index df31076715..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2 deleted file mode 100644 index f315d3b684..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3 deleted file mode 100644 index 105b9e941a..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.air similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air rename to test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.air index b5625fe1b4..2c9bc0082d 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.air @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air; + object physicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.water index 6e31cef970..cfd4a8c149 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air1 new file mode 100644 index 0000000000..1c20ac8e0c --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air1 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air2 similarity index 88% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2 rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air2 index ab22497184..d268bff570 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air2 @@ -10,10 +10,10 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air2; + object physicalProperties.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "thermophysicalProperties.air1" +#include "physicalProperties.air1" // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air3 similarity index 88% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3 rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air3 index 01674fabf3..abf8ad1f9c 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.air3 @@ -10,10 +10,10 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air3; + object physicalProperties.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "thermophysicalProperties.air1" +#include "physicalProperties.air1" // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.water index 41055aed52..1eb48ca24e 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1 deleted file mode 100644 index df31076715..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.air similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air rename to test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.air index b5625fe1b4..2c9bc0082d 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.air @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.air; + object physicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.water index 6e31cef970..cfd4a8c149 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air1 new file mode 100644 index 0000000000..1c20ac8e0c --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air1 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air2 new file mode 100644 index 0000000000..6859eeb986 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air2 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air3 new file mode 100644 index 0000000000..507a9a69e5 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.air3 @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "constant"; + object physicalProperties.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo hConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + thermodynamics + { + Cp 1007; + Hf 0; + } + transport + { + mu 1.84e-05; + Pr 0.7; + } +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.water similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water rename to test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.water index e5c92cea0f..70a2fc6d84 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/physicalProperties.water @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1 deleted file mode 100644 index df31076715..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2 deleted file mode 100644 index f315d3b684..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3 deleted file mode 100644 index 105b9e941a..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3 +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun index 100d525328..7cc4e78579 100755 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun @@ -13,7 +13,7 @@ setThermoAndEnergy() phase=${1#*.} runApplication -a foamDictionary -entry thermoType/thermo -set ${he}Const \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase case $he in e ) energy="sensibleInternalEnergy";; @@ -22,7 +22,7 @@ setThermoAndEnergy() esac runApplication -a foamDictionary -entry thermoType/energy -set $energy \ - constant/thermophysicalProperties.$phase + constant/physicalProperties.$phase } runApplication blockMesh diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.steam.orig b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.steam.orig similarity index 96% rename from test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.steam.orig rename to test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.steam.orig index 58522f1aa5..eea5e2eaf4 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.steam.orig +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.steam.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.steam; + object physicalProperties.steam; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.water.orig b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.water.orig similarity index 96% rename from test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.water.orig rename to test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.water.orig index fe6e45fd20..6d43347c26 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/thermophysicalProperties.water.orig +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/physicalProperties.water.orig @@ -10,7 +10,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties.water; + object physicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity index b7e0578be3..5ba4867401 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity @@ -71,9 +71,9 @@ codeRead const volScalarField& alphaLiq = mesh().lookupObject("alpha.water"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.steam"); + mesh().lookupObject("physicalProperties.steam"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.water"); + mesh().lookupObject("physicalProperties.water"); *mass0Gas = alphaGas*thermoGas.rho(); *mass0Liq = alphaLiq*thermoLiq.rho(); @@ -125,9 +125,9 @@ codeExecute const volScalarField& alphaLiq = mesh().lookupObject("alpha.water"); const rhoThermo& thermoGas = - mesh().lookupObject("thermophysicalProperties.steam"); + mesh().lookupObject("physicalProperties.steam"); const rhoThermo& thermoLiq = - mesh().lookupObject("thermophysicalProperties.water"); + mesh().lookupObject("physicalProperties.water"); dMassGas = alphaGas*thermoGas.rho() - mass0Gas; dMassLiq = alphaLiq*thermoLiq.rho() - mass0Liq; diff --git a/test/postProcessing/channel/constant/thermophysicalProperties b/test/postProcessing/channel/constant/physicalProperties similarity index 96% rename from test/postProcessing/channel/constant/thermophysicalProperties rename to test/postProcessing/channel/constant/physicalProperties index 921010e07d..390063ac16 100644 --- a/test/postProcessing/channel/constant/thermophysicalProperties +++ b/test/postProcessing/channel/constant/physicalProperties @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermophysicalProperties; + object physicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //