BUG: tutorials: fix tutorials for 1812. See #1059.

This commit is contained in:
mattijs
2018-10-31 12:08:55 +00:00
parent 5f91007d4a
commit 192e2eeb9d
7 changed files with 36 additions and 432 deletions

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -193,16 +193,31 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
{
instance_[surfI] = dEntry.keyword();
const dictionary& subDict = dEntry.dict();
const dictionary& sDict = dEntry.dict();
subDict.readEntry("scale", scale_[surfI]);
transform_.set
(
surfI,
new coordSystem::cartesian(subDict, "transform")
);
sDict.readEntry("scale", scale_[surfI]);
const word subGeomName(subDict.get<word>("surface"));
const dictionary& coordDict = sDict.subDict("transform");
if (coordDict.found("coordinateSystem"))
{
// Backwards compatibility: use coordinateSystem subdictionary
transform_.set
(
surfI,
new coordSystem::cartesian(coordDict, "coordinateSystem")
);
}
else
{
// New form: directly set from dictionary
transform_.set
(
surfI,
new coordSystem::cartesian(sDict, "transform")
);
}
const word subGeomName(sDict.get<word>("surface"));
//Pout<< "Trying to find " << subGeomName << endl;
searchableSurface& s =