Fix tensor names in foamToEnsightParts case file (fixes #243)

This commit is contained in:
Mark Olesen
2016-09-26 07:41:02 +02:00
parent cff8efb98b
commit 3c935ca89e

View File

@ -58,27 +58,29 @@ forAllConstIter(HashTable<word>, volumeFields, fieldIter)
if (fieldType == volScalarField::typeName) if (fieldType == volScalarField::typeName)
{ {
ensightType = "scalar"; ensightType = ensightPTraits<scalar>::typeName;
} }
else if (fieldType == volVectorField::typeName) else if (fieldType == volVectorField::typeName)
{ {
ensightType = "vector"; ensightType = ensightPTraits<vector>::typeName;
} }
else if (fieldType == volSphericalTensorField::typeName) else if (fieldType == volSphericalTensorField::typeName)
{ {
ensightType = "tensor symm"; ensightType = ensightPTraits<sphericalTensor>::typeName;
} }
else if (fieldType == volSymmTensorField::typeName) else if (fieldType == volSymmTensorField::typeName)
{ {
ensightType = "tensor symm"; ensightType = ensightPTraits<symmTensor>::typeName;
} }
else if (fieldType == volTensorField::typeName) else if (fieldType == volTensorField::typeName)
{ {
ensightType = "tensor asym"; ensightType = ensightPTraits<tensor>::typeName;
}
else
{
continue;
} }
if (ensightType.size())
{
ensightCaseEntry ensightCaseEntry
( (
caseFile, caseFile,
@ -86,7 +88,6 @@ forAllConstIter(HashTable<word>, volumeFields, fieldIter)
fieldName, fieldName,
dataMask dataMask
); );
}
} }
@ -104,19 +105,21 @@ forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
if (fieldType == scalarIOField::typeName) if (fieldType == scalarIOField::typeName)
{ {
ensightType = "scalar"; ensightType = ensightPTraits<scalar>::typeName;
} }
else if (fieldType == vectorIOField::typeName) else if (fieldType == vectorIOField::typeName)
{ {
ensightType = "vector"; ensightType = ensightPTraits<vector>::typeName;
} }
else if (fieldType == tensorIOField::typeName) else if (fieldType == tensorIOField::typeName)
{ {
ensightType = "tensor"; ensightType = ensightPTraits<tensor>::typeName;
}
else
{
continue;
} }
if (ensightType.size())
{
ensightCaseEntry ensightCaseEntry
( (
caseFile, caseFile,
@ -128,7 +131,6 @@ forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
2 2
); );
} }
}
cloudNo++; cloudNo++;
} }
@ -162,7 +164,7 @@ if (fieldTimesUsed.size())
count = 0; count = 0;
forAll(fieldTimesUsed, i) forAll(fieldTimesUsed, i)
{ {
const label& index = fieldTimesUsed[i]; const label index = fieldTimesUsed[i];
caseFile caseFile
<< " " << setw(12) << timeIndices[index] + timeCorrection; << " " << setw(12) << timeIndices[index] + timeCorrection;
@ -203,7 +205,7 @@ if (geometryTimesUsed.size())
count = 0; count = 0;
forAll(geometryTimesUsed, i) forAll(geometryTimesUsed, i)
{ {
const label& index = geometryTimesUsed[i]; const label index = geometryTimesUsed[i];
caseFile caseFile
<< " " << setw(12) << timeIndices[index] + timeCorrection; << " " << setw(12) << timeIndices[index] + timeCorrection;
@ -249,7 +251,7 @@ forAllConstIter(HashTable<DynamicList<label>>, cloudTimesUsed, cloudIter)
count = 0; count = 0;
forAll(timesUsed, i) forAll(timesUsed, i)
{ {
const label& index = timesUsed[i]; const label index = timesUsed[i];
caseFile caseFile
<< " " << setw(12) << timeIndices[index] + timeCorrection; << " " << setw(12) << timeIndices[index] + timeCorrection;