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

GIT: conflict resolution

Browse Source
This commit is contained in:
andy
2012-09-17 12:03:11 +01:00
parent e6bc9ba2ae a4ac852e9c
commit 8489de277d
514 changed files with 13454 additions and 11215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tutorials/combustion/chemFoam/nc7h16/validation/createGraph Normal file → Executable file
View File

2
tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
View File

@ -50,7 +50,7 @@ boundaryField
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
kappa basicThermo;
kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;

2
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solidChemistryModel ODESolidChemistryModel<constSolidThermoPhysics>;
solidChemistryModel ODESolidChemistryModel<hConstSolidThermoPhysics>;
gasThermoModel gasThermoPhysics;

6
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
solidComponents
(
@ -43,7 +43,7 @@ vCoeffs
Cp 696;
Hf -1.41e6;
}
density
equationOfState
{
rho 114.7;
}
@ -71,7 +71,7 @@ charCoeffs
Cp 611;
Hf 0;
}
density
equationOfState
{
rho 11.5;
}

13632
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/polyMesh/boundary
View File

File diff suppressed because it is too large Load Diff

2
tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
View File

@ -16,7 +16,7 @@ FoamFile
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
internalField uniform (3 0 0);
boundaryField
{

2
tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
View File

@ -33,7 +33,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phi,Ekp) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear 1;
}

2
tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
View File

@ -33,7 +33,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phi,Ekp) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear 1;
}

16
tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
View File

@ -29,25 +29,17 @@ divSchemes
{
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,e) Gauss limitedLinear 1;
div(phi,Ekp) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phid,p) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(muEff,U) Gauss linear limited 0.5;
laplacian(DkEff,k) Gauss linear limited 0.5;
laplacian(DREff,R) Gauss linear limited 0.5;
laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
laplacian(Dp,p) Gauss linear limited 0.5;
laplacian(alphaEff,e) Gauss linear limited 0.5;
default Gauss linear limited 0.5;
}
interpolationSchemes

26
tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
rho
{
solver diagonal;
}
p
{
solver PBiCG;
@ -25,26 +30,23 @@ solvers
relTol 0;
}
rho
{
solver PCG;
preconditioner DIC;
tolerance 1e-08;
relTol 0;
}
"(U|e|k|epsilon|R)"
"(U|e)"
{
$p;
tolerance 1e-08;
relTol 0;
tolerance 1e-9;
}
"(k|epsilon)"
{
$p;
tolerance 1e-10;
}
}
PISO
{
nCorrectors 2;
nNonOrthogonalCorrectors 2;
nNonOrthogonalCorrectors 0;
}

16
tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
View File

@ -29,25 +29,17 @@ divSchemes
{
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,e) Gauss limitedLinear 1;
div(phi,Ekp) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phid,p) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(muEff,U) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(Dp,p) Gauss linear corrected;
laplacian(alphaEff,e) Gauss linear corrected;
default Gauss linear corrected;
}
interpolationSchemes

18
tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
rho
{
solver diagonal;
}
p
{
solver PBiCG;
@ -25,34 +30,23 @@ solvers
relTol 0;
}
rho
{
solver PCG;
preconditioner DIC;
tolerance 1e-05;
relTol 0;
}
"(U|e|R)"
{
$p;
tolerance 1e-05;
relTol 0;
}
"(k|epsilon)"
{
$p;
tolerance 1e-08;
relTol 0;
}
}
PISO
{
nCorrectors 2;
nNonOrthogonalCorrectors 2;
nNonOrthogonalCorrectors 0;
}

4
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle.*"
{
type compressible::temperatureThermoBaffle1D<constSolidThermoPhysics>;
type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
@ -107,7 +107,7 @@ dictionaryReplacement
Hf 0;
Cp 0;
}
density
equationOfState
{
rho 0;
}

4
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle1Wall.*"
{
type compressible::temperatureThermoBaffle1D<constSolidThermoPhysics>;
type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
@ -112,7 +112,7 @@ dictionaryReplacement
Hf 0;
Cp 10;
}
density
equationOfState
{
rho 10;
}

6
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
View File

@ -95,7 +95,7 @@ dictionaryReplacement
// Coupled BC.
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
@ -110,7 +110,7 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
@ -135,7 +135,7 @@ dictionaryReplacement
Hf 0;
Cp 15;
}
density
equationOfState
{
rho 80;
}

20
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
//thermoType heSolidThermo<multiComponentSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
{
@ -24,23 +23,26 @@ mixture
nMoles 1;
molWeight 12;
}
transport
{
kappa 80;
//kappa (80 80 80);
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.0;
}
thermodynamics
{
Hf 0;
Cp 450;
}
density
equationOfState
{
rho 8000;
}
@ -58,22 +60,26 @@ pmmaCoeffs
nMoles 1;
molWeight 100;
}
transport
{
kappa 0.152;
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.1;
}
thermodynamics
{
Hf 0;
Cp 1462;
}
density
equationOfState
{
rho 1114.0;
}
@ -104,9 +110,11 @@ charCoeffs
Cp 611.0;
}
density
equationOfState
{
rho 11.5;
}
}
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
View File

@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
View File

@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<incompressible>,sensibleEnthalpy>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{

21
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
//thermoType heSolidThermo<multiComponentSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
{
@ -24,23 +23,26 @@ mixture
nMoles 1;
molWeight 12;
}
transport
{
kappa 80;
//kappa (80 80 80);
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.0;
}
thermodynamics
{
Hf 0;
Cp 450;
}
density
equationOfState
{
rho 8000;
}
@ -58,22 +60,26 @@ pmmaCoeffs
nMoles 1;
molWeight 100;
}
transport
{
kappa 0.152;
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.1;
}
thermodynamics
{
Hf 0;
Cp 1462;
}
density
equationOfState
{
rho 1114.0;
}
@ -86,6 +92,7 @@ charCoeffs
nMoles 1;
molWeight 50;
}
transport
{
kappa 0.4;
@ -104,9 +111,11 @@ charCoeffs
Cp 611.0;
}
density
equationOfState
{
rho 11.5;
}
}
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
View File

@ -70,7 +70,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
View File

@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
View File

@ -69,7 +69,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

21
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
//thermoType heSolidThermo<multiComponentSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
{
@ -24,23 +23,26 @@ mixture
nMoles 1;
molWeight 12;
}
transport
{
kappa 80;
//kappa (80 80 80);
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.0;
}
thermodynamics
{
Hf 0;
Cp 450;
}
density
equationOfState
{
rho 8000;
}
@ -58,22 +60,26 @@ pmmaCoeffs
nMoles 1;
molWeight 100;
}
transport
{
kappa 0.152;
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.1;
}
thermodynamics
{
Hf 0;
Cp 1462;
}
density
equationOfState
{
rho 1114.0;
}
@ -86,6 +92,7 @@ charCoeffs
nMoles 1;
molWeight 50;
}
transport
{
kappa 0.4;
@ -104,9 +111,11 @@ charCoeffs
Cp 611.0;
}
density
equationOfState
{
rho 11.5;
}
}
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
View File

@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
View File

@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

21
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
//thermoType heSolidThermo<multiComponentSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
{
@ -24,23 +23,26 @@ mixture
nMoles 1;
molWeight 12;
}
transport
{
kappa 80;
//kappa (80 80 80);
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.0;
}
thermodynamics
{
Hf 0;
Cp 450;
}
density
equationOfState
{
rho 8000;
}
@ -58,22 +60,26 @@ pmmaCoeffs
nMoles 1;
molWeight 100;
}
transport
{
kappa 0.152;
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.1;
}
thermodynamics
{
Hf 0;
Cp 1462;
}
density
equationOfState
{
rho 1114.0;
}
@ -86,6 +92,7 @@ charCoeffs
nMoles 1;
molWeight 50;
}
transport
{
kappa 0.4;
@ -104,9 +111,11 @@ charCoeffs
Cp 611.0;
}
density
equationOfState
{
rho 11.5;
}
}
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
View File

@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
View File

@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
kappaName none;
value uniform 300;
}

21
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
//thermoType heSolidThermo<multiComponentSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<constSolidThermo<constRho>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
mixture
{
@ -24,23 +23,26 @@ mixture
nMoles 1;
molWeight 12;
}
transport
{
kappa 80;
//kappa (80 80 80);
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.5;
}
thermodynamics
{
Hf 0;
Cp 450;
}
density
equationOfState
{
rho 8000;
}
@ -58,22 +60,26 @@ pmmaCoeffs
nMoles 1;
molWeight 100;
}
transport
{
kappa 0.152;
}
radiation
{
sigmaS 0.0;
kappaRad 0.0;
emissivity 0.1;
}
thermodynamics
{
Hf 0;
Cp 1462;
}
density
equationOfState
{
rho 1114.0;
}
@ -86,6 +92,7 @@ charCoeffs
nMoles 1;
molWeight 50;
}
transport
{
kappa 0.4;
@ -104,9 +111,11 @@ charCoeffs
Cp 611.0;
}
density
equationOfState
{
rho 11.5;
}
}
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
View File

@ -55,7 +55,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
kappa basicThermo;
kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
View File

@ -66,7 +66,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
kappa basicThermo;
kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;

8
tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
View File

@ -19,9 +19,13 @@ dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solver velocityComponentLaplacian x;
solver velocityComponentLaplacian;
diffusivity directional ( 1 200 0 );
velocityComponentLaplacianCoeffs
{
component x;
diffusivity directional ( 1 200 0 );
}
// ************************************************************************* //

5
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
View File

@ -20,7 +20,10 @@ motionSolverLibs ("libfvMotionSolvers.so");
solver displacementLaplacian;
diffusivity inverseDistance (wing);
displacementLaplacianCoeffs
{
diffusivity inverseDistance (wing);
}
// ************************************************************************* //

24
tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
View File

@ -55,17 +55,17 @@ functions
{
forces
{
type forces;
functionObjectLibs ("libforces.so");
outputControl outputTime;
outputInterval 1;
patches (floatingObject);
pName p;
UName U;
rhoName rhoInf;
log true;
rhoInf 1000;
CofR (0 0 0);
type forces;
functionObjectLibs ("libforces.so");
outputControl outputTime;
outputInterval 1;
patches (floatingObject);
pName p;
UName U;
rhoName rhoInf;
log true;
rhoInf 1000;
CofR (0 0 0);
}
poolHeight
@ -84,7 +84,7 @@ functions
(
zeta
);
}
};

3
tutorials/incompressible/simpleFoam/motorBike/0.org/U
View File

@ -23,6 +23,9 @@ internalField uniform $flowVelocity;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#include "include/fixedInlet"
outlet

4
tutorials/incompressible/simpleFoam/motorBike/0.org/k
View File

@ -22,6 +22,10 @@ internalField uniform $turbulentKE;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
//- Define inlet conditions
#include "include/fixedInlet"
outlet

3
tutorials/incompressible/simpleFoam/motorBike/0.org/nut
View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
frontAndBack
{
type calculated;

3
tutorials/incompressible/simpleFoam/motorBike/0.org/omega
View File

@ -22,6 +22,9 @@ internalField uniform $turbulentOmega;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#include "include/fixedInlet"
outlet

3
tutorials/incompressible/simpleFoam/motorBike/0.org/p
View File

@ -22,6 +22,9 @@ internalField uniform $pressure;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type zeroGradient;

17
tutorials/incompressible/simpleFoam/motorBike/Allrun
View File

@ -7,12 +7,19 @@ cd ${0%/*} || exit 1 # run from this directory
# copy motorbike surface from resources folder
cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
runApplication snappyHexMesh -overwrite
runApplication potentialFoam -noFunctionObjects -writep
runApplication `getApplication`
runApplication decomposePar
runParallel snappyHexMesh 6 -overwrite
#- For non-parallel running
#cp -r 0.org 0 > /dev/null 2>&1
#- For parallel running
ls -d processor* | xargs -i rm -rf ./{}/0 $1
ls -d processor* | xargs -i cp -r 0.org ./{}/0 $1
runParallel potentialFoam 6 -noFunctionObjects -writep
runParallel `getApplication` 6
# ----------------------------------------------------------------- end-of-file

6
tutorials/mesh/cvMesh/flange/system/cvMeshDict
View File

@ -217,7 +217,9 @@ polyMeshFiltering
}
#include "meshQualityControls"
meshQualityControls
{
#include "meshQualityDict"
}
// ************************************************************************* //

76
tutorials/mesh/cvMesh/flange/system/meshQualityControls
View File

@ -1,76 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
root "";
case "";
instance "";
local "";
class dictionary;
object meshQualityControls;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
meshQualityControls
{
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 65;
//- Max skewness allowed. Set to <0 to disable.
maxBoundarySkewness 50;
maxInternalSkewness 10;
//- Max concaveness allowed. Is angle (in degrees) below which concavity
// is allowed. 0 is straight face, <0 would be convex face.
// Set to 180 to disable.
maxConcave 80;
//- Minimum quality of the tet formed by the face-centre
// and variable base point minimum decomposition triangles and
// the cell centre. This has to be a positive number for tracking
// to work. Set to very negative number (e.g. -1E30) to
// disable.
// <0 = inside out tet,
// 0 = flat tet
// 1 = regular tet
minTetQuality 1e-30;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 0;
//- Minimum face area. Set to <0 to disable.
minArea -1;
//- Minimum face twist. Set to <-1 to disable. dot product of face normal
//- and face centre triangles normal
minTwist 0.001;
//- minimum normalised cell determinant
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.02;
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
minTriangleTwist -1;
}
// ************************************************************************* //

73
tutorials/mesh/cvMesh/flange/system/meshQualityDict Normal file
View File

@ -0,0 +1,73 @@
/*--------------------------------*- 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;
root "";
case "";
instance "";
local "";
class dictionary;
object meshQualityDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 65;
//- Max skewness allowed. Set to <0 to disable.
maxBoundarySkewness 50;
maxInternalSkewness 10;
//- Max concaveness allowed. Is angle (in degrees) below which concavity
// is allowed. 0 is straight face, <0 would be convex face.
// Set to 180 to disable.
maxConcave 80;
//- Minimum quality of the tet formed by the face-centre
// and variable base point minimum decomposition triangles and
// the cell centre. This has to be a positive number for tracking
// to work. Set to very negative number (e.g. -1E30) to
// disable.
// <0 = inside out tet,
// 0 = flat tet
// 1 = regular tet
minTetQuality 1e-30;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 0;
//- Minimum face area. Set to <0 to disable.
minArea -1;
//- Minimum face twist. Set to <-1 to disable. dot product of face normal
//- and face centre triangles normal
minTwist 0.001;
//- minimum normalised cell determinant
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.02;
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
minTriangleTwist -1;
// ************************************************************************* //

8
tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict
View File

@ -278,12 +278,12 @@ addLayersControls
// Generic mesh quality settings. At any undoable phase these determine
// where to undo.
#include "meshQualityControls"
meshQualityControls
{
// Generic mesh quality settings. At any undoable phase these determine
// where to undo.
#include "meshQualityDict"
//- Number of error distribution iterations
nSmoothScale 4;
//- amount to scale back displacement at error points

13
tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
View File

@ -23,10 +23,13 @@ motionSolverLibs ("libfvMotionSolvers.so");
solver displacementSBRStress; //displacementLaplacian;
//solver velocityComponentLaplacian z;
//diffusivity uniform;
//diffusivity directional (1 200 0);
//diffusivity motionDirectional (1 1000 0);
//diffusivity file motionDiffusivity;
diffusivity quadratic inverseDistance 1(minZ);
displacementSBRStressCoeffs
{
// diffusivity uniform;
// diffusivity directional (1 200 0);
// diffusivity motionDirectional (1 1000 0);
// diffusivity file motionDiffusivity;
diffusivity quadratic inverseDistance 1(minZ);
}
// ************************************************************************* //

5
tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict
View File

@ -20,7 +20,10 @@ motionSolverLibs ("libfvMotionSolvers.so");
solver displacementLaplacian;
diffusivity inverseDistance (movingBlock);
displacementLaplacianCoeffs
{
diffusivity inverseDistance (movingBlock);
}
// ************************************************************************* //

5
tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
View File

@ -20,7 +20,10 @@ motionSolverLibs ("libfvMotionSolvers.so");
solver displacementLaplacian;
diffusivity inverseDistance (floatingObject);
displacementLaplacianCoeffs
{
diffusivity inverseDistance (floatingObject);
}
// ************************************************************************* //