songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: partial revert of naming change from commit f99a145143

Browse Source
This commit is contained in:
andy 2010-04-01 12:50:00 +01:00
parent 5a6f5a83ca
commit 9b71c70335
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sampling/sampledSet/polyLine/polyLineSet.C
View File

@ -53,7 +53,7 @@ bool Foam::polyLineSet::trackToBoundary
DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells,
DynamicList<label>& samplingFaces,
DynamicList<scalar>& samplingPolyLineDist
DynamicList<scalar>& samplingCurveDist
) const
{
// Alias
@ -97,7 +97,7 @@ bool Foam::polyLineSet::trackToBoundary
samplingFaces.append(facei);
// trackPt is at sampleI+1
samplingPolyLineDist.append(1.0*(sampleI+1));
samplingCurveDist.append(1.0*(sampleI+1));
}
return true;
}
@ -111,7 +111,7 @@ bool Foam::polyLineSet::trackToBoundary
scalar dist =
mag(trackPt - sampleCoords_[sampleI])
/ mag(sampleCoords_[sampleI+1] - sampleCoords_[sampleI]);
samplingPolyLineDist.append(sampleI + dist);
samplingCurveDist.append(sampleI + dist);
// go to next samplePt
sampleI++;
@ -133,7 +133,7 @@ void Foam::polyLineSet::calcSamples
DynamicList<label>& samplingCells,
DynamicList<label>& samplingFaces,
DynamicList<label>& samplingSegments,
DynamicList<scalar>& samplingPolyLineDist
DynamicList<scalar>& samplingCurveDist
) const
{
// Check sampling points
@ -227,12 +227,12 @@ void Foam::polyLineSet::calcSamples
samplingCells.append(trackCellI);
samplingFaces.append(trackFaceI);
// Convert sampling position to unique poly line parameter. Get
// Convert sampling position to unique curve parameter. Get
// fraction of distance between sampleI and sampleI+1.
scalar dist =
mag(trackPt - sampleCoords_[sampleI])
/ mag(sampleCoords_[sampleI+1] - sampleCoords_[sampleI]);
samplingPolyLineDist.append(sampleI + dist);
samplingCurveDist.append(sampleI + dist);
lastSample = trackPt;
}
@ -273,7 +273,7 @@ void Foam::polyLineSet::calcSamples
samplingPts,
samplingCells,
samplingFaces,
samplingPolyLineDist
samplingCurveDist
);
// fill sampleSegments
@ -317,7 +317,7 @@ void Foam::polyLineSet::genSamples()
DynamicList<label> samplingCells;
DynamicList<label> samplingFaces;
DynamicList<label> samplingSegments;
DynamicList<scalar> samplingPolyLineDist;
DynamicList<scalar> samplingCurveDist;
calcSamples
(
@ -325,14 +325,14 @@ void Foam::polyLineSet::genSamples()
samplingCells,
samplingFaces,
samplingSegments,
samplingPolyLineDist
samplingCurveDist
);
samplingPts.shrink();
samplingCells.shrink();
samplingFaces.shrink();
samplingSegments.shrink();
samplingPolyLineDist.shrink();
samplingCurveDist.shrink();
setSamples
(
@ -340,7 +340,7 @@ void Foam::polyLineSet::genSamples()
samplingCells,
samplingFaces,
samplingSegments,
samplingPolyLineDist
samplingCurveDist
);
}

4
src/sampling/sampledSet/polyLine/polyLineSet.H
View File

@ -73,7 +73,7 @@ class polyLineSet
DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells,
DynamicList<label>& samplingFaces,
DynamicList<scalar>& samplingPolyLineDist
DynamicList<scalar>& samplingCurveDist
) const;
//- Samples all point in sampleCoords_
@ -84,7 +84,7 @@ class polyLineSet
DynamicList<label>& samplingCells,
DynamicList<label>& samplingFaces,
DynamicList<label>& samplingSegments,
DynamicList<scalar>& samplingPolyLineDist
DynamicList<scalar>& samplingCurveDist
) const;
//- Uses calcSamples to obtain samples. Copies them into *this.