exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removing trailing whitespace, tabs and DOS CR & Fixing some indentation

Browse source
This commit is contained in:
Henrik Rusche 2018-05-29 10:30:29 +02:00
parent 4b4be75c2b
commit fc7de48319
223 changed files with 2687 additions and 2687 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ReleaseNotes.txt
View file

@ -1,10 +1,10 @@
_____________________________________
_____________________________________
*RELEASE NOTES FOR FOAM-EXTEND-4.0*
_____________________________________
*RELEASE NOTES FOR FOAM-EXTEND-4.0*
_____________________________________
December 2016
December 2016
Table of Contents

10
applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C
View file

@ -77,12 +77,12 @@ int main(int argc, char *argv[])
volScalarField field(fieldHeader, mesh);
int nbMesh;
nbMesh = 0;
nbMesh = 0;
forAll(field, cellI)
{
nbMesh++;
}
forAll(field, cellI)
{
nbMesh++;
}
Info<< runTime.timeName()<< " "
<< sum(field).value()/nbMesh<< " "

6
cmake/getGitVersion.cmake
View file

@ -38,9 +38,9 @@ if(GIT_FOUND)
# Try to get version from from git
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=-dirty
OUTPUT_VARIABLE GIT_VERSION
ERROR_VARIABLE dummy
RESULT_VARIABLE res
OUTPUT_VARIABLE GIT_VERSION
ERROR_VARIABLE dummy
RESULT_VARIABLE res
OUTPUT_STRIP_TRAILING_WHITESPACE
)

54
src/overset/oversetMesh/oversetAdjustPhi/regionWiseOversetAdjustPhi.C
View file

@ -219,33 +219,33 @@ void Foam::regionWiseOversetAdjustPhi
if (curFlip)
{
if (curPhi > 0.0)
{
// Flux going into the region (out of the fringe).
// Note that positive sign is kept.
regionFringeIn[curRegion] += curPhi;
}
else
{
// Flux coming out of the region (into the fringe).
// Note reverted sign.
regionFringeOut[curRegion] -= curPhi;
}
}
else
{
if (curPhi > 0.0)
{
// Flux going out of the region (into the fringe).
// Note that positive sign is kept.
regionFringeOut[curRegion] += curPhi;
}
else
{
// Flux going into the region (out of the fringe).
// Note reverted sign.
regionFringeIn[curRegion] -= curPhi;
}
if (curPhi > 0.0)
{
// Flux going into the region (out of the fringe).
// Note that positive sign is kept.
regionFringeIn[curRegion] += curPhi;
}
else
{
// Flux coming out of the region (into the fringe).
// Note reverted sign.
regionFringeOut[curRegion] -= curPhi;
}
}
else
{
if (curPhi > 0.0)
{
// Flux going out of the region (into the fringe).
// Note that positive sign is kept.
regionFringeOut[curRegion] += curPhi;
}
else
{
// Flux going into the region (out of the fringe).
// Note reverted sign.
regionFringeIn[curRegion] -= curPhi;
}
}
}
}

24
src/transportModels/viscoelastic/viscoelasticLaws/UCM/UCM.C
View file

@ -73,21 +73,21 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::UCM::divTau(volVectorField& U) const
{
dimensionedScalar etaPEff = etaP_;
return
(
fvc::div(tau_/rho_, "div(tau)")
- fvc::laplacian(etaPEff/rho_, U, "laplacian(etaPEff,U)")
+ fvm::laplacian( (etaPEff)/rho_, U, "laplacian(etaPEff+etaS,U)")
);
return
(
fvc::div(tau_/rho_, "div(tau)")
- fvc::laplacian(etaPEff/rho_, U, "laplacian(etaPEff,U)")
+ fvm::laplacian( (etaPEff)/rho_, U, "laplacian(etaPEff+etaS,U)")
);
}
else
{
return
(
fvc::div(tau_/rho_, "div(tau)")
- fvc::div((etaStab_/rho_)*fvc::grad(U), "div(tau)")
+ fvm::laplacian( (etaStab_)/rho_, U, "laplacian(etaPEff+etaS,U)")
);
return
(
fvc::div(tau_/rho_, "div(tau)")
- fvc::div((etaStab_/rho_)*fvc::grad(U), "div(tau)")
+ fvm::laplacian( (etaStab_)/rho_, U, "laplacian(etaPEff+etaS,U)")
);
}
}

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutCWTWallFunction/nutCWTWallFunctionFvPatchScalarField.C
View file

@ -181,7 +181,7 @@ tmp<scalarField> nutCWTWallFunctionFvPatchScalarField::calcNut() const
const label faceCellI = fc[faceI];
const scalar uStar = Cmu25*sqrt(k[faceCellI]);
// Note: here yPlus is actually yStar
// Note: here yPlus is actually yStar
const scalar yPlus = uStar*y[faceI]/nuw[faceI];
// Relative tangential velocity

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaMEWTWallFunction/omegaMEWTWallFunctionFvPatchScalarField.C
View file

@ -308,7 +308,7 @@ void omegaMEWTWallFunctionFvPatchScalarField::updateCoeffs()
const scalar yPlus = sqrt(tauw)*y[faceI]/nuw[faceI];
// Velocity gradient for viscous sublayer
const scalar dudyVis= magGradUw[faceI];
const scalar dudyVis= magGradUw[faceI];
// Velocity gradient for log layer
const scalar dudyLog =

2
tutorials/incompressible/RichardsonFoam/oneDimensionalSoilTransport/system/fvSolution
View file

@ -38,7 +38,7 @@ Picard
relaxationFactor
{
// psi 0.3;
// psi 0.3;
};
// ************************************************************************* //

6
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/backgroundMesh/system/controlDict
View file

@ -64,12 +64,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

24
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/backgroundMesh/system/fvSchemes
View file

@ -24,9 +24,9 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(k) cellLimited Gauss linear 1;
grad(omega) cellLimited Gauss linear 1;
grad(yPsi) leastSquares;
grad(k) cellLimited Gauss linear 1;
grad(omega) cellLimited Gauss linear 1;
grad(yPsi) leastSquares;
}
@ -35,16 +35,16 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev2(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev2(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -54,7 +54,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes
@ -71,7 +71,7 @@ fluxRequired
wallDist
{
method Poisson;
method Poisson;
}

6
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/frontMesh/system/controlDict
View file

@ -63,12 +63,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

14
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/frontMesh/system/fvSchemes
View file

@ -34,15 +34,15 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -52,7 +52,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes

6
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/middleMesh/system/controlDict
View file

@ -63,12 +63,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

14
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/middleMesh/system/fvSchemes
View file

@ -34,15 +34,15 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -52,7 +52,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes

6
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/controlDict
View file

@ -65,14 +65,14 @@ functions
outputControl timeStep;
outputInterval 1;
log true;
log true;
CofR (0.25 0 0); // Note sure because of scaling
liftDir (-0.239719744 0 0.970842132);
dragDir (0.970842132 0 0.239719744);
magUInf 27.13;
lRef 0.901;
Aref 0.815866; // Not sure because of scaling
lRef 0.901;
Aref 0.815866; // Not sure because of scaling
pitchAxis (0 1 0);
}
);

2
tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/fvSolution
View file

@ -45,7 +45,7 @@ solvers
minIter 1;
}
omega
omega
{
solver BiCGStab;
preconditioner DILU;

64
tutorials/viscoelastic/viscoelasticFluidFoam/UCM/constant/polyMesh/blockMeshDict
View file

@ -67,58 +67,58 @@ boundary
type patch;
faces
(
(0 12 14 2)
(2 14 16 4)
(4 16 18 6)
);
}
(0 12 14 2)
(2 14 16 4)
(4 16 18 6)
);
}
fixedWalls
{
type wall;
faces
(
(6 18 19 7)
(5 7 19 17)
(3 5 17 15)
(3 15 21 9)
(9 21 23 11)
);
}
(6 18 19 7)
(5 7 19 17)
(3 5 17 15)
(3 15 21 9)
(9 21 23 11)
);
}
outlet
{
type patch;
faces
(
(10 11 23 22)
);
}
(10 11 23 22)
);
}
simetry
{
type symmetryPlane;
faces
(
(0 1 13 12)
(1 8 20 13)
(8 10 22 20)
);
}
(0 1 13 12)
(1 8 20 13)
(8 10 22 20)
);
}
frontAndBack
{
type empty;
faces
(
(0 2 3 1)
(2 4 5 3)
(4 6 7 5)
(1 3 9 8)
(8 9 11 10)
(12 13 15 14)
(14 15 17 16)
(16 17 19 18)
(13 20 21 15)
(20 22 23 21)
);
}
(0 2 3 1)
(2 4 5 3)
(4 6 7 5)
(1 3 9 8)
(8 9 11 10)
(12 13 15 14)
(14 15 17 16)
(16 17 19 18)
(13 20 21 15)
(20 22 23 21)
);
}
);
mergePatchPairs

2
tutorials/viscoelastic/viscoelasticFluidFoam/UCM/constant/viscoelasticProperties
View file

@ -33,7 +33,7 @@ Guimarães, Portugal, June 26 - 30, 2016
rheology
{
type UCM;
type UCM;
rho rho [1 -3 0 0 0 0 0] 100;
etaP etaP [1 -1 -1 0 0 0 0] 0.25;
lambda lambda [0 0 1 0 0 0 0] 1;

2
vagrantSandbox/skel/.zshrc.local
View file

@ -84,7 +84,7 @@ fi
# just type '...' to get '../..'
#rationalise-dot() {
#local MATCH
#if [[ $LBUFFER =~ '(^|/| | |'$'\n''|\||;|&)\.\.$' ]]; then
#if [[ $LBUFFER =~ '(^|/| | |'$'\n''|\||;|&)\.\.$' ]]; then
# LBUFFER+=/
# zle self-insert
# zle self-insert

2
validationAndVerificationSuite/validation/incompressible/pisoFoam/NACA-4412/system/fvSolution
View file

@ -83,7 +83,7 @@ solvers
minIter 1;
}
omega
omega
{
solver BiCGStab;
preconditioner DILU;

4
validationAndVerificationSuite/validation/incompressible/pisoFoam/NACA-4412/system/fvSolution-sample
View file

@ -51,7 +51,7 @@ solvers
relTol 0.1;
minIter 1;
}
omega
omega
{
solver BiCGStab;
preconditioner DILU;
@ -65,7 +65,7 @@ SIMPLE
{
nNonOrthogonalCorrectors 0;
convergence 1e-5;
convergence 1e-5;
}
relaxationFactors

6
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/backgroundMesh/system/controlDict
View file

@ -64,12 +64,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

20
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/backgroundMesh/system/fvSchemes
View file

@ -26,7 +26,7 @@ gradSchemes
default Gauss linear;
grad(k) cellLimited Gauss linear 1;
grad(omega) cellLimited Gauss linear 1;
grad(yPsi) leastSquares;
grad(yPsi) leastSquares;
}
@ -35,16 +35,16 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev2(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev2(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -54,7 +54,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes
@ -71,7 +71,7 @@ fluxRequired
wallDist
{
method Poisson;
method Poisson;
}
// ************************************************************************* //

6
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/frontMesh/system/controlDict
View file

@ -63,12 +63,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

14
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/frontMesh/system/fvSchemes
View file

@ -34,15 +34,15 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -52,7 +52,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes

6
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/middleMesh/system/controlDict
View file

@ -63,12 +63,12 @@ rhoInf 1; // Reference density, fluid
CofR (0.25 0 0); // Origin for moment calculations
outputControl timeStep;
outputInterval 1;
log true;
log true;
liftDir (-0.239719744 0 0.970842132 );
dragDir (0.970842132 0 0.239719744);
magUInf 24.472;
lRef 1;
Aref 1;
lRef 1;
Aref 1;
pitchAxis (0 1 0);
}
);

14
validationAndVerificationSuite/validation/overset/NACA4412-airfoil/oversetMeshes/middleMesh/system/fvSchemes
View file

@ -34,15 +34,15 @@ divSchemes
default none;
div(phi,U) bounded Gauss linearUpwind grad(U);//bounded Gauss limitedLinearV 1;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phi,nuTilda) bounded Gauss upwind;//limitedLinear 1;
div(phi,k) bounded Gauss upwind;//limitedLinear 1;
div(phi,omega) bounded Gauss upwind;//limitedLinear 1;
div(phid,p) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
div((phi|interpolate(rho)),p) Gauss upwind;
div(tauMC) Gauss linear;
}
laplacianSchemes
@ -52,7 +52,7 @@ laplacianSchemes
interpolationSchemes
{
default linear;
default linear;
}
snGradSchemes