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

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

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 Table of Contents

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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