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

STYLE: more meaningful variable name when using meshSubsetHelper

Browse Source
This commit is contained in:
Mark Olesen
2017-06-14 07:56:57 +02:00
parent 180788c453
commit 49500b0194
2 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ int main(int argc, char *argv[])
<< mesh.boundaryMesh()[0].name() << ")" << mesh.boundaryMesh()[0].name() << ")"
<< endl; << endl;
} }
meshSubsetHelper myMesh(mesh, meshSubsetHelper::ZONE, cellZoneName); meshSubsetHelper meshRef(mesh, meshSubsetHelper::ZONE, cellZoneName);
// //
// Open new ensight case file, initialize header etc. // Open new ensight case file, initialize header etc.
@ -306,7 +306,7 @@ int main(int argc, char *argv[])
// Construct the Ensight mesh // Construct the Ensight mesh
ensightMesh ensMesh(myMesh.mesh(), writeOpts); ensightMesh ensMesh(meshRef.mesh(), writeOpts);
if (Pstream::master()) if (Pstream::master())
{ {
@ -375,7 +375,7 @@ int main(int argc, char *argv[])
polyMesh::readUpdateState meshState = mesh.readUpdate(); polyMesh::readUpdateState meshState = mesh.readUpdate();
if (meshState != polyMesh::UNCHANGED) if (meshState != polyMesh::UNCHANGED)
{ {
myMesh.correct(); meshRef.correct();
ensMesh.expire(); ensMesh.expire();
ensMesh.correct(); ensMesh.correct();
} }
@ -430,7 +430,7 @@ int main(int argc, char *argv[])
volScalarField vf(fieldObject, mesh); volScalarField vf(fieldObject, mesh);
wrote = ensightOutput::writeField<scalar> wrote = ensightOutput::writeField<scalar>
( (
myMesh.interpolate(vf), meshRef.interpolate(vf),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -446,7 +446,7 @@ int main(int argc, char *argv[])
volVectorField vf(fieldObject, mesh); volVectorField vf(fieldObject, mesh);
wrote = ensightOutput::writeField<vector> wrote = ensightOutput::writeField<vector>
( (
myMesh.interpolate(vf), meshRef.interpolate(vf),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -462,7 +462,7 @@ int main(int argc, char *argv[])
volSphericalTensorField vf(fieldObject, mesh); volSphericalTensorField vf(fieldObject, mesh);
wrote = ensightOutput::writeField<sphericalTensor> wrote = ensightOutput::writeField<sphericalTensor>
( (
myMesh.interpolate(vf), meshRef.interpolate(vf),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -478,7 +478,7 @@ int main(int argc, char *argv[])
volSymmTensorField vf(fieldObject, mesh); volSymmTensorField vf(fieldObject, mesh);
wrote = ensightOutput::writeField<symmTensor> wrote = ensightOutput::writeField<symmTensor>
( (
myMesh.interpolate(vf), meshRef.interpolate(vf),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -494,7 +494,7 @@ int main(int argc, char *argv[])
volTensorField vf(fieldObject, mesh); volTensorField vf(fieldObject, mesh);
wrote = ensightOutput::writeField<tensor> wrote = ensightOutput::writeField<tensor>
( (
myMesh.interpolate(vf), meshRef.interpolate(vf),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -519,7 +519,7 @@ int main(int argc, char *argv[])
); );
wrote = ensightOutput::writeField<scalar> wrote = ensightOutput::writeField<scalar>
( (
myMesh.interpolate<scalar>(df), meshRef.interpolate<scalar>(df),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -543,7 +543,7 @@ int main(int argc, char *argv[])
); );
wrote = ensightOutput::writeField<vector> wrote = ensightOutput::writeField<vector>
( (
myMesh.interpolate<vector>(df), meshRef.interpolate<vector>(df),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -567,7 +567,7 @@ int main(int argc, char *argv[])
); );
wrote = ensightOutput::writeField<sphericalTensor> wrote = ensightOutput::writeField<sphericalTensor>
( (
myMesh.interpolate<sphericalTensor>(df), meshRef.interpolate<sphericalTensor>(df),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -591,7 +591,7 @@ int main(int argc, char *argv[])
); );
wrote = ensightOutput::writeField<symmTensor> wrote = ensightOutput::writeField<symmTensor>
( (
myMesh.interpolate<symmTensor>(df), meshRef.interpolate<symmTensor>(df),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues
@ -615,7 +615,7 @@ int main(int argc, char *argv[])
); );
wrote = ensightOutput::writeField<tensor> wrote = ensightOutput::writeField<tensor>
( (
myMesh.interpolate<tensor>(df), meshRef.interpolate<tensor>(df),
ensMesh, ensMesh,
os, os,
nodeValues nodeValues

100
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View File

@ -296,7 +296,7 @@ int main(int argc, char *argv[])
mkDir(fvPath); mkDir(fvPath);
// Mesh wrapper: does subsetting // Mesh wrapper: does subsetting
meshSubsetHelper myMesh(mesh, meshSubsetHelper::SET, cellSetName); meshSubsetHelper meshRef(mesh, meshSubsetHelper::SET, cellSetName);
forAll(timeDirs, timeI) forAll(timeDirs, timeI)
{ {
@ -308,8 +308,8 @@ int main(int argc, char *argv[])
// Check for new polyMesh/ and update mesh, fvMeshSubset and cell // Check for new polyMesh/ and update mesh, fvMeshSubset and cell
// decomposition. // decomposition.
polyMesh::readUpdateState meshState = myMesh.readUpdate(); polyMesh::readUpdateState meshState = meshRef.readUpdate();
const fvMesh& mesh = myMesh.mesh(); const fvMesh& mesh = meshRef.mesh();
// TotalNumFaceNodes // TotalNumFaceNodes
int32_t nFaceNodes = 0; int32_t nFaceNodes = 0;
@ -333,23 +333,23 @@ int main(int argc, char *argv[])
// Construct the vol fields (on the original mesh if subsetted) // Construct the vol fields (on the original mesh if subsetted)
PtrList<const volScalarField> vsf; PtrList<const volScalarField> vsf;
readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vsf); readFields(meshRef, meshRef.baseMesh(), objects, selectedFields, vsf);
print(" volScalarFields :", Info, vsf); print(" volScalarFields :", Info, vsf);
PtrList<const volVectorField> vvf; PtrList<const volVectorField> vvf;
readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vvf); readFields(meshRef, meshRef.baseMesh(), objects, selectedFields, vvf);
print(" volVectorFields :", Info, vvf); print(" volVectorFields :", Info, vvf);
PtrList<const volSphericalTensorField> vSpheretf; PtrList<const volSphericalTensorField> vSphf;
readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vSpheretf); readFields(meshRef, meshRef.baseMesh(), objects, selectedFields, vSphf);
print(" volSphericalTensorFields :", Info, vSpheretf); print(" volSphericalTensorFields :", Info, vSphf);
PtrList<const volSymmTensorField> vSymmtf; PtrList<const volSymmTensorField> vSymf;
readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vSymmtf); readFields(meshRef, meshRef.baseMesh(), objects, selectedFields, vSymf);
print(" volSymmTensorFields :", Info, vSymmtf); print(" volSymmTensorFields :", Info, vSymf);
PtrList<const volTensorField> vtf; PtrList<const volTensorField> vtf;
readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vtf); readFields(meshRef, meshRef.baseMesh(), objects, selectedFields, vtf);
print(" volTensorFields :", Info, vtf); print(" volTensorFields :", Info, vtf);
@ -365,8 +365,8 @@ int main(int argc, char *argv[])
PtrList<const pointScalarField> psf; PtrList<const pointScalarField> psf;
PtrList<const pointVectorField> pvf; PtrList<const pointVectorField> pvf;
//PtrList<const pointSphericalTensorField> pSpheretf; //PtrList<const pointSphericalTensorField> pSphf;
//PtrList<const pointSymmTensorField> pSymmtf; //PtrList<const pointSymmTensorField> pSymf;
//PtrList<const pointTensorField> ptf; //PtrList<const pointTensorField> ptf;
@ -402,8 +402,8 @@ int main(int argc, char *argv[])
readFields readFields
( (
myMesh, meshRef,
pointMesh::New(myMesh.baseMesh()), pointMesh::New(meshRef.baseMesh()),
objects, objects,
selectedFields, selectedFields,
psf psf
@ -412,8 +412,8 @@ int main(int argc, char *argv[])
readFields readFields
( (
myMesh, meshRef,
pointMesh::New(myMesh.baseMesh()), pointMesh::New(meshRef.baseMesh()),
objects, objects,
selectedFields, selectedFields,
pvf pvf
@ -422,28 +422,28 @@ int main(int argc, char *argv[])
//readFields //readFields
//( //(
// myMesh, // meshRef,
// pointMesh::New(myMesh.baseMesh()), // pointMesh::New(meshRef.baseMesh()),
// objects, // objects,
// selectedFields, // selectedFields,
// pSpheretf // pSphf
//); //);
//print(" pointSphericalTensorFields :", Info, pSpheretf); //print(" pointSphericalTensorFields :", Info, pSphf);
// //
//readFields //readFields
//( //(
// myMesh, // meshRef,
// pointMesh::New(myMesh.baseMesh()), // pointMesh::New(meshRef.baseMesh()),
// objects, // objects,
// selectedFields, // selectedFields,
// pSymmtf // pSymf
//); //);
//print(" pointSymmTensorFields :", Info, pSymmtf); //print(" pointSymmTensorFields :", Info, pSymf);
// //
//readFields //readFields
//( //(
// myMesh, // meshRef,
// pointMesh::New(myMesh.baseMesh()), // pointMesh::New(meshRef.baseMesh()),
// objects, // objects,
// selectedFields, // selectedFields,
// ptf // ptf
@ -495,14 +495,14 @@ int main(int argc, char *argv[])
tecplotWriter::getTecplotNames tecplotWriter::getTecplotNames
( (
vSpheretf, vSphf,
tecplotWriter::CELL_CENTERED, tecplotWriter::CELL_CENTERED,
varNames, varNames,
varLocation varLocation
); );
tecplotWriter::getTecplotNames tecplotWriter::getTecplotNames
( (
vSpheretf, vSphf,
tecplotWriter::CELL_CENTERED, tecplotWriter::CELL_CENTERED,
cellVarNames, cellVarNames,
cellVarLocation cellVarLocation
@ -510,14 +510,14 @@ int main(int argc, char *argv[])
tecplotWriter::getTecplotNames tecplotWriter::getTecplotNames
( (
vSymmtf, vSymf,
tecplotWriter::CELL_CENTERED, tecplotWriter::CELL_CENTERED,
varNames, varNames,
varLocation varLocation
); );
tecplotWriter::getTecplotNames tecplotWriter::getTecplotNames
( (
vSymmtf, vSymf,
tecplotWriter::CELL_CENTERED, tecplotWriter::CELL_CENTERED,
cellVarNames, cellVarNames,
cellVarLocation cellVarLocation
@ -607,8 +607,8 @@ int main(int argc, char *argv[])
// Write all fields // Write all fields
writer.writeFields(vsf); writer.writeFields(vsf);
writer.writeFields(vvf); writer.writeFields(vvf);
writer.writeFields(vSpheretf); writer.writeFields(vSphf);
writer.writeFields(vSymmtf); writer.writeFields(vSymf);
writer.writeFields(vtf); writer.writeFields(vtf);
writer.writeFields(psf); writer.writeFields(psf);
@ -689,8 +689,8 @@ int main(int argc, char *argv[])
// Write all fields // Write all fields
writer.writeFields(vsf); writer.writeFields(vsf);
writer.writeFields(vvf); writer.writeFields(vvf);
writer.writeFields(vSpheretf); writer.writeFields(vSphf);
writer.writeFields(vSymmtf); writer.writeFields(vSymf);
writer.writeFields(vtf); writer.writeFields(vtf);
writer.writeFields(psf); writer.writeFields(psf);
@ -784,24 +784,24 @@ int main(int argc, char *argv[])
) )
); );
} }
forAll(vSpheretf, i) forAll(vSphf, i)
{ {
writer.writeField writer.writeField
( (
writer.getFaceField writer.getFaceField
( (
linearInterpolate(vSpheretf[i])(), linearInterpolate(vSphf[i])(),
faceLabels faceLabels
) )
); );
} }
forAll(vSymmtf, i) forAll(vSymf, i)
{ {
writer.writeField writer.writeField
( (
writer.getFaceField writer.getFaceField
( (
linearInterpolate(vSymmtf[i])(), linearInterpolate(vSymf[i])(),
faceLabels faceLabels
) )
); );
@ -837,7 +837,7 @@ int main(int argc, char *argv[])
fileName patchFileName; fileName patchFileName;
if (myMesh.useSubMesh()) if (meshRef.useSubMesh())
{ {
patchFileName = patchFileName =
fvPath/"boundaryMesh"/cellSetName fvPath/"boundaryMesh"/cellSetName
@ -930,26 +930,26 @@ int main(int argc, char *argv[])
) )
); );
} }
forAll(vSpheretf, i) forAll(vSphf, i)
{ {
writer.writeField writer.writeField
( (
writer.getPatchField writer.getPatchField
( (
nearCellValue, nearCellValue,
vSpheretf[i], vSphf[i],
patchID patchID
) )
); );
} }
forAll(vSymmtf, i) forAll(vSymf, i)
{ {
writer.writeField writer.writeField
( (
writer.getPatchField writer.getPatchField
( (
nearCellValue, nearCellValue,
vSymmtf[i], vSymf[i],
patchID patchID
) )
); );
@ -1010,7 +1010,7 @@ int main(int argc, char *argv[])
fileName patchFileName; fileName patchFileName;
if (myMesh.useSubMesh()) if (meshRef.useSubMesh())
{ {
patchFileName = patchFileName =
fvPath/"faceZoneMesh"/cellSetName fvPath/"faceZoneMesh"/cellSetName
@ -1094,24 +1094,24 @@ int main(int argc, char *argv[])
) )
); );
} }
forAll(vSpheretf, i) forAll(vSphf, i)
{ {
writer.writeField writer.writeField
( (
writer.getFaceField writer.getFaceField
( (
linearInterpolate(vSpheretf[i])(), linearInterpolate(vSphf[i])(),
pp pp
) )
); );
} }
forAll(vSymmtf, i) forAll(vSymf, i)
{ {
writer.writeField writer.writeField
( (
writer.getFaceField writer.getFaceField
( (
linearInterpolate(vSymmtf[i])(), linearInterpolate(vSymf[i])(),
pp pp
) )
); );