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

Merge commit 'origin/master' into splitCyclic

Browse Source 
Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
	applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
	src/dynamicMesh/motionSmoother/motionSmoother.C
	src/dynamicMesh/motionSmoother/motionSmoother.H
	src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
This commit is contained in:
mattijs
2010-05-18 13:28:21 +01:00
parent bba50b2152 2e418fec9e
commit f84a91d7ce
480 changed files with 13145 additions and 5249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sampling/cuttingPlane/cuttingPlane.C
View File

@ -35,7 +35,7 @@ License
//! @cond localScope
const Foam::scalar zeroish = Foam::SMALL;
const Foam::scalar positive = Foam::SMALL * 1E3;
//! @endcond localScope
//! @endcond
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

2
src/sampling/sampledSet/face/faceOnlySet.C
View File

@ -229,7 +229,7 @@ void Foam::faceOnlySet::calcSamples
);
// fill sampleSegments
for(label i = samplingPts.size() - 1; i >= startSegmentI; --i)
for (label i = samplingPts.size() - 1; i >= startSegmentI; --i)
{
samplingSegments.append(segmentI);
}

4
src/sampling/sampledSet/uniform/uniformSet.C
View File

@ -64,7 +64,7 @@ bool Foam::uniformSet::nextSample
samplePt += offset;
sampleI++;
for(; sampleI < nPoints_; sampleI++)
for (; sampleI < nPoints_; sampleI++)
{
scalar s = (samplePt - currentPt) & normOffset;
@ -328,7 +328,7 @@ void Foam::uniformSet::calcSamples
);
// fill sampleSegments
for(label i = samplingPts.size() - 1; i >= startSegmentI; --i)
for (label i = samplingPts.size() - 1; i >= startSegmentI; --i)
{
samplingSegments.append(segmentI);
}

2
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -304,7 +304,7 @@ bool Foam::sampledIsoSurface::updateGeometry() const
const polyBoundaryMesh& patches = mesh().boundaryMesh();
// Patch to put exposed internal faces into
label exposedPatchI = patches.findPatchID(exposedPatchName_);
const label exposedPatchI = patches.findPatchID(exposedPatchName_);
if (debug)
{

2
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -67,7 +67,7 @@ void Foam::sampledCuttingPlane::createGeometry()
const polyBoundaryMesh& patches = mesh().boundaryMesh();
// Patch to put exposed internal faces into
label exposedPatchI = patches.findPatchID(exposedPatchName_);
const label exposedPatchI = patches.findPatchID(exposedPatchName_);
if (debug)
{

2
src/sampling/sampledSurface/sampledPatch/sampledPatch.C
View File

@ -111,7 +111,7 @@ bool Foam::sampledPatch::update()
return false;
}
label patchI = mesh().boundaryMesh().findPatchID(patchName_);
const label patchI = mesh().boundaryMesh().findPatchID(patchName_);
if (patchI != -1)
{

18
src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
View File

@ -206,9 +206,8 @@ void Foam::rawSurfaceWriter<Type>::writeData
const symmTensor& v = values[elemI];
os << v[0] << ' ' << v[1] << ' ' << v[2]
<< v[3] << ' ' << v[4] << ' ' << v[5]
<< nl;
os << v[0] << ' ' << v[1] << ' ' << v[2] << ' '
<< v[3] << ' ' << v[4] << ' ' << v[5] << nl;
}
}
else
@ -219,9 +218,8 @@ void Foam::rawSurfaceWriter<Type>::writeData
const symmTensor& v = values[elemI];
os << v[0] << ' ' << v[1] << ' ' << v[2]
<< v[3] << ' ' << v[4] << ' ' << v[5]
<< nl;
os << v[0] << ' ' << v[1] << ' ' << v[2] << ' '
<< v[3] << ' ' << v[4] << ' ' << v[5] << nl;
}
}
}
@ -254,8 +252,8 @@ void Foam::rawSurfaceWriter<Type>::writeData
writeGeometry(points, elemI, os);
const tensor& v = values[elemI];
os << v[0] << ' ' << v[1] << ' ' << v[2]
<< v[3] << ' ' << v[4] << ' ' << v[5]
os << v[0] << ' ' << v[1] << ' ' << v[2] << ' '
<< v[3] << ' ' << v[4] << ' ' << v[5] << ' '
<< v[6] << ' ' << v[7] << ' ' << v[8] << nl;
}
}
@ -266,8 +264,8 @@ void Foam::rawSurfaceWriter<Type>::writeData
writeGeometry(points, faces, elemI, os);
const tensor& v = values[elemI];
os << v[0] << ' ' << v[1] << ' ' << v[2]
<< v[3] << ' ' << v[4] << ' ' << v[5]
os << v[0] << ' ' << v[1] << ' ' << v[2] << ' '
<< v[3] << ' ' << v[4] << ' ' << v[5] << ' '
<< v[6] << ' ' << v[7] << ' ' << v[8] << nl;
}
}