Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

This commit is contained in:
mattijs
2017-03-13 12:02:22 +00:00
76 changed files with 1179 additions and 802 deletions

View File

@ -288,7 +288,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
vtkSurfaceWriter().write
(
surface_.searchableSurface::time().constant()/"triSurface",
surfaceName_.lessExt().name(),
surfaceName_.nameLessExt(),
meshedSurfRef
(
surface_.points(),

View File

@ -193,12 +193,9 @@ void writeRays
}
str.flush();
DynamicList<string> cmd(3);
cmd.append("objToVTK");
cmd.append(fName);
cmd.append(fName.lessExt() + ".vtk");
Pout<< "cmd: objToVTK " << fName.c_str() << endl;
stringList cmd{"objToVTK", fName, fName.lessExt().ext("vtk")};
Foam::system(cmd);
}

View File

@ -1657,9 +1657,9 @@ int main(int argc, char *argv[])
const fileName sFeatFileName
(
fileName(surf1Name).lessExt().name()
fileName(surf1Name).nameLessExt()
+ "_"
+ fileName(surf2Name).lessExt().name()
+ fileName(surf2Name).nameLessExt()
+ "_"
+ action
);