Commit 34ac08a9 authored by andy's avatar andy
Browse files

ENH: Code updates following changed to IOobjectList

parent 347c5dab
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -539,7 +539,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
......
......@@ -529,10 +529,8 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup
(
"positions"
);
IOobject* positionsPtr =
sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
......
......@@ -98,7 +98,7 @@ bool inFileNameList
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "addRegionOption.H"
#include "addRegionOption.H"
argList::addBoolOption
(
......@@ -129,17 +129,17 @@ int main(int argc, char *argv[])
"specify faceZones to write - eg '( slice \"mfp-.*\" )'."
);
# include "setRootCase.H"
#include "setRootCase.H"
// Check options
const bool binary = !args.optionFound("ascii");
const bool nodeValues = args.optionFound("nodeValues");
# include "createTime.H"
#include "createTime.H"
instantList Times = timeSelector::select0(runTime, args);
# include "createNamedMesh.H"
#include "createNamedMesh.H"
// Mesh instance (region0 gets filtered out)
fileName regionPrefix = "";
......@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
IOobjectList objects(mesh, runTime.timeName());
# include "checkMeshMoving.H"
#include "checkMeshMoving.H"
if (meshMoving)
{
......@@ -275,7 +275,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[cloudI]
);
IOobject* positionsPtr = cloudObjs.lookup("positions");
IOobject* positionsPtr = cloudObjs.lookup(word("positions"));
if (positionsPtr)
{
......@@ -388,7 +388,7 @@ int main(int argc, char *argv[])
{
const word& fieldName = fieldNames[j];
# include "checkData.H"
#include "checkData.H"
if (!variableGood)
{
......@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
}
}
# include "ensightCaseTail.H"
#include "ensightCaseTail.H"
if (Pstream::master())
{
......
......@@ -131,8 +131,8 @@ int main(int argc, char *argv[])
const char* geometryName = "geometry";
# include "setRootCase.H"
# include "createTime.H"
#include "setRootCase.H"
#include "createTime.H"
// get times list
instantList timeDirs = timeSelector::select0(runTime, args);
......@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
mkDir(ensightDir);
mkDir(dataDir);
# include "createNamedMesh.H"
#include "createNamedMesh.H"
// Mesh instance (region0 gets filtered out)
fileName regionPrefix;
......@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
partsList.writeSummary(partsInfoFile);
}
# include "checkHasMovingMesh.H"
# include "findFields.H"
#include "checkHasMovingMesh.H"
#include "findFields.H"
if (hasMovingMesh && optNoMesh)
{
......@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
{
runTime.setTime(timeDirs[timeI], timeI);
# include "getTimeIndex.H"
#include "getTimeIndex.H"
// remember the time index
fieldTimesUsed.append(timeIndex);
......@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
<< subDir.c_str() << " " << runTime.timeName() << nl;
}
# include "moveMesh.H"
#include "moveMesh.H"
if (timeI == 0 || mesh.moving())
{
......@@ -380,7 +380,8 @@ int main(int argc, char *argv[])
);
// check that the positions field is present for this time
if (cloudObjs.lookup("positions"))
IOobject* positionPtr = cloudObjs.lookup(word("positions"));
if (positionPtr != NULL)
{
ensightParticlePositions
(
......@@ -459,7 +460,7 @@ int main(int argc, char *argv[])
}
}
# include "ensightOutputCase.H"
#include "ensightOutputCase.H"
Info<< "\nEnd\n"<< endl;
......
......@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createNamedMesh.H"
#include "createNamedMesh.H"
// VTK/ directory in the case
fileName fvPath(runTime.path()/"VTK");
......@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
......@@ -1094,7 +1094,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudName
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
......
......@@ -63,7 +63,7 @@ vtkPolyData* Foam::vtkPV398Foam::lagrangianVTKMesh
cloud::prefix/cloudName
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
Cloud<passiveParticle> parcels(mesh, cloudName, false);
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -63,7 +63,7 @@ vtkPolyData* Foam::vtkPV3Foam::lagrangianVTKMesh
cloud::prefix/cloudName
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr)
{
Cloud<passiveParticle> parcels(mesh, cloudName, false);
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -120,7 +120,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
cloud::prefix/cloudDirs[cloudI]
);
IOobject* positionsPtr = objects.lookup("positions");
IOobject* positionsPtr = objects.lookup(word("positions"));
if (positionsPtr)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment