Consistency: Changed exponent FORTRAN style 'E' to C style 'e'

This commit is contained in:
Henry
2012-04-17 16:48:27 +01:00
parent b4fe2268a3
commit cd51a5eea3
66 changed files with 115 additions and 96 deletions

View File

@ -161,8 +161,8 @@
volScalarField gh("gh", g & mesh.C()); volScalarField gh("gh", g & mesh.C());
surfaceScalarField ghf("ghf", g & mesh.Cf()); surfaceScalarField ghf("ghf", g & mesh.Cf());
volScalarField rho1(eos1->rho(p, T)); volScalarField rho1("rho1", eos1->rho(p, T));
volScalarField rho2(eos2->rho(p, T)); volScalarField rho2("rho2", eos2->rho(p, T));
volScalarField rho volScalarField rho
( (

View File

@ -3,5 +3,6 @@ phaseEquationOfState/newPhaseEquationOfState.C
constant/constant.C constant/constant.C
linear/linear.C linear/linear.C
perfectFluid/perfectFluid.C perfectFluid/perfectFluid.C
adiabaticPerfectFluid/adiabaticPerfectFluid.C
LIB = $(FOAM_LIBBIN)/libphaseEquationsOfState LIB = $(FOAM_LIBBIN)/libphaseEquationsOfState

View File

@ -79,7 +79,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::rho
( (
"rho", "rho",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
rho_ rho_
@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::psi
( (
"psi", "psi",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("psi", dimDensity/dimPressure, 0) dimensionedScalar("psi", dimDensity/dimPressure, 0)

View File

@ -80,7 +80,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::rho
( (
"rho", "rho",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
rho0_ + psi_*p rho0_ + psi_*p
) )
@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::psi
( (
"psi", "psi",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
psi_ psi_

View File

@ -80,7 +80,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::rho
( (
"rho", "rho",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
rho0_ + psi(p, T)*p rho0_ + psi(p, T)*p
) )
@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::psi
( (
"psi", "psi",
p.time().timeName(), p.time().timeName(),
p.mesh() p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
), ),
1.0/(R_*T) 1.0/(R_*T)
) )

View File

@ -214,7 +214,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
forAll(localPoints, i) forAll(localPoints, i)
{ {
const point pt = localPoints[i] + 1E-4*rndGen.vector01(); const point pt = localPoints[i] + 1e-4*rndGen.vector01();
label meshPointI = allBoundary.meshPoints()[i]; label meshPointI = allBoundary.meshPoints()[i];
@ -299,7 +299,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{ {
const edge& e = edges[i]; const edge& e = edges[i];
const point pt = e.centre(localPoints) + 1E-4*rndGen.vector01(); const point pt = e.centre(localPoints) + 1e-4*rndGen.vector01();
label meshEdgeI = meshEdges[i]; label meshEdgeI = meshEdges[i];

View File

@ -58,7 +58,7 @@ using namespace Foam;
// Max cos angle for edges to be considered aligned with axis. // Max cos angle for edges to be considered aligned with axis.
static const scalar edgeTol = 1E-3; static const scalar edgeTol = 1e-3;
void writeSet(const cellSet& cells, const string& msg) void writeSet(const cellSet& cells, const string& msg)

View File

@ -528,7 +528,7 @@ int main(int argc, char *argv[])
( (
mesh, mesh,
boundaryPoint, boundaryPoint,
1E-9, // factor of largest face area 1e-9, // factor of largest face area
5, // factor between smallest and largest edge on 5, // factor between smallest and largest edge on
// face // face
collapser collapser

View File

@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::scalar Foam::edgeStats::edgeTol_ = 1E-3; const Foam::scalar Foam::edgeStats::edgeTol_ = 1e-3;

View File

@ -209,7 +209,7 @@ int main(int argc, char *argv[])
const pointField& points = pMesh.points(); const pointField& points = pMesh.points();
const boundBox& bb = pMesh.bounds(); const boundBox& bb = pMesh.bounds();
const scalar mergeDim = 1E-4 * bb.minDim(); const scalar mergeDim = 1e-4 * bb.minDim();
forAll(edges, edgeI) forAll(edges, edgeI)
{ {

View File

@ -561,7 +561,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeCloseDualVertices
scalar closenessTolerance = cvMeshControls().mergeClosenessCoeff(); scalar closenessTolerance = cvMeshControls().mergeClosenessCoeff();
// Absolute distance for points to be considered coincident. Bit adhoc // Absolute distance for points to be considered coincident. Bit adhoc
// but points were seen with distSqr ~ 1E-30 which is SMALL^2. Add a few // but points were seen with distSqr ~ 1e-30 which is SMALL^2. Add a few
// digits to account for truncation errors. // digits to account for truncation errors.
scalar coincidentDistanceSqr = sqr scalar coincidentDistanceSqr = sqr
( (

View File

@ -51,7 +51,7 @@ using namespace Foam;
// Tolerance (as fraction of the bounding box). Needs to be fairly lax since // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
// usually meshes get written with limited precision (6 digits) // usually meshes get written with limited precision (6 digits)
static const scalar defaultMergeTol = 1E-6; static const scalar defaultMergeTol = 1e-6;
// Get merging distance when matching face centres // Get merging distance when matching face centres
scalar getMergeDistance scalar getMergeDistance
@ -397,7 +397,7 @@ int main(int argc, char *argv[])
"mergeTol", "mergeTol",
"scalar", "scalar",
"specify the merge distance relative to the bounding box size " "specify the merge distance relative to the bounding box size "
"(default 1E-6)" "(default 1e-6)"
); );
#include "setRootCase.H" #include "setRootCase.H"

View File

@ -666,7 +666,7 @@ int main(int argc, char *argv[])
const boundBox& bb = mesh.bounds(); const boundBox& bb = mesh.bounds();
const vector span = bb.span(); const vector span = bb.span();
const scalar mergeDim = 1E-4 * bb.minDim(); const scalar mergeDim = 1e-4 * bb.minDim();
Info<< "Mesh bounding box : " << bb << nl Info<< "Mesh bounding box : " << bb << nl
<< " with span : " << span << nl << " with span : " << span << nl

View File

@ -257,7 +257,7 @@ int main(int argc, char *argv[])
const pointField& points = mesh().points(); const pointField& points = mesh().points();
const boundBox& bb = mesh().bounds(); const boundBox& bb = mesh().bounds();
const scalar mergeDim = 1E-4 * bb.minDim(); const scalar mergeDim = 1e-4 * bb.minDim();
forAll(edges, edgeI) forAll(edges, edgeI)
{ {

View File

@ -41,8 +41,8 @@ Foam::label Foam::findOppositeWedge
if if
( (
pp.size() == wpp.size() pp.size() == wpp.size()
&& mag(pp.axis() & wpp.axis()) >= (1-1E-3) && mag(pp.axis() & wpp.axis()) >= (1-1e-3)
&& mag(ppCosAngle - wppCosAngle) >= 1E-3 && mag(ppCosAngle - wppCosAngle) >= 1e-3
) )
{ {
return patchI; return patchI;
@ -106,7 +106,7 @@ bool Foam::checkWedges
); );
if (mag(opp.axis() & pp.axis()) < (1-1E-3)) if (mag(opp.axis() & pp.axis()) < (1-1e-3))
{ {
if (report) if (report)
{ {

View File

@ -52,7 +52,7 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
label nUnique = mergePoints label nUnique = mergePoints
( (
points, points,
1E-6, 1e-6,
false, false,
oldToNew oldToNew
); );
@ -226,7 +226,7 @@ Foam::label Foam::meshDualiser::addInternalFace
label nUnique = mergePoints label nUnique = mergePoints
( (
facePoints, facePoints,
1E-6, 1e-6,
false, false,
oldToNew oldToNew
); );

View File

@ -52,7 +52,7 @@ using namespace Foam;
// Max cos angle for edges to be considered aligned with axis. // Max cos angle for edges to be considered aligned with axis.
static const scalar edgeTol = 1E-3; static const scalar edgeTol = 1e-3;
// Calculate some edge statistics on mesh. // Calculate some edge statistics on mesh.
@ -206,7 +206,7 @@ label twoDNess(const polyMesh& mesh)
minLen = min(minLen, mesh.edges()[cEdges[i]].mag(mesh.points())); minLen = min(minLen, mesh.edges()[cEdges[i]].mag(mesh.points()));
} }
if (cellPlane.distance(ctrs[cellI]) > 1E-6*minLen) if (cellPlane.distance(ctrs[cellI]) > 1e-6*minLen)
{ {
// Centres not in plane // Centres not in plane
return -1; return -1;
@ -274,7 +274,7 @@ label twoDNess(const polyMesh& mesh)
const scalarField cosAngle(mag(n/mag(n) & cellPlane.normal())); const scalarField cosAngle(mag(n/mag(n) & cellPlane.normal()));
if (mag(min(cosAngle) - max(cosAngle)) > 1E-6) if (mag(min(cosAngle) - max(cosAngle)) > 1e-6)
{ {
// cosAngle should be either ~1 over all faces (2D front and // cosAngle should be either ~1 over all faces (2D front and
// back) or ~0 (all other patches perp to 2D) // back) or ~0 (all other patches perp to 2D)

View File

@ -55,7 +55,7 @@ using namespace Foam;
// Tolerance (as fraction of the bounding box). Needs to be fairly lax since // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
// usually meshes get written with limited precision (6 digits) // usually meshes get written with limited precision (6 digits)
static const scalar defaultMergeTol = 1E-7; static const scalar defaultMergeTol = 1e-7;
static void renumber static void renumber
@ -290,7 +290,7 @@ int main(int argc, char *argv[])
"mergeTol", "mergeTol",
"scalar", "scalar",
"specify the merge distance relative to the bounding box size " "specify the merge distance relative to the bounding box size "
"(default 1E-7)" "(default 1e-7)"
); );
argList::addBoolOption argList::addBoolOption
( (

View File

@ -60,7 +60,7 @@ Description
// Tolerance (as fraction of the bounding box). Needs to be fairly lax since // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
// usually meshes get written with limited precision (6 digits) // usually meshes get written with limited precision (6 digits)
static const scalar defaultMergeTol = 1E-6; static const scalar defaultMergeTol = 1e-6;
//// Read mesh if available. Otherwise create empty mesh with same non-proc //// Read mesh if available. Otherwise create empty mesh with same non-proc
@ -721,7 +721,7 @@ int main(int argc, char *argv[])
"mergeTol", "mergeTol",
"scalar", "scalar",
"specify the merge distance relative to the bounding box size " "specify the merge distance relative to the bounding box size "
"(default 1E-6)" "(default 1e-6)"
); );
# include "setRootCase.H" # include "setRootCase.H"

View File

@ -32,7 +32,7 @@ License
namespace Foam namespace Foam
{ {
static const scalar perturbFactor = 1E-6; static const scalar perturbFactor = 1e-6;
// Special version of findCell that generates a cell guaranteed to be // Special version of findCell that generates a cell guaranteed to be

View File

@ -7,7 +7,7 @@ List<treeBoundBox> meshBb
treeBoundBox treeBoundBox
( (
boundBox(coarseMesh.points(), false) boundBox(coarseMesh.points(), false)
).extend(rndGen, 1E-3) ).extend(rndGen, 1e-3)
); );
// Dummy bounds dictionary // Dummy bounds dictionary

View File

@ -367,7 +367,7 @@ int main(int argc, char *argv[])
forAll(triQ, faceI) forAll(triQ, faceI)
{ {
if (triQ[faceI] < 1E-11) if (triQ[faceI] < 1e-11)
{ {
problemFaces.append(faceI); problemFaces.append(faceI);
} }
@ -427,9 +427,9 @@ int main(int argc, char *argv[])
const pointField& localPoints = surf.localPoints(); const pointField& localPoints = surf.localPoints();
const boundBox bb(localPoints); const boundBox bb(localPoints);
scalar smallDim = 1E-6 * bb.mag(); scalar smallDim = 1e-6 * bb.mag();
Info<< "Checking for points less than 1E-6 of bounding box (" Info<< "Checking for points less than 1e-6 of bounding box ("
<< bb.span() << " meter) apart." << bb.span() << " meter) apart."
<< endl; << endl;

View File

@ -159,7 +159,7 @@ int main(int argc, char *argv[])
treeBoundBox treeBoundBox
( (
boundBox(mesh.points(), false) boundBox(mesh.points(), false)
).extend(rndGen, 1E-3) ).extend(rndGen, 1e-3)
); );
Pstream::gatherList(meshBb); Pstream::gatherList(meshBb);
Pstream::scatterList(meshBb); Pstream::scatterList(meshBb);

View File

@ -254,7 +254,7 @@ int main(int argc, char *argv[])
selectSurf, selectSurf,
indexedOctree<treeDataTriSurface>::perturbTol() indexedOctree<treeDataTriSurface>::perturbTol()
), ),
bb.extend(rndGen, 1E-4), // slightly randomize bb bb.extend(rndGen, 1e-4), // slightly randomize bb
8, // maxLevel 8, // maxLevel
10, // leafsize 10, // leafsize
3.0 // duplicity 3.0 // duplicity

View File

@ -36,7 +36,7 @@ void Foam::clockTime::getTime(timeType& t)
double Foam::clockTime::timeDifference(const timeType& beg, const timeType& end) double Foam::clockTime::timeDifference(const timeType& beg, const timeType& end)
{ {
return end.tv_sec - beg.tv_sec + 1E-6*(end.tv_usec - beg.tv_usec); return end.tv_sec - beg.tv_sec + 1e-6*(end.tv_usec - beg.tv_usec);
} }

View File

@ -44,7 +44,7 @@ License
defineTypeNameAndDebug(Foam::globalMeshData, 0); defineTypeNameAndDebug(Foam::globalMeshData, 0);
// Geometric matching tolerance. Factor of mesh bounding box. // Geometric matching tolerance. Factor of mesh bounding box.
const Foam::scalar Foam::globalMeshData::matchTol_ = 1E-8; const Foam::scalar Foam::globalMeshData::matchTol_ = 1e-8;
namespace Foam namespace Foam
{ {

View File

@ -893,7 +893,7 @@ Foam::polyMesh::cellTree() const
Random rndGen(261782); Random rndGen(261782);
overallBb = overallBb.extend(rndGen, 1E-4); overallBb = overallBb.extend(rndGen, 1e-4);
overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -34,7 +34,7 @@ namespace Foam
{ {
defineTypeNameAndDebug(coupledPolyPatch, 0); defineTypeNameAndDebug(coupledPolyPatch, 0);
const scalar coupledPolyPatch::defaultMatchTol_ = 1E-4; const scalar coupledPolyPatch::defaultMatchTol_ = 1e-4;
template<> template<>
const char* NamedEnum<coupledPolyPatch::transformType, 4>::names[] = const char* NamedEnum<coupledPolyPatch::transformType, 4>::names[] =

View File

@ -48,7 +48,7 @@ Description
release. release.
If the turbulent fluctuation of the mixture fraction at the sub-grid level If the turbulent fluctuation of the mixture fraction at the sub-grid level
is large (>1E-04) then a beta pdf is used for filtering. is large (>1e-04) then a beta pdf is used for filtering.
At the moment the flame area combustion model is only fit to work in a LES At the moment the flame area combustion model is only fit to work in a LES
frame work. In RAS the subgrid fluctiuation has to be solved by an extra frame work. In RAS the subgrid fluctiuation has to be solved by an extra

View File

@ -43,7 +43,7 @@ defineTypeNameAndDebug(Foam::boundaryMesh, 0);
const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1); const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
// Distance to face tolerance for getNearest // Distance to face tolerance for getNearest
const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1E-2; const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1e-2;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -871,11 +871,11 @@ Foam::labelList Foam::boundaryMesh::getNearest
{ {
scalar sign = mesh().faceNormals()[bFaceI] & splitNormal_; scalar sign = mesh().faceNormals()[bFaceI] & splitNormal_;
if (sign > -1E-5) if (sign > -1e-5)
{ {
rightFaces.append(bFaceI); rightFaces.append(bFaceI);
} }
if (sign < 1E-5) if (sign < 1e-5)
{ {
leftFaces.append(bFaceI); leftFaces.append(bFaceI);
} }
@ -909,7 +909,7 @@ Foam::labelList Foam::boundaryMesh::getNearest
// Extend domain slightly (also makes it 3D if was 2D) // Extend domain slightly (also makes it 3D if was 2D)
// Note asymmetry to avoid having faces align with octree cubes. // Note asymmetry to avoid having faces align with octree cubes.
scalar tol = 1E-6 * overallBb.avgDim(); scalar tol = 1e-6 * overallBb.avgDim();
point& bbMin = overallBb.min(); point& bbMin = overallBb.min();
bbMin.x() -= tol; bbMin.x() -= tol;

View File

@ -39,7 +39,7 @@ License
// Extension factor of edges to make sure we catch intersections through // Extension factor of edges to make sure we catch intersections through
// edge endpoints // edge endpoints
const Foam::scalar Foam::geomCellLooper::pointEqualTol_ = 1E-3; const Foam::scalar Foam::geomCellLooper::pointEqualTol_ = 1e-3;
// Snap cuts through edges onto edge endpoints. Fraction of edge length. // Snap cuts through edges onto edge endpoints. Fraction of edge length.

View File

@ -125,7 +125,7 @@ void Foam::directions::check2D
{ {
if (correct2DPtr) if (correct2DPtr)
{ {
if (mag(correct2DPtr->planeNormal() & vec) > 1E-6) if (mag(correct2DPtr->planeNormal() & vec) > 1e-6)
{ {
FatalErrorIn("check2D") << "Specified vector " << vec FatalErrorIn("check2D") << "Specified vector " << vec
<< "is not normal to plane defined in dynamicMeshDict." << "is not normal to plane defined in dynamicMeshDict."

View File

@ -900,7 +900,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
{ {
Pout<< "motionSmoother::movePoints : testing sync of newPoints." Pout<< "motionSmoother::movePoints : testing sync of newPoints."
<< endl; << endl;
testSyncPositions(newPoints, 1E-6*mesh_.bounds().mag()); testSyncPositions(newPoints, 1e-6*mesh_.bounds().mag());
} }
// Move actual mesh points. Make sure to delete tetBasePtIs so it // Move actual mesh points. Make sure to delete tetBasePtIs so it
@ -1051,7 +1051,7 @@ bool Foam::motionSmoother::scaleMesh
totalDisplacement, totalDisplacement,
maxMagEqOp(), maxMagEqOp(),
vector::zero, // null value vector::zero, // null value
1E-6*mesh_.bounds().mag() 1e-6*mesh_.bounds().mag()
); );
} }

View File

@ -54,7 +54,7 @@ namespace Foam
// Tolerance used as fraction of minimum edge length. // Tolerance used as fraction of minimum edge length.
const Foam::scalar Foam::perfectInterface::tol_ = 1E-3; const Foam::scalar Foam::perfectInterface::tol_ = 1e-3;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

View File

@ -36,7 +36,7 @@ License
defineTypeNameAndDebug(Foam::faceCoupleInfo, 0); defineTypeNameAndDebug(Foam::faceCoupleInfo, 0);
const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1E-3; const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1e-3;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -1014,7 +1014,7 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster
mesh0, mesh0,
bndFaces // boundary faces only bndFaces // boundary faces only
), ),
overallBb.extend(rndGen, 1E-4), // overall search domain overallBb.extend(rndGen, 1e-4), // overall search domain
8, // maxLevel 8, // maxLevel
10, // leafsize 10, // leafsize
3.0 // duplicity 3.0 // duplicity

View File

@ -277,7 +277,7 @@ void Foam::faceCollapser::setRefinement
if (w <= dist[fpMin1]) if (w <= dist[fpMin1])
{ {
// Offset. // Offset.
w = dist[fpMin1] + 1E-6*(dist[fpB] - dist[fpA]); w = dist[fpMin1] + 1e-6*(dist[fpB] - dist[fpA]);
point newPoint point newPoint
( (
@ -330,7 +330,7 @@ void Foam::faceCollapser::setRefinement
if (w <= dist[fpMin1]) if (w <= dist[fpMin1])
{ {
// Offset. // Offset.
w = dist[fpMin1] + 1E-6*(dist[fpB] - dist[fpA]); w = dist[fpMin1] + 1e-6*(dist[fpB] - dist[fpA]);
point newPoint point newPoint
( (

View File

@ -4452,7 +4452,7 @@ void Foam::hexRef8::distribute(const mapDistributePolyMesh& map)
void Foam::hexRef8::checkMesh() const void Foam::hexRef8::checkMesh() const
{ {
const scalar smallDim = 1E-6 * mesh_.bounds().mag(); const scalar smallDim = 1e-6 * mesh_.bounds().mag();
if (debug) if (debug)
{ {

View File

@ -923,7 +923,7 @@ Foam::extendedFeatureEdgeMesh::pointTree() const
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
treeBoundBox bb treeBoundBox bb
( (
treeBoundBox(points()).extend(rndGen, 1E-4) treeBoundBox(points()).extend(rndGen, 1e-4)
); );
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@ -963,7 +963,7 @@ Foam::extendedFeatureEdgeMesh::edgeTree() const
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
treeBoundBox bb treeBoundBox bb
( (
treeBoundBox(points()).extend(rndGen, 1E-4) treeBoundBox(points()).extend(rndGen, 1e-4)
); );
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@ -1007,7 +1007,7 @@ Foam::extendedFeatureEdgeMesh::edgeTreesByType() const
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
treeBoundBox bb treeBoundBox bb
( (
treeBoundBox(points()).extend(rndGen, 1E-4) treeBoundBox(points()).extend(rndGen, 1e-4)
); );
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -93,7 +93,7 @@ timeVaryingMappedFixedValueFvPatchField
fixedValueFvPatchField<Type>(p, iF), fixedValueFvPatchField<Type>(p, iF),
fieldTableName_(iF.name()), fieldTableName_(iF.name()),
setAverage_(readBool(dict.lookup("setAverage"))), setAverage_(readBool(dict.lookup("setAverage"))),
perturb_(dict.lookupOrDefault("perturb", 1E-5)), perturb_(dict.lookupOrDefault("perturb", 1e-5)),
mapperPtr_(NULL), mapperPtr_(NULL),
sampleTimes_(0), sampleTimes_(0),
startSampleTime_(-1), startSampleTime_(-1),

View File

@ -45,7 +45,7 @@ Description
// Maintain average to that of the supplied values // Maintain average to that of the supplied values
setAverage false; setAverage false;
// Optional: change perturbation (default 1E-5) to avoid any ties // Optional: change perturbation (default 1e-5) to avoid any ties
// in triangulating regular geometries. // in triangulating regular geometries.
//perturb 0.0; //perturb 0.0;

View File

@ -92,7 +92,7 @@ timeVaryingMappedFixedValuePointPatchField
fixedValuePointPatchField<Type>(p, iF), fixedValuePointPatchField<Type>(p, iF),
fieldTableName_(iF.name()), fieldTableName_(iF.name()),
setAverage_(readBool(dict.lookup("setAverage"))), setAverage_(readBool(dict.lookup("setAverage"))),
perturb_(dict.lookupOrDefault("perturb", 1E-5)), perturb_(dict.lookupOrDefault("perturb", 1e-5)),
mapperPtr_(NULL), mapperPtr_(NULL),
sampleTimes_(0), sampleTimes_(0),
startSampleTime_(-1), startSampleTime_(-1),

View File

@ -1881,7 +1881,7 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
List<treeBoundBox> meshBb(1); List<treeBoundBox> meshBb(1);
treeBoundBox& bb = meshBb[0]; treeBoundBox& bb = meshBb[0];
bb = treeBoundBox(mesh_.points()); bb = treeBoundBox(mesh_.points());
bb = bb.extend(rndGen, 1E-4); bb = bb.extend(rndGen, 1e-4);
// Distribute all geometry (so refinementSurfaces and shellSurfaces) // Distribute all geometry (so refinementSurfaces and shellSurfaces)
searchableSurfaces& geometry = searchableSurfaces& geometry =

View File

@ -1073,7 +1073,7 @@ void Foam::meshRefinement::findCellZoneGeometric
label nei = faceNeighbour[faceI]; label nei = faceNeighbour[faceI];
const point& neiCc = cellCentres[nei]; const point& neiCc = cellCentres[nei];
// Perturbed cc // Perturbed cc
const vector d = 1E-4*(neiCc - ownCc); const vector d = 1e-4*(neiCc - ownCc);
candidatePoints[nCandidates++] = ownCc-d; candidatePoints[nCandidates++] = ownCc-d;
candidatePoints[nCandidates++] = neiCc+d; candidatePoints[nCandidates++] = neiCc+d;
} }
@ -1081,7 +1081,7 @@ void Foam::meshRefinement::findCellZoneGeometric
{ {
const point& neiFc = mesh_.faceCentres()[faceI]; const point& neiFc = mesh_.faceCentres()[faceI];
// Perturbed cc // Perturbed cc
const vector d = 1E-4*(neiFc - ownCc); const vector d = 1e-4*(neiFc - ownCc);
candidatePoints[nCandidates++] = ownCc-d; candidatePoints[nCandidates++] = ownCc-d;
} }
} }

View File

@ -93,7 +93,7 @@ Foam::refinementFeatures::refinementFeatures
// Slightly extended bb. Slightly off-centred just so on symmetric // Slightly extended bb. Slightly off-centred just so on symmetric
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
bb = bb.extend(rndGen, 1E-4); bb = bb.extend(rndGen, 1e-4);
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -146,7 +146,7 @@ Foam::boolList Foam::cellClassification::markFaces
treeBoundBox allBb(mesh_.points()); treeBoundBox allBb(mesh_.points());
// Extend domain slightly (also makes it 3D if was 2D) // Extend domain slightly (also makes it 3D if was 2D)
scalar tol = 1E-6 * allBb.avgDim(); scalar tol = 1e-6 * allBb.avgDim();
point& bbMin = allBb.min(); point& bbMin = allBb.min();
bbMin.x() -= tol; bbMin.x() -= tol;
@ -187,7 +187,7 @@ Foam::boolList Foam::cellClassification::markFaces
vector edgeNormal(end - start); vector edgeNormal(end - start);
const scalar edgeMag = mag(edgeNormal); const scalar edgeMag = mag(edgeNormal);
const vector smallVec = 1E-9*edgeNormal; const vector smallVec = 1e-9*edgeNormal;
edgeNormal /= edgeMag+VSMALL; edgeNormal /= edgeMag+VSMALL;

View File

@ -31,7 +31,7 @@ License
defineTypeNameAndDebug(Foam::treeDataFace, 0); defineTypeNameAndDebug(Foam::treeDataFace, 0);
Foam::scalar Foam::treeDataFace::tolSqr = sqr(1E-6); Foam::scalar Foam::treeDataFace::tolSqr = sqr(1e-6);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

View File

@ -38,7 +38,7 @@ template
> >
Foam::scalar Foam::scalar
Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>:: Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
tolSqr = sqr(1E-6); tolSqr = sqr(1e-6);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

View File

@ -265,7 +265,7 @@ void Foam::mappedPatchBase::findSamples
treeBoundBox(pp.points(), pp.meshPoints()).extend treeBoundBox(pp.points(), pp.meshPoints()).extend
( (
rndGen, rndGen,
1E-4 1e-4
) )
); );
patchBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); patchBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -35,7 +35,7 @@ License
defineTypeNameAndDebug(Foam::meshSearch, 0); defineTypeNameAndDebug(Foam::meshSearch, 0);
Foam::scalar Foam::meshSearch::tol_ = 1E-3; Foam::scalar Foam::meshSearch::tol_ = 1e-3;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -567,7 +567,7 @@ const Foam::indexedOctree<Foam::treeDataFace>& Foam::meshSearch::boundaryTree()
treeBoundBox& overallBb = overallBbPtr_(); treeBoundBox& overallBb = overallBbPtr_();
// Extend slightly and make 3D // Extend slightly and make 3D
overallBb = overallBb.extend(rndGen, 1E-4); overallBb = overallBb.extend(rndGen, 1e-4);
overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
} }
@ -620,7 +620,7 @@ const
treeBoundBox& overallBb = overallBbPtr_(); treeBoundBox& overallBb = overallBbPtr_();
// Extend slightly and make 3D // Extend slightly and make 3D
overallBb = overallBb.extend(rndGen, 1E-4); overallBb = overallBb.extend(rndGen, 1e-4);
overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
} }

View File

@ -185,8 +185,8 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
if (info.hit()) if (info.hit())
{ {
treeBoundBox bb(origin_, origin_+span_); treeBoundBox bb(origin_, origin_+span_);
bb.min()[normalDir_] -= 1E-6; bb.min()[normalDir_] -= 1e-6;
bb.max()[normalDir_] += 1E-6; bb.max()[normalDir_] += 1e-6;
if (!bb.contains(info.hitPoint())) if (!bb.contains(info.hitPoint()))
{ {

View File

@ -242,7 +242,7 @@ void Foam::searchableSurfaceWithGaps::findLine
// test in pairs: only if both perturbations hit something // test in pairs: only if both perturbations hit something
// do we accept the hit. // do we accept the hit.
const vectorField smallVec(1E-6*(compactEnd-compactStart)); const vectorField smallVec(1e-6*(compactEnd-compactStart));
List<pointIndexHit> plusInfo; List<pointIndexHit> plusInfo;
surface().findLine surface().findLine
@ -296,7 +296,7 @@ void Foam::searchableSurfaceWithGaps::findLine
offset0.setSize(plusMissMap.size()); offset0.setSize(plusMissMap.size());
offset1.setSize(plusMissMap.size()); offset1.setSize(plusMissMap.size());
const vectorField smallVec(1E-6*(compactEnd-compactStart)); const vectorField smallVec(1e-6*(compactEnd-compactStart));
surface().findLine surface().findLine
( (

View File

@ -542,7 +542,7 @@ Foam::triSurfaceMesh::tree() const
// Slightly extended bb. Slightly off-centred just so on symmetric // Slightly extended bb. Slightly off-centred just so on symmetric
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
bb = bb.extend(rndGen, 1E-4); bb = bb.extend(rndGen, 1e-4);
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@ -594,7 +594,7 @@ Foam::triSurfaceMesh::edgeTree() const
// Slightly extended bb. Slightly off-centred just so on symmetric // Slightly extended bb. Slightly off-centred just so on symmetric
// geometry there are less face/edge aligned items. // geometry there are less face/edge aligned items.
bb = bb.extend(rndGen, 1E-4); bb = bb.extend(rndGen, 1e-4);
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -569,7 +569,7 @@ void Foam::surfaceIntersection::doCutEdges
List<DynamicList<label> >& surfEdgeCuts List<DynamicList<label> >& surfEdgeCuts
) )
{ {
scalar oldTol = intersection::setPlanarTol(1E-3); scalar oldTol = intersection::setPlanarTol(1e-3);
const pointField& surf1Pts = surf1.localPoints(); const pointField& surf1Pts = surf1.localPoints();

View File

@ -54,7 +54,7 @@ Foam::triSurfaceSearch::triSurfaceSearch(const triSurface& surface)
treeBoundBox(surface_.points(), surface_.meshPoints()).extend treeBoundBox(surface_.points(), surface_.meshPoints()).extend
( (
rndGen, rndGen,
1E-4 1e-4
) )
); );
treeBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); treeBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -870,7 +870,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
{ {
d[i] /= norm; d[i] /= norm;
if (mag(d[i]) < 1E-6) if (mag(d[i]) < 1e-6)
{ {
d[i] = 0.0; d[i] = 0.0;
} }

View File

@ -701,7 +701,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
label allSize = points.size(); label allSize = points.size();
reduce(allSize, sumOp<label>()); reduce(allSize, sumOp<label>());
const label sizeTol = max(1, label(1E-3*allSize/nProcessors_)); const label sizeTol = max(1, label(1e-3*allSize/nProcessors_));
// Sort recursive // Sort recursive
sortComponent sortComponent
@ -742,7 +742,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
label allSize = points.size(); label allSize = points.size();
reduce(allSize, sumOp<label>()); reduce(allSize, sumOp<label>());
const label sizeTol = max(1, label(1E-3*allSize/nProcessors_)); const label sizeTol = max(1, label(1e-3*allSize/nProcessors_));
// Sort recursive // Sort recursive
sortComponent sortComponent

View File

@ -62,7 +62,7 @@ namespace Foam
// //
// pointHit ph(ln.nearestDist(position())); // pointHit ph(ln.nearestDist(position()));
// //
// if (ph.distance() > 1E-6) // if (ph.distance() > 1e-6)
// { // {
// FatalErrorIn // FatalErrorIn
// ( // (

View File

@ -73,7 +73,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
treeBoundBox overallBb(pp.points()); treeBoundBox overallBb(pp.points());
Random rndGen(123456); Random rndGen(123456);
overallBb = overallBb.extend(rndGen, 1E-4); overallBb = overallBb.extend(rndGen, 1e-4);
overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -94,7 +94,7 @@ void Foam::patchCloudSet::calcSamples
// Not very random // Not very random
Random rndGen(123456); Random rndGen(123456);
// Make bb asymetric just to avoid problems on symmetric meshes // Make bb asymetric just to avoid problems on symmetric meshes
bb = bb.extend(rndGen, 1E-4); bb = bb.extend(rndGen, 1e-4);
// Make sure bb is 3D. // Make sure bb is 3D.
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -149,7 +149,7 @@ void Foam::patchSeedSet::calcSamples
const point& cc = mesh().cellCentres()[cellI]; const point& cc = mesh().cellCentres()[cellI];
samplingPts.append samplingPts.append
( (
info.hitPoint() + 1E-1*(cc-info.hitPoint()) info.hitPoint() + 1e-1*(cc-info.hitPoint())
); );
} }
else else

View File

@ -407,7 +407,7 @@ public:
const scalarField& pointIsoVals, const scalarField& pointIsoVals,
const scalar iso, const scalar iso,
const bool regularise, const bool regularise,
const scalar mergeTol = 1E-6 // fraction of bounding box const scalar mergeTol = 1e-6 // fraction of bounding box
); );

View File

@ -336,7 +336,7 @@ public:
const scalarField& pointValues, const scalarField& pointValues,
const scalar iso, const scalar iso,
const bool regularise, const bool regularise,
const scalar mergeTol = 1E-6 // fraction of bounding box const scalar mergeTol = 1e-6 // fraction of bounding box
); );

View File

@ -401,7 +401,7 @@ Foam::sampledIsoSurface::sampledIsoSurface
sampledSurface(name, mesh, dict), sampledSurface(name, mesh, dict),
isoField_(dict.lookup("isoField")), isoField_(dict.lookup("isoField")),
isoVal_(readScalar(dict.lookup("isoValue"))), isoVal_(readScalar(dict.lookup("isoValue"))),
mergeTol_(dict.lookupOrDefault("mergeTol", 1E-6)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)), average_(dict.lookupOrDefault("average", false)),
zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()), zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),

View File

@ -262,7 +262,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
: :
sampledSurface(name, mesh, dict), sampledSurface(name, mesh, dict),
plane_(dict), plane_(dict),
mergeTol_(dict.lookupOrDefault("mergeTol", 1E-6)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)), average_(dict.lookupOrDefault("average", false)),
zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()), zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),

View File

@ -109,7 +109,7 @@ Foam::sampledTriSurfaceMesh::nonCoupledboundaryTree() const
treeBoundBox overallBb(mesh().points()); treeBoundBox overallBb(mesh().points());
Random rndGen(123456); Random rndGen(123456);
overallBb = overallBb.extend(rndGen, 1E-4); overallBb = overallBb.extend(rndGen, 1e-4);
overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);

View File

@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::scalar Foam::faceTriangulation::edgeRelTol = 1E-6; const Foam::scalar Foam::faceTriangulation::edgeRelTol = 1e-6;
// Edge to the right of face vertex i // Edge to the right of face vertex i