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

GIT: merge conflict resolution

Browse Source
This commit is contained in:
andy
2013-01-21 16:48:22 +00:00
parent c71cfa3d3b b8bace6cd8
commit 03ee3a5046
57 changed files with 2608 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sampling/sampledSet/array/arraySet.C
View File

@ -83,7 +83,7 @@ void Foam::arraySet::calcSamples
forAll(sampleCoords, i)
{
sampleCoords[i] = transform(coordSys_.R(), sampleCoords[i]);
sampleCoords[i] = transform(coordSys_.R().R(), sampleCoords[i]);
}
forAll(sampleCoords, sampleI)

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

@ -77,7 +77,7 @@ Foam::sampledPlane::sampledPlane
// allow lookup from global coordinate systems
if (dict.found("coordinateSystem"))
{
coordinateSystem cs(dict, mesh);
coordinateSystem cs(mesh, dict);
point base = cs.globalPosition(planeDesc().refPoint());
vector norm = cs.globalVector(planeDesc().normal());