zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2010-02-17 09:32:41 +01:00
parent 024e573744 ce9a3064ba
commit b61537bd28
138 changed files with 3268 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

4
tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
View File

@ -39,7 +39,7 @@ divSchemes
{
fu limitedLinear 1;
ft limitedLinear 1;
h limitedLinear 1;
hs limitedLinear 1;
};
div((muEff*dev2(grad(U).T()))) Gauss linear;
}
@ -50,7 +50,7 @@ laplacianSchemes
laplacian(muEff,U) Gauss linear corrected;
laplacian(muEff,ft) Gauss linear corrected;
laplacian(muEff,fu) Gauss linear corrected;
laplacian(((alphah*mut)+alpha),h) Gauss linear corrected;
laplacian(((alphah*mut)+alpha),hs) Gauss linear corrected;
laplacian((rho|A(U)),p) Gauss linear corrected;
laplacian(rhoD,k) Gauss linear corrected;
laplacian(rhoD,epsilon) Gauss linear corrected;

2
tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
View File

@ -31,7 +31,7 @@ solvers
tolerance 1e-06;
}
"(U|Yi|h|k|epsilon)"
"(U|Yi|hs|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;

2
tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
inertSpecie N2;

2
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

4
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
}
interpolationSchemes

2
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
View File

@ -33,7 +33,7 @@ solvers
relTol 0;
}
"(U|h|R|k|epsilon)"
"(U|hs|R|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;

3
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
View File

@ -8,5 +8,8 @@ cleanCase
# remove 0 directory
rm -rf 0
# remove post-processing folder
rm -rf postProcessing
# copy 0.org to 0
cp -r 0.org 0

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

4
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
}
interpolationSchemes

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
View File

@ -25,7 +25,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|hs|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;

22
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/energySourceProperties Normal file
View File

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object energySourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
(
// none
);
// ************************************************************************* //

8
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/pointMassSourcesProperties → tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/massSourceProperties
View File

@ -11,15 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object pointMassSourcesProperties;
object massSourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
active false;
pointSources
(
//none
// none
);
// ************************************************************************* //

8
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/pointMassSourcesProperties → tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/momentumSourceProperties
View File

@ -11,15 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object pointMassSourcesProperties;
object momentumSourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
active false;
pointSources
(
//none
// none
);
// ************************************************************************* //

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

14
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
View File

@ -24,8 +24,6 @@ gradSchemes
{
default Gauss linear;
grad(p) Gauss linear;
// grad(U) cellLimited Gauss linear 1;
// grad(k) cellLimited Gauss linear 1;
}
divSchemes
@ -34,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;
@ -46,16 +44,6 @@ divSchemes
laplacianSchemes
{
default Gauss linear uncorrected;
/*
laplacian(muEff,U) Gauss linear corrected;
laplacian(mut,U) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DepsilonEff,omega) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
*/
}
interpolationSchemes

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
View File

@ -49,7 +49,7 @@ solvers
tolerance 1e-06;
relTol 0;
};
"(Yi|h|)"
"(Yi|hs)"
{
solver PBiCG;
preconditioner DILU;

5
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allclean
View File

@ -2,8 +2,9 @@
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove old time folders
rm -rf 0 *[1-9]* processor*
# remove old time and post-processing folders
rm -rf 0 *[1-9]* processor* postProcessing
# copy 0.org to 0
cp -r 0.org 0

22
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties Normal file
View File

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object energySourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
(
// none
);
// ************************************************************************* //

23
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties Normal file
View File

@ -0,0 +1,23 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object massSourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
(
// none
);
// ************************************************************************* //

23
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties Normal file
View File

@ -0,0 +1,23 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object momentumSourcesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
(
// none
);
// ************************************************************************* //

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
View File

@ -34,7 +34,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
View File

@ -49,7 +49,7 @@ solvers
tolerance 1e-06;
relTol 0;
};
"(Yi|h|)"
"(Yi|hs)"
{
solver PBiCG;
preconditioner DILU;

4
tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
}
interpolationSchemes

2
tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
View File

@ -25,7 +25,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|hs|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;

2
tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
View File

@ -7,7 +7,7 @@
basicPsiThermo& thermo = pThermo();
volScalarField& p = thermo.p();
volScalarField& h = thermo.h();
volScalarField& hs = thermo.hs();
const volScalarField& psi = thermo.psi();
volScalarField rho

17
tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H
View File

@ -1,17 +0,0 @@
{
fvScalarMatrix hEqn
(
fvm::ddt(rho, h)
+ fvm::div(phi, h)
- fvm::laplacian(turbulence->alphaEff(), h)
==
DpDt
+ thermoCloud1.Sh()
);
hEqn.relax();
hEqn.solve();
thermo.correct();
}

17
tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hsEqn.H Normal file
View File

@ -0,0 +1,17 @@
{
fvScalarMatrix hsEqn
(
fvm::ddt(rho, hs)
+ fvm::div(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
==
DpDt
+ thermoCloud1.Sh()
);
hsEqn.relax();
hsEqn.solve();
thermo.correct();
}

2
tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
View File

@ -86,7 +86,7 @@ int main(int argc, char *argv[])
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
#include "hEqn.H"
#include "hsEqn.H"
#include "pEqn.H"
}
}

1
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
View File

@ -99,6 +99,7 @@ StandardWallInteractionCoeffs
RanzMarshallCoeffs
{
// thermal shielding
BirdCorrection false;
}

2
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hsPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture air 1 28.9 1007 0 1.84e-05 0.7;

6
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
}
interpolationSchemes
@ -65,7 +65,7 @@ snGradSchemes
fluxRequired
{
default no;
p ;
p;
}

2
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
View File

@ -33,7 +33,7 @@ solvers
relTol 0;
}
"(U|h|R|k|epsilon)"
"(U|hs|R|k|epsilon)"
{
$p;
tolerance 1e-05;