Commit fe455d1c authored by Mark Olesen's avatar Mark Olesen
Browse files

cloud, surfaceRegistry: rename subInstance -> prefix

parent 8d8a8ef8
......@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
fileNameList cloudDirs
(
readDir(runTime.timePath()/cloud::subInstance, fileName::DIRECTORY)
readDir(runTime.timePath()/cloud::prefix, fileName::DIRECTORY)
);
// Particles
......@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudDirs[i]
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
......@@ -418,7 +418,7 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudDirs[cloudI]
cloud::prefix/cloudDirs[cloudI]
);
lagrangianFieldDecomposer::readFields
......
......@@ -88,7 +88,7 @@ tmp<IOField<Type> > lagrangianFieldDecomposer::decomposeField
(
field.name(),
procMesh_.time().timeName(),
cloud::subInstance/cloudName,
cloud::prefix/cloudName,
procMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
......
......@@ -47,7 +47,7 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
(
fieldName,
mesh.time().timeName(),
cloud::subInstance/cloudName,
cloud::prefix/cloudName,
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
......@@ -64,7 +64,7 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
(
fieldName,
meshes[i].time().timeName(),
cloud::subInstance/cloudName,
cloud::prefix/cloudName,
meshes[i],
IOobject::MUST_READ,
IOobject::NO_WRITE
......
......@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
(
readDir
(
databases[procI].timePath()/regionPrefix/cloud::subInstance,
databases[procI].timePath()/regionPrefix/cloud::prefix,
fileName::DIRECTORY
)
);
......@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
(
procMeshes.meshes()[procI],
databases[procI].timeName(),
cloud::subInstance/cloudDirs[i]
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
......
......@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
fileNameList cloudDirs = readDir
(
runTime.timePath()/regionPrefix/cloud::subInstance,
runTime.timePath()/regionPrefix/cloud::prefix,
fileName::DIRECTORY
);
......@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudDirs[cloudI]
cloud::prefix/cloudDirs[cloudI]
);
IOobject* positionsPtr = cloudObjs.lookup("positions");
......@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudIter.key()
cloud::prefix/cloudIter.key()
);
forAllConstIter(IOobjectList, cloudObjs, fieldIter)
......@@ -426,7 +426,7 @@ int main(int argc, char *argv[])
fileNameList currentCloudDirs = readDir
(
runTime.timePath()/regionPrefix/cloud::subInstance,
runTime.timePath()/regionPrefix/cloud::prefix,
fileName::DIRECTORY
);
......@@ -449,7 +449,7 @@ int main(int argc, char *argv[])
(
fieldName,
mesh.time().timeName(),
cloud::subInstance/cloudName,
cloud::prefix/cloudName,
mesh,
IOobject::MUST_READ
);
......
......@@ -42,7 +42,7 @@ forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
caseFile
<< setw(16) << "measured: 2"
<< fileName(dataMask/cloud::subInstance/cloudName/"positions").c_str()
<< fileName(dataMask/cloud::prefix/cloudName/"positions").c_str()
<< nl;
}
caseFile
......@@ -122,7 +122,7 @@ forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
ensightType,
fieldName,
dataMask,
cloud::subInstance/cloudName,
cloud::prefix/cloudName,
cloudNo,
2
);
......
......@@ -100,7 +100,7 @@ void ensightParticlePositions
{
Cloud<passiveParticle> parcels(mesh, cloudName, false);
fileName cloudDir = subDir/cloud::subInstance/cloudName;
fileName cloudDir = subDir/cloud::prefix/cloudName;
fileName postFileName = cloudDir/"positions";
// the ITER/lagrangian subdirectory must exist
......@@ -164,7 +164,7 @@ void ensightLagrangianField
{
Info<< " " << fieldObject.name() << flush;
fileName cloudDir = subDir/cloud::subInstance/cloudName;
fileName cloudDir = subDir/cloud::prefix/cloudName;
fileName postFileName = cloudDir/fieldObject.name();
string title =
......
......@@ -36,7 +36,7 @@ if (timeDirs.size() > 1)
runTime.path()
/ timeDirs[timeDirs.size() - 1].name()
/ regionPrefix
/ cloud::subInstance,
/ cloud::prefix,
fileName::DIRECTORY
);
......@@ -55,7 +55,7 @@ if (timeDirs.size() > 1)
(
mesh,
timeDirs[timeDirs.size() - 1].name(),
cloud::subInstance/cloudName
cloud::prefix/cloudName
);
bool hasPositions = false;
......
......@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
!isDir
(
runTime.timePath()/regionPrefix/
cloud::subInstance/cloudName
cloud::prefix/cloudName
)
)
{
......@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudName
cloud::prefix/cloudName
);
// check that the positions field is present for this time
......@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
if (!fieldObject)
{
Info<< "missing "
<< runTime.timeName()/cloud::subInstance/cloudName
<< runTime.timeName()/cloud::prefix/cloudName
/ fieldName
<< endl;
continue;
......
......@@ -21,7 +21,7 @@ List<IOField<vector>* > sprayVectorFieldPtrs
(
sprayScalarNames[fieldI],
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
......@@ -53,7 +53,7 @@ List<IOField<vector>* > sprayVectorFieldPtrs
(
sprayVectorNames[fieldI],
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
......
......@@ -42,7 +42,7 @@ forAll(Times, timeI)
// Same for spray
IOobjectList sprayObjects(mesh, runTime.timeName(), cloud::subInstance);
IOobjectList sprayObjects(mesh, runTime.timeName(), cloud::prefix);
{
wordList fieldNames(sprayObjects.names(scalarIOField::typeName));
forAll(fieldNames, fieldI)
......
......@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
"volScalarField",
"volVectorField",
"surfaceScalarField",
cloud::subInstance
cloud::prefix
};
# include "setRootCase.H"
......
for(label i=0; i < nTypes; i++)
for (label i=0; i < nTypes; i++)
{
wordList fieldNames = objects.names(fieldTypes[i]);
if ( fieldTypes[i] == "volScalarField" )
if (fieldTypes[i] == "volScalarField")
{
gmvFile << "variable" << nl;
}
for(label j=0; j < fieldNames.size(); j++)
for (label j=0; j < fieldNames.size(); j++)
{
word fieldName = fieldNames[j];
......@@ -20,7 +20,7 @@ for(label i=0; i < nTypes; i++)
IOobject::NO_WRITE
);
if ( fieldTypes[i] == "volScalarField" )
if (fieldTypes[i] == "volScalarField")
{
volScalarField gmvScalarField(fieldObject, mesh);
gmvFile << fieldName << " 0" << nl;
......@@ -31,21 +31,21 @@ for(label i=0; i < nTypes; i++)
gmvFile << nl;
}
if ( fieldTypes[i] == "volVectorField" )
if (fieldTypes[i] == "volVectorField")
{
if (fieldName == vComp)
{
volVectorField gmvVectorField(fieldObject, mesh);
gmvFile << "velocity 0" << nl;
for(label indx=0;indx<mesh.nCells();indx++)
for (label indx=0;indx<mesh.nCells();indx++)
{
gmvFile << gmvVectorField[indx].x() << " ";
}
for(label indx=0;indx<mesh.nCells();indx++)
for (label indx=0;indx<mesh.nCells();indx++)
{
gmvFile << gmvVectorField[indx].y() << " ";
}
for(label indx=0;indx<mesh.nCells();indx++)
for (label indx=0;indx<mesh.nCells();indx++)
{
gmvFile << gmvVectorField[indx].z() << " ";
}
......@@ -53,20 +53,20 @@ for(label i=0; i < nTypes; i++)
}
}
if ( fieldTypes[i] == "surfaceScalarField" )
if (fieldTypes[i] == "surfaceScalarField")
{
// ...
}
}
if ( fieldTypes[i] == cloud::subInstance )
if (fieldTypes[i] == cloud::prefix)
{
IOobject lagrangianHeader
(
"positions",
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::NO_READ
);
......@@ -75,7 +75,7 @@ for(label i=0; i < nTypes; i++)
{
Cloud<passiveParticle> particles(mesh);
IOobjectList objects(mesh, runTime.timeName(), cloud::subInstance);
IOobjectList objects(mesh, runTime.timeName(), cloud::prefix);
wordList lagrangianScalarNames = objects.names("scalarField");
wordList lagrangianVectorNames = objects.names("vectorField");
......@@ -87,7 +87,7 @@ for(label i=0; i < nTypes; i++)
}
}
if ( fieldTypes[i] == "volScalarField" )
if (fieldTypes[i] == "volScalarField")
{
gmvFile << "endvars" << nl;
}
......
......@@ -42,7 +42,7 @@ forAll(lagrangianScalarNames, i)
(
name,
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
......@@ -73,7 +73,7 @@ forAll(lagrangianVectorNames, i)
(
name,
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
......
......@@ -40,7 +40,7 @@ forAll(lagrangianScalarNames, i)
(
name,
runTime.timeName(),
cloud::subInstance,
cloud::prefix,
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
......
......@@ -914,7 +914,7 @@ int main(int argc, char *argv[])
(
readDir
(
runTime.timePath()/regionPrefix/cloud::subInstance,
runTime.timePath()/regionPrefix/cloud::prefix,
fileName::DIRECTORY
)
);
......@@ -925,18 +925,18 @@ int main(int argc, char *argv[])
(
mesh,
runTime.timeName(),
cloud::subInstance/cloudDirs[i]
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
if (positionsPtr)
{
mkDir(fvPath/cloud::subInstance/cloudDirs[i]);
mkDir(fvPath/cloud::prefix/cloudDirs[i]);
fileName lagrFileName
(
fvPath/cloud::subInstance/cloudDirs[i]/cloudDirs[i]
fvPath/cloud::prefix/cloudDirs[i]/cloudDirs[i]
+ "_" + name(timeI) + ".vtk"
);
......
......@@ -41,7 +41,7 @@ void Foam::lagrangianWriter::writeIOField(const wordList& objects)
(
object,
vMesh_.mesh().time().timeName(),
cloud::subInstance/cloudName_,
cloud::prefix/cloudName_,
vMesh_.mesh(),
IOobject::MUST_READ,
IOobject::NO_WRITE,
......
......@@ -266,7 +266,7 @@ void Foam::vtkPV3Foam::convertLagrangianFields
(
mesh,
dbPtr_().timeName(),
cloud::subInstance/cloudName
cloud::prefix/cloudName
);
pruneObjectList(objects, selectedFields);
......
......@@ -53,7 +53,7 @@ vtkPolyData* Foam::vtkPV3Foam::lagrangianVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV3Foam::lagrangianVTKMesh - timePath "
<< mesh.time().timePath()/cloud::subInstance/cloudName << endl;
<< mesh.time().timePath()/cloud::prefix/cloudName << endl;
printMemory();
}
......@@ -63,7 +63,7 @@ vtkPolyData* Foam::vtkPV3Foam::lagrangianVTKMesh
(
mesh,
mesh.time().timeName(),
cloud::subInstance/cloudName
cloud::prefix/cloudName
);
IOobject* positionsPtr = sprayObjs.lookup("positions");
......
......@@ -149,16 +149,16 @@ void Foam::vtkPV3Foam::updateInfoLagrangian()
if (debug)
{
Info<< "<beg> Foam::vtkPV3Foam::updateInfoLagrangian" << nl
<< " " << dbPtr_->timePath()/cloud::subInstance << endl;
<< " " << dbPtr_->timePath()/cloud::prefix << endl;
}
// use the db directly since this might be called without a mesh,
// but the region must get added back in
fileName lagrangianPrefix(cloud::subInstance);
fileName lagrangianPrefix(cloud::prefix);
if (meshRegion_ != polyMesh::defaultRegion)
{
lagrangianPrefix = meshRegion_/cloud::subInstance;
lagrangianPrefix = meshRegion_/cloud::prefix;
}
// Search for list of lagrangian objects for this time
......@@ -464,10 +464,10 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
// use the db directly since this might be called without a mesh,
// but the region must get added back in
fileName lagrangianPrefix(cloud::subInstance);
fileName lagrangianPrefix(cloud::prefix);
if (meshRegion_ != polyMesh::defaultRegion)
{
lagrangianPrefix = meshRegion_/cloud::subInstance;
lagrangianPrefix = meshRegion_/cloud::prefix;
}
IOobjectList objects
......
Markdown is supported
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