zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: avoid ambiguous construct from tmp - mesh, meshTools

Browse Source
This commit is contained in:
Mark Olesen
2010-12-17 17:10:18 +01:00
parent ffa2836a75
commit fa6b1157f2
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

@ -3052,7 +3052,7 @@ void Foam::autoLayerDriver::addLayers
}
}
scalarField invExpansionRatio = 1.0 / expansionRatio;
const scalarField invExpansionRatio(1.0 / expansionRatio);
// Add topo regardless of whether extrudeStatus is extruderemove.
// Not add layer if patchDisp is zero.

3
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
View File

@ -652,7 +652,8 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
-GREAT // null value
);
return snapParams.snapTol()*maxEdgeLen;
tmp<scalarField> tfld = snapParams.snapTol()*maxEdgeLen;
return tfld();
}

13
src/meshTools/coordinateSystems/cylindricalCS.C
View File

@ -148,7 +148,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
bool translate
) const
{
scalarField theta =
scalarField theta
(
local.component(vector::Y)
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
@ -170,7 +170,10 @@ Foam::vector Foam::cylindricalCS::globalToLocal
bool translate
) const
{
const vector lc = coordinateSystem::globalToLocal(global, translate);
const vector lc
(
coordinateSystem::globalToLocal(global, translate)
);
return vector
(
@ -191,8 +194,10 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
bool translate
) const
{
const vectorField lc =
coordinateSystem::globalToLocal(global, translate);
const vectorField lc
(
coordinateSystem::globalToLocal(global, translate)
);
tmp<vectorField> tresult(new vectorField(lc.size()));
vectorField& result = tresult();

6
src/meshTools/coordinateSystems/sphericalCS.C
View File

@ -155,7 +155,7 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::localToGlobal
bool translate
) const
{
const scalarField r = local.component(vector::X);
const scalarField r(local.component(vector::X));
const scalarField theta
(
local.component(vector::Y)
@ -206,8 +206,8 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::globalToLocal
bool translate
) const
{
const vectorField lc = coordinateSystem::globalToLocal(global, translate);
const scalarField r = mag(lc);
const vectorField lc(coordinateSystem::globalToLocal(global, translate));
const scalarField r(mag(lc));
tmp<vectorField> tresult(new vectorField(lc.size()));
vectorField& result = tresult();

22
src/meshTools/coordinateSystems/toroidalCS.C
View File

@ -97,15 +97,25 @@ Foam::tmp<Foam::vectorField> Foam::toroidalCS::localToGlobal
bool translate
) const
{
const scalarField r = local.component(vector::X);
const scalarField r
(
local.component(vector::X)
);
const scalarField theta =
local.component(vector::Y)*constant::mathematical::pi/180.0;
const scalarField theta
(
local.component(vector::Y)*constant::mathematical::pi/180.0
);
const scalarField phi =
local.component(vector::Z)*constant::mathematical::pi/180.0;
const scalarField phi
(
local.component(vector::Z)*constant::mathematical::pi/180.0
);
const scalarField rprime = radius_ + r*sin(phi);
const scalarField rprime
(
radius_ + r*sin(phi)
);
vectorField lc(local.size());
lc.replace(vector::X, rprime*cos(theta));

8
src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
View File

@ -54,10 +54,6 @@ namespace Foam
"nearestFace"
};
const NamedEnum<directMappedPatchBase::sampleMode, 3>
directMappedPatchBase::sampleModeNames_;
template<>
const char* Foam::NamedEnum
<
@ -70,10 +66,6 @@ namespace Foam
"normal"
};
const NamedEnum<directMappedPatchBase::offsetMode, 3>
directMappedPatchBase::offsetModeNames_;
//- Private class for finding nearest
// - point+local index
// - sqr(distance)