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

Post-merge clean-up

Browse source
This commit is contained in:
Hrvoje Jasak 2015-05-14 22:24:17 +01:00
parent e054cad9be
commit b2cab2462e
23 changed files with 71 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View file

@ -33,9 +33,9 @@ Description
#undef yyFlexLexer #undef yyFlexLexer
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ local definitions ------ local definitions
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
#include "scalarList.H" #include "scalarList.H"
#include "IStringStream.H" #include "IStringStream.H"
@ -150,9 +150,9 @@ nFlags {space}"NFLAGS:"{space}
mtype {space}"MTYPE:"{space} mtype {space}"MTYPE:"{space}
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
----- Exclusive start states ----- ----- Exclusive start states -----
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
%option stack %option stack
@ -193,11 +193,11 @@ mtype {space}"MTYPE:"{space}
%} %}
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ Start Lexing ------ ------ Start Lexing ------
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
/* ------ Reading control header ------ */ /* ------ Reading control header ------ */
{controlInfo} { {controlInfo} {
BEGIN(readControlHeader); BEGIN(readControlHeader);
@ -289,7 +289,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading nodal coordinates ------ */ /* ------ Reading nodal coordinates ------ */
{nodalCoords}{spaceNl} { {nodalCoords}{spaceNl} {
@ -317,7 +317,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading cells and elements ------ */ /* ------ Reading cells and elements ------ */
{cellsAndElements}{spaceNl} { {cellsAndElements}{spaceNl} {
@ -409,7 +409,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading element group information ------ */ /* ------ Reading element group information ------ */
{cellStreams}{spaceNl} { {cellStreams}{spaceNl} {
Info<< "Reading cell streams" << endl; Info<< "Reading cell streams" << endl;
@ -515,7 +515,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading end of section and others ------ */ /* ------ Reading end of section and others ------ */
<cellStreamLabels>{endOfSection}\n { <cellStreamLabels>{endOfSection}\n {
@ -601,19 +601,19 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading end of section and others ------ */ /* ------ Reading end of section and others ------ */
<controlInfo,nodalCoords,cellsAndElements>{endOfSection}\n { <controlInfo,nodalCoords,cellsAndElements>{endOfSection}\n {
BEGIN(INITIAL); BEGIN(INITIAL);
} }
/* ------ Ignore remaining space and \n s. Any other characters are errors. */ /* ------ Ignore remaining space and \n s. Any other characters are errors. */
.|\n {} .|\n {}
/* ------ On EOF return to previous file, if none exists terminate. ------ */ /* ------ On EOF return to previous file, if none exists terminate. ------ */
<<EOF>> { <<EOF>> {
yyterminate(); yyterminate();
@ -869,6 +869,6 @@ int main(int argc, char *argv[])
} }
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ End of gambitToFoam.L ------ End of gambitToFoam.L
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */

4
src/dbns/multigrid/mgMeshLevel/mgMeshLevel.H
View file

@ -90,10 +90,10 @@ public:
// Coarsening parameters // Coarsening parameters
//- Minimum cluster size //- Minimum cluster size
static const Foam::debug::optimisationSwitch mgMinClusterSize_; static const debug::optimisationSwitch mgMinClusterSize_;
//- Maximum cluster size //- Maximum cluster size
static const Foam::debug::optimisationSwitch mgMaxClusterSize_; static const debug::optimisationSwitch mgMaxClusterSize_;
// Constructor // Constructor

16
src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterface.H
View file

@ -262,28 +262,28 @@ private:
// Static data members // Static data members
//- Point merge tolerance //- Point merge tolerance
static const Foam::debug::tolerancesSwitch pointMergeTol_; static const debug::tolerancesSwitch pointMergeTol_;
//- Edge merge tolerance //- Edge merge tolerance
static const Foam::debug::tolerancesSwitch edgeMergeTol_; static const debug::tolerancesSwitch edgeMergeTol_;
//- Estimated number of faces an edge goes through //- Estimated number of faces an edge goes through
static const Foam::label nFacesPerSlaveEdge_; static const label nFacesPerSlaveEdge_;
//- Edge-face interaction escape limit //- Edge-face interaction escape limit
static const Foam::label edgeFaceEscapeLimit_; static const label edgeFaceEscapeLimit_;
//- Integral match point adjustment tolerance //- Integral match point adjustment tolerance
static const Foam::debug::tolerancesSwitch integralAdjTol_; static const debug::tolerancesSwitch integralAdjTol_;
//- Edge intersection master catch fraction //- Edge intersection master catch fraction
static const Foam::debug::tolerancesSwitch edgeMasterCatchFraction_; static const debug::tolerancesSwitch edgeMasterCatchFraction_;
//- Edge intersection co-planar tolerance //- Edge intersection co-planar tolerance
static const Foam::debug::tolerancesSwitch edgeCoPlanarTol_; static const debug::tolerancesSwitch edgeCoPlanarTol_;
//- Edge end cut-off tolerance //- Edge end cut-off tolerance
static const Foam::debug::tolerancesSwitch edgeEndCutoffTol_; static const debug::tolerancesSwitch edgeEndCutoffTol_;
public: public:

3
src/finiteArea/faMesh/faMesh.H
View file

@ -174,7 +174,8 @@ class faMesh
// Static Private Data // Static Private Data
static const Foam::debug::optimisationSwitch quadricsFit_; //- Use quadrics fit
static const debug::optimisationSwitch quadricsFit_;
// Private Member Functions // Private Member Functions

12
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
View file

@ -116,11 +116,11 @@ bool Foam::adjustPhi
scalar massCorr = 1.0; scalar massCorr = 1.0;
static const Foam::debug::tolerancesSwitch closedDomainTol static const debug::tolerancesSwitch closedDomainTol
( (
"closedDomainTol", "closedDomainTol",
1e-10 1e-10
); );
if (mag(adjustableMassOut) > SMALL) if (mag(adjustableMassOut) > SMALL)
{ {
@ -129,7 +129,7 @@ bool Foam::adjustPhi
else if else if
( (
mag(fixedMassOut - massIn) mag(fixedMassOut - massIn)
> closedDomainTol()*Foam::max(1.0, mag(massIn)) > closedDomainTol()*Foam::max(1.0, mag(massIn))
) )
{ {
phi.write(); phi.write();

2
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
View file

@ -78,7 +78,7 @@ public:
// Static data members // Static data members
//- Point merge tolerance //- Point merge tolerance
static const Foam::debug::tolerancesSwitch smallDotProdTol_; static const debug::tolerancesSwitch smallDotProdTol_;
// Constructors // Constructors

2
src/foam/algorithms/octree/octree/octreeDataBoundBox.H
View file

@ -70,7 +70,7 @@ class octreeDataBoundBox
// Static data // Static data
//- Tolerance on linear dimensions //- Tolerance on linear dimensions
static const Foam::debug::tolerancesSwitch tol; static const debug::tolerancesSwitch tol;
// Private data // Private data

6
src/foam/db/IOstreams/Pstreams/Pstream.H
View file

@ -225,14 +225,14 @@ public:
//- Should compact transfer be used in which floats replace doubles //- Should compact transfer be used in which floats replace doubles
// reducing the bandwidth requirement at the expense of some loss // reducing the bandwidth requirement at the expense of some loss
// in accuracy // in accuracy
static const Foam::debug::optimisationSwitch floatTransfer; static const debug::optimisationSwitch floatTransfer;
//- Number of processors at which the sum algorithm changes from linear //- Number of processors at which the sum algorithm changes from linear
// to tree // to tree
static const Foam::debug::optimisationSwitch nProcsSimpleSum; static const debug::optimisationSwitch nProcsSimpleSum;
//- Default commsType //- Default commsType
static const Foam::debug::optimisationSwitch defaultCommsType; static const debug::optimisationSwitch defaultCommsType;
// Constructors // Constructors

3
src/foam/db/regIOobject/regIOobject.H
View file

@ -94,7 +94,8 @@ public:
//- Runtime type information //- Runtime type information
TypeName("regIOobject"); TypeName("regIOobject");
static const Foam::debug::optimisationSwitch fileModificationSkew; //- File modification skew
static const debug::optimisationSwitch fileModificationSkew;
// Constructors // Constructors

2
src/foam/global/JobInfo/JobInfo.H
View file

@ -71,7 +71,7 @@ class JobInfo
public: public:
static bool constructed; static bool constructed;
static Foam::debug::infoSwitch writeJobInfo; static debug::infoSwitch writeJobInfo;
// Constructors // Constructors

6
src/foam/interpolations/GGIInterpolation/GGIInterpolation.H
View file

@ -220,13 +220,13 @@ class GGIInterpolation
// //
//- Octree search: minNlevel parameter for octree constructor //- Octree search: minNlevel parameter for octree constructor
static const Foam::debug::optimisationSwitch octreeSearchMinNLevel_; static const debug::optimisationSwitch octreeSearchMinNLevel_;
//- Octree search: maxLeafRatio parameter for octree constructor //- Octree search: maxLeafRatio parameter for octree constructor
static const Foam::debug::optimisationSwitch octreeSearchMaxLeafRatio_; static const debug::optimisationSwitch octreeSearchMaxLeafRatio_;
//- Octree search: maxShapeRatio parameter for octree constructor //- Octree search: maxShapeRatio parameter for octree constructor
static const Foam::debug::optimisationSwitch octreeSearchMaxShapeRatio_; static const debug::optimisationSwitch octreeSearchMaxShapeRatio_;
// Private Member Functions // Private Member Functions

4
src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
View file

@ -87,10 +87,10 @@ class PatchToPatchInterpolation
//- Relative merge tolerance for projected points missing the target //- Relative merge tolerance for projected points missing the target
// Expressed as the fraction of min involved edge size // Expressed as the fraction of min involved edge size
static const Foam::debug::tolerancesSwitch projectionTol_; static const debug::tolerancesSwitch projectionTol_;
//- Direct hit tolerance //- Direct hit tolerance
static const Foam::debug::tolerancesSwitch directHitTol_; static const debug::tolerancesSwitch directHitTol_;
// Point addressing // Point addressing

2
src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.H
View file

@ -136,7 +136,7 @@ private:
//- Matrix constraint fill-in //- Matrix constraint fill-in
// Equals to the estimated fraction of fixed nodes in the matrix // Equals to the estimated fraction of fixed nodes in the matrix
static const Foam::debug::optimisationSwitch fixFillIn; static const debug::optimisationSwitch fixFillIn;
// Private member functions // Private member functions

5
src/foam/meshes/meshShapes/cell/cell.H
View file

@ -66,8 +66,9 @@ public:
static const char* const typeName; static const char* const typeName;
//- Debug switch //- Debug switch
static Foam::debug::debugSwitch debug; static debug::debugSwitch debug;
// Constructors // Constructors

2
src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
View file

@ -228,7 +228,7 @@ public:
// Static data members // Static data members
//- Geomtric tolerance (fraction of bounding box) //- Geomtric tolerance (fraction of bounding box)
static const Foam::debug::tolerancesSwitch matchTol_; static const debug::tolerancesSwitch matchTol_;
// Constructors // Constructors

2
src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View file

@ -232,7 +232,7 @@ public:
//- Relative tolerance (for geometric matching) //- Relative tolerance (for geometric matching)
// Calculated as a factor of maximum edge length per face. // Calculated as a factor of maximum edge length per face.
// HJ, 21/Dec/2006 // HJ, 21/Dec/2006
static const Foam::debug::tolerancesSwitch matchTol_; static const debug::tolerancesSwitch matchTol_;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables

3
src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
View file

@ -178,7 +178,8 @@ private:
// Static Private Data // Static Private Data
static const Foam::debug::optimisationSwitch nSquaredProjection_; //- N-squared projection forced
static const debug::optimisationSwitch nSquaredProjection_;
// Private Member Functions // Private Member Functions

8
src/foam/meshes/primitiveMesh/primitiveMesh.H
View file

@ -322,22 +322,22 @@ public:
//- Cell closedness warning threshold //- Cell closedness warning threshold
// set as the fraction of un-closed area to closed area // set as the fraction of un-closed area to closed area
static const Foam::debug::tolerancesSwitch closedThreshold_; static const debug::tolerancesSwitch closedThreshold_;
//- Aspect ratio warning threshold //- Aspect ratio warning threshold
static const Foam::debug::tolerancesSwitch aspectThreshold_; static const debug::tolerancesSwitch aspectThreshold_;
//- Non-orthogonality warning threshold in deg //- Non-orthogonality warning threshold in deg
static Foam::debug::tolerancesSwitch nonOrthThreshold_; static Foam::debug::tolerancesSwitch nonOrthThreshold_;
//- Skewness warning threshold //- Skewness warning threshold
static const Foam::debug::tolerancesSwitch skewThreshold_; static const debug::tolerancesSwitch skewThreshold_;
//- Face angle threshold //- Face angle threshold
static Foam::debug::tolerancesSwitch faceAngleThreshold_; static Foam::debug::tolerancesSwitch faceAngleThreshold_;
//- Face flatness threshold //- Face flatness threshold
static const Foam::debug::tolerancesSwitch faceFlatnessThreshold_; static const debug::tolerancesSwitch faceFlatnessThreshold_;
// Constructors // Constructors

2
src/foam/meshes/primitiveShapes/triangle/intersection.H
View file

@ -64,7 +64,7 @@ public:
static Foam::debug::tolerancesSwitch planarTol_; static Foam::debug::tolerancesSwitch planarTol_;
//- Intersection miss tolerance, of the order of 1e-15 //- Intersection miss tolerance, of the order of 1e-15
static const Foam::debug::tolerancesSwitch missTol_; static const debug::tolerancesSwitch missTol_;
enum direction enum direction

6
src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
View file

@ -336,10 +336,10 @@ public:
template<> \ template<> \
const Foam::word DsmcParcel<Type>::typeName(#Type); \ const Foam::word DsmcParcel<Type>::typeName(#Type); \
template<> \ template<> \
Foam::debug::debugSwitch \ Foam::debug::debugSwitch \
DsmcParcel<Type>::debug \ DsmcParcel<Type>::debug \
( \ ( \
std::string(#Type), DebugSwitch \ std::string(#Type), DebugSwitch \
); );
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
View file

@ -123,10 +123,10 @@ class meshToMesh
// Private static data members // Private static data members
//- Direct hit tolerance //- Direct hit tolerance
static const Foam::debug::tolerancesSwitch directHitTol; static const debug::tolerancesSwitch directHitTol;
//- Cell centre distance required to establish a hit //- Cell centre distance required to establish a hit
static const Foam::debug::tolerancesSwitch cellCentreDistanceTol; static const debug::tolerancesSwitch cellCentreDistanceTol;
public: public:

6
src/thermophysicalModels/specie/specie/specie.H
View file

@ -84,13 +84,13 @@ public:
// Thermodynamic constants // Thermodynamic constants
//- Universal gas constant [J/(kmol K)] //- Universal gas constant [J/(kmol K)]
static const Foam::debug::constantsSwitch RR; static const debug::constantsSwitch RR;
//- Standard pressure [Pa] //- Standard pressure [Pa]
static const Foam::debug::constantsSwitch Pstd; static const debug::constantsSwitch Pstd;
//- Standard temperature [K] //- Standard temperature [K]
static const Foam::debug::constantsSwitch Tstd; static const debug::constantsSwitch Tstd;
// Constructors // Constructors

6
src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
View file

@ -97,13 +97,13 @@ class specieThermo
// Private data // Private data
//- Convergence tolerance of energy -> temperature inversion functions //- Convergence tolerance of energy -> temperature inversion functions
static const Foam::debug::tolerancesSwitch tol_; static const debug::tolerancesSwitch tol_;
//- Max temperature jump of energy -> temperature inversion functions //- Max temperature jump of energy -> temperature inversion functions
static const Foam::debug::tolerancesSwitch TJump_; static const debug::tolerancesSwitch TJump_;
//- Max number of iterations in energy->temperature inversion functions //- Max number of iterations in energy->temperature inversion functions
static const Foam::debug::optimisationSwitch maxIter_; static const debug::optimisationSwitch maxIter_;
// Private member functions // Private member functions