Skip to content
Snippets Groups Projects
Commit 86feee80 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

parents 3e49bb14 216f0a0c
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 66 deletions
applications/solvers/incompressible/pimpleFoam/UEqn.H
+ 2
− 2
View file @ 86feee80
......@@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
UEqn().relax();
volScalarField rUA = 1.0/UEqn().A();
volScalarField rAU = 1.0/UEqn().A();
if (momentumPredictor)
{
......@@ -17,6 +17,6 @@ if (momentumPredictor)
}
else
{
U = rUA*(UEqn().H() - fvc::grad(p));
U = rAU*(UEqn().H() - fvc::grad(p));
U.correctBoundaryConditions();
}
applications/solvers/incompressible/pimpleFoam/pEqn.H
+ 4
− 4
View file @ 86feee80
U = rUA*UEqn().H();
U = rAU*UEqn().H();
if (nCorr <= 1)
{
......@@ -6,7 +6,7 @@ if (nCorr <= 1)
}
phi = (fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, U, phi);
+ fvc::ddtPhiCorr(rAU, U, phi);
adjustPhi(phi, U, p);
......@@ -16,7 +16,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
// Pressure corrector
fvScalarMatrix pEqn
(
fvm::laplacian(rUA, p) == fvc::div(phi)
fvm::laplacian(rAU, p) == fvc::div(phi)
);
pEqn.setReference(pRefCell, pRefValue);
......@@ -47,5 +47,5 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
// Explicitly relax pressure for momentum corrector
p.relax();
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
+ 1
− 1
View file @ 86feee80
......@@ -27,7 +27,7 @@
mesh
);
# include "createPhi.H"
#include "createPhi.H"
label pRefCell = 0;
......
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+ 1
− 0
View file @ 86feee80
......@@ -46,6 +46,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
#include "continuityErrs.H"
// Explicitly relax pressure for momentum corrector
p.relax();
// Make the fluxes relative to the mesh motion
......
src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+ 4
− 1
View file @ 86feee80
......@@ -27,7 +27,10 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::scalar Foam::polyMeshTetDecomposition::minTetQuality = 1e-12;
// Note: the use of this tolerance is ad-hoc, there may be extreme
// cases where the resulting tetrahedra still have particle tracking
// problems.
const Foam::scalar Foam::polyMeshTetDecomposition::minTetQuality = SMALL;
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
......
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+ 6
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionFoam;
startFrom latestTime;
......@@ -54,5 +52,11 @@ maxDi 10.0;
adjustTimeStep yes;
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
);
// ************************************************************************* //
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+ 6
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionFoam;
startFrom latestTime;
......@@ -53,5 +51,11 @@ maxDi 10.0;
adjustTimeStep yes;
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
);
// ************************************************************************* //
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
+ 7
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionSimpleFoam;
startFrom startTime;
......@@ -47,4 +45,11 @@ timePrecision 6;
runTimeModifiable true;
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
);
// ************************************************************************* //
tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
+ 6
− 7
View file @ 86feee80
......@@ -17,13 +17,6 @@ FoamFile
application boundaryFoam;
libs
(
"libOpenFOAM.so"
"libinterpolationTables_16x.so"
"libtabulatedWallFunctionFvPatchFields_16x.so"
);
startFrom startTime;
startTime 0;
......@@ -54,5 +47,11 @@ runTimeModifiable true;
graphFormat raw;
libs
(
"libOpenFOAM.so"
"libinterpolationTables_16x.so"
"libtabulatedWallFunctionFvPatchFields_16x.so"
);
// ************************************************************************* //
tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
+ 8
− 8
View file @ 86feee80
......@@ -20,47 +20,47 @@ internalField uniform (0 0 0);
boundaryField
{
movingWall
movingWall
{
type fixedValue;
value uniform (1 0 0);
}
farFieldMoving
farFieldMoving
{
type fixedValue;
value uniform (0 0 0);
}
fixedWall
fixedWall
{
type fixedValue;
value uniform (0 0 0);
}
axis
axis
{
type symmetryPlane;
}
left
left
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
farField
farField
{
type fixedValue;
value uniform (0 0 0);
}
back
back
{
type wedge;
}
front
front
{
type wedge;
}
......
tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
+ 8
− 8
View file @ 86feee80
......@@ -20,27 +20,27 @@ internalField uniform 0;
boundaryField
{
movingWall
movingWall
{
type zeroGradient;
}
farFieldMoving
farFieldMoving
{
type zeroGradient;
}
fixedWall
fixedWall
{
type zeroGradient;
}
axis
axis
{
type symmetryPlane;
}
left
left
{
type totalPressure;
p0 uniform 0;
......@@ -52,17 +52,17 @@ boundaryField
value uniform 0;
}
farField
farField
{
type zeroGradient;
}
back
back
{
type wedge;
}
front
front
{
type wedge;
}
......
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+ 8
− 2
View file @ 86feee80
......@@ -21,7 +21,7 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 0.01;
tolerance 0.02;
relTol 0;
}
......@@ -30,7 +30,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-06;
relTol 0.05;
relTol 0.01;
}
pFinal
......@@ -66,10 +66,16 @@ solvers
PIMPLE
{
correctPhi yes;
nOuterCorrectors 2;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
}
relaxationFactors
{
U 1;
UFinal 1;
}
// ************************************************************************* //
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict
+ 6
− 2
View file @ 86feee80
......@@ -49,14 +49,18 @@ adjustTimeStep yes;
maxCo 0.9;
libs ("libforces.so");
libs
(
"libOpenFOAM.so"
"libforces.so"
);
functions
{
forces
{
type forces;
functionObjectLibs ( "libforces.so" );
functionObjectLibs ("libforces.so");
outputControl timeStep;
outputInterval 10;
patches (wing);
......
tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
+ 7
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libOpenFOAM.so" "libincompressibleTurbulenceModel.so" "libincompressibleRASModels.so");
application pimpleFoam;
startFrom startTime;
......@@ -51,6 +49,13 @@ adjustTimeStep yes;
maxCo 5;
libs
(
"libOpenFOAM.so"
"libincompressibleTurbulenceModel.so"
"libincompressibleRASModels.so"
);
functions
{
probes
......
tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+ 7
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libOpenFOAM.so" "libincompressibleTurbulenceModel.so" "libincompressibleRASModels.so");
application pimpleFoam;
startFrom startTime;
......@@ -51,6 +49,13 @@ adjustTimeStep yes;
maxCo 5;
libs
(
"libOpenFOAM.so"
"libinterpolationTables_16x.so"
"libtabulatedWallFunctionFvPatchFields_16x.so"
);
functions
{
probes
......
tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+ 5
− 2
View file @ 86feee80
......@@ -14,8 +14,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libincompressibleRASModels.so");
application simpleFoam;
startFrom startTime;
......@@ -46,6 +44,11 @@ timePrecision 6;
runTimeModifiable true;
libs
(
"libOpenFOAM.so"
"libincompressibleRASModels.so"
);
functions
{
......
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+ 7
− 2
View file @ 86feee80
......@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so" "libradiation.so");
application porousExplicitSourceReactingParcelFoam;
startFrom startTime;
......@@ -53,5 +51,12 @@ maxCo 1.0;
maxDeltaT 1;
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
"libradiation.so"
);
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/controlDict
+ 8
− 9
View file @ 86feee80
......@@ -15,15 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
"libSLGThermo.so"
"libsurfaceFilmModels.so"
);
application reactingParcelFoam;
startFrom latestTime; // startTime;
......@@ -60,5 +51,13 @@ maxCo 0.5;
maxDeltaT 0.005;
libs
(
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
"libSLGThermo.so"
"libsurfaceFilmModels.so"
);
// ************************************************************************* //
tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict
+ 1
− 8
View file @ 86feee80
......@@ -53,16 +53,9 @@ maxDeltaT 0.025;
libs
(
"libOpenFOAM.so"
"libincompressibleRASModels.so"
"libforces.so"
);
// libs
// (
// "libgenericPatchFields.so"
// "libincompressibleRASModels.so"
// "libforces.so"
// );
// ************************************************************************* //
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment