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

ENH: Code updates following changed to IOobjectList

Browse Source
This commit is contained in:
andy
2013-04-08 15:33:02 +01:00
parent 347c5dabe9
commit 34ac08a931
8 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -539,7 +539,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i] cloud::prefix/cloudDirs[i]
); );
IOobject* positionsPtr = sprayObjs.lookup("positions"); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {

6
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -529,10 +529,8 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i] cloud::prefix/cloudDirs[i]
); );
IOobject* positionsPtr = sprayObjs.lookup IOobject* positionsPtr =
( sprayObjs.lookup(word("positions"));
"positions"
);
if (positionsPtr) if (positionsPtr)
{ {

16
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View File

@ -98,7 +98,7 @@ bool inFileNameList
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
timeSelector::addOptions(); timeSelector::addOptions();
# include "addRegionOption.H" #include "addRegionOption.H"
argList::addBoolOption argList::addBoolOption
( (
@ -129,17 +129,17 @@ int main(int argc, char *argv[])
"specify faceZones to write - eg '( slice \"mfp-.*\" )'." "specify faceZones to write - eg '( slice \"mfp-.*\" )'."
); );
# include "setRootCase.H" #include "setRootCase.H"
// Check options // Check options
const bool binary = !args.optionFound("ascii"); const bool binary = !args.optionFound("ascii");
const bool nodeValues = args.optionFound("nodeValues"); const bool nodeValues = args.optionFound("nodeValues");
# include "createTime.H" #include "createTime.H"
instantList Times = timeSelector::select0(runTime, args); instantList Times = timeSelector::select0(runTime, args);
# include "createNamedMesh.H" #include "createNamedMesh.H"
// Mesh instance (region0 gets filtered out) // Mesh instance (region0 gets filtered out)
fileName regionPrefix = ""; fileName regionPrefix = "";
@ -228,7 +228,7 @@ int main(int argc, char *argv[])
IOobjectList objects(mesh, runTime.timeName()); IOobjectList objects(mesh, runTime.timeName());
# include "checkMeshMoving.H" #include "checkMeshMoving.H"
if (meshMoving) if (meshMoving)
{ {
@ -275,7 +275,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[cloudI] cloud::prefix/cloudDirs[cloudI]
); );
IOobject* positionsPtr = cloudObjs.lookup("positions"); IOobject* positionsPtr = cloudObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {
@ -388,7 +388,7 @@ int main(int argc, char *argv[])
{ {
const word& fieldName = fieldNames[j]; const word& fieldName = fieldNames[j];
# include "checkData.H" #include "checkData.H"
if (!variableGood) if (!variableGood)
{ {
@ -551,7 +551,7 @@ int main(int argc, char *argv[])
} }
} }
# include "ensightCaseTail.H" #include "ensightCaseTail.H"
if (Pstream::master()) if (Pstream::master())
{ {

19
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
View File

@ -131,8 +131,8 @@ int main(int argc, char *argv[])
const char* geometryName = "geometry"; const char* geometryName = "geometry";
# include "setRootCase.H" #include "setRootCase.H"
# include "createTime.H" #include "createTime.H"
// get times list // get times list
instantList timeDirs = timeSelector::select0(runTime, args); instantList timeDirs = timeSelector::select0(runTime, args);
@ -181,7 +181,7 @@ int main(int argc, char *argv[])
mkDir(ensightDir); mkDir(ensightDir);
mkDir(dataDir); mkDir(dataDir);
# include "createNamedMesh.H" #include "createNamedMesh.H"
// Mesh instance (region0 gets filtered out) // Mesh instance (region0 gets filtered out)
fileName regionPrefix; fileName regionPrefix;
@ -203,8 +203,8 @@ int main(int argc, char *argv[])
partsList.writeSummary(partsInfoFile); partsList.writeSummary(partsInfoFile);
} }
# include "checkHasMovingMesh.H" #include "checkHasMovingMesh.H"
# include "findFields.H" #include "findFields.H"
if (hasMovingMesh && optNoMesh) if (hasMovingMesh && optNoMesh)
{ {
@ -233,7 +233,7 @@ int main(int argc, char *argv[])
{ {
runTime.setTime(timeDirs[timeI], timeI); runTime.setTime(timeDirs[timeI], timeI);
# include "getTimeIndex.H" #include "getTimeIndex.H"
// remember the time index // remember the time index
fieldTimesUsed.append(timeIndex); fieldTimesUsed.append(timeIndex);
@ -250,7 +250,7 @@ int main(int argc, char *argv[])
<< subDir.c_str() << " " << runTime.timeName() << nl; << subDir.c_str() << " " << runTime.timeName() << nl;
} }
# include "moveMesh.H" #include "moveMesh.H"
if (timeI == 0 || mesh.moving()) 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 // check that the positions field is present for this time
if (cloudObjs.lookup("positions")) IOobject* positionPtr = cloudObjs.lookup(word("positions"));
if (positionPtr != NULL)
{ {
ensightParticlePositions ensightParticlePositions
( (
@ -459,7 +460,7 @@ int main(int argc, char *argv[])
} }
} }
# include "ensightOutputCase.H" #include "ensightOutputCase.H"
Info<< "\nEnd\n"<< endl; Info<< "\nEnd\n"<< endl;

6
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -386,7 +386,7 @@ int main(int argc, char *argv[])
instantList timeDirs = timeSelector::select0(runTime, args); instantList timeDirs = timeSelector::select0(runTime, args);
# include "createNamedMesh.H" #include "createNamedMesh.H"
// VTK/ directory in the case // VTK/ directory in the case
fileName fvPath(runTime.path()/"VTK"); fileName fvPath(runTime.path()/"VTK");
@ -448,7 +448,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudDirs[i] cloud::prefix/cloudDirs[i]
); );
IOobject* positionsPtr = sprayObjs.lookup("positions"); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {
@ -1094,7 +1094,7 @@ int main(int argc, char *argv[])
cloud::prefix/cloudName cloud::prefix/cloudName
); );
IOobject* positionsPtr = sprayObjs.lookup("positions"); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {

2
applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398FoamMeshLagrangian.C
View File

@ -63,7 +63,7 @@ vtkPolyData* Foam::vtkPV398Foam::lagrangianVTKMesh
cloud::prefix/cloudName cloud::prefix/cloudName
); );
IOobject* positionsPtr = sprayObjs.lookup("positions"); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {
Cloud<passiveParticle> parcels(mesh, cloudName, false); Cloud<passiveParticle> parcels(mesh, cloudName, false);

4
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -63,7 +63,7 @@ vtkPolyData* Foam::vtkPV3Foam::lagrangianVTKMesh
cloud::prefix/cloudName cloud::prefix/cloudName
); );
IOobject* positionsPtr = sprayObjs.lookup("positions"); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {
Cloud<passiveParticle> parcels(mesh, cloudName, false); Cloud<passiveParticle> parcels(mesh, cloudName, false);

4
applications/utilities/preProcessing/mapFields/mapLagrangian.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -120,7 +120,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
cloud::prefix/cloudDirs[cloudI] cloud::prefix/cloudDirs[cloudI]
); );
IOobject* positionsPtr = objects.lookup("positions"); IOobject* positionsPtr = objects.lookup(word("positions"));
if (positionsPtr) if (positionsPtr)
{ {