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: remove deprecated ensight output order (issue #523)

Browse Source 
- Added for transition purposes only in 1612 but can now be removed.
This commit is contained in:
Mark Olesen
2017-07-11 14:57:05 +02:00
parent ded09d6461
commit cce74d493b
8 changed files with 4 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/conversion/ensight/mesh/ensightMesh.H
View File

@ -293,9 +293,6 @@ public:
//- Using internalMesh?
inline bool useInternalMesh() const;
//- Using deprecated order? (hex prism pyr tet poly)
inline bool deprecatedOrder() const;
//- The volume cells (internalMesh)
inline const ensightCells& meshCells() const;
@ -369,9 +366,6 @@ class ensightMesh::options
//- Suppress patches
bool noPatches_;
//- Using deprecated order (hex prism pyr tet poly)
bool deprecatedOrder_;
//- Output selected patches only
autoPtr<wordReList> patchPatterns_;
@ -399,9 +393,6 @@ public:
//- Using internalMesh?
bool useInternalMesh() const;
//- Using deprecated order? (hex prism pyr tet poly)
bool deprecatedOrder() const;
//- Using patches?
bool usePatches() const;
@ -426,9 +417,6 @@ public:
//- Lazy creation - ensightMesh starts as needsUpdate.
void lazy(const bool);
//- Alter deprecated order.
void deprecatedOrder(const bool);
//- Alter the patches/no-patches state
void noPatches(const bool);

6
src/conversion/ensight/mesh/ensightMeshI.H
View File

@ -49,12 +49,6 @@ inline bool Foam::ensightMesh::useInternalMesh() const
}
inline bool Foam::ensightMesh::deprecatedOrder() const
{
return options_->deprecatedOrder();
}
inline const Foam::ensightCells& Foam::ensightMesh::meshCells() const
{
return meshCells_;

22
src/conversion/ensight/mesh/ensightMeshIO.C
View File

@ -452,28 +452,6 @@ void Foam::ensightMesh::writeCellConnectivity
ensightGeoFile& os
) const
{
if (deprecatedOrder())
{
// element ordering used in older versions
ensightCells::elemType oldOrder[5] =
{
ensightCells::HEXA8,
ensightCells::PENTA6,
ensightCells::PYRAMID5,
ensightCells::TETRA4,
ensightCells::NFACED
};
for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
const ensightCells::elemType& what = oldOrder[typei];
writeCellConnectivity(what, ensCells, pointToGlobal, os);
}
return;
}
for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
const ensightCells::elemType what = ensightCells::elemType(typei);

13
src/conversion/ensight/mesh/ensightMeshOptions.C
View File

@ -33,7 +33,6 @@ Foam::ensightMesh::options::options(IOstream::streamFormat format)
format_(format),
lazy_(false),
noPatches_(false),
deprecatedOrder_(false),
patchPatterns_(),
faceZonePatterns_()
{}
@ -59,12 +58,6 @@ bool Foam::ensightMesh::options::useInternalMesh() const
}
bool Foam::ensightMesh::options::deprecatedOrder() const
{
return deprecatedOrder_;
}
bool Foam::ensightMesh::options::usePatches() const
{
return !noPatches_;
@ -97,12 +90,6 @@ void Foam::ensightMesh::options::lazy(const bool b)
}
void Foam::ensightMesh::options::deprecatedOrder(const bool b)
{
deprecatedOrder_ = b;
}
void Foam::ensightMesh::options::noPatches(const bool b)
{
noPatches_ = b;

3
src/conversion/ensight/output/ensightOutput.H
View File

@ -91,8 +91,7 @@ class ensightOutput
(
const Field<Type>& fld,
const ensightCells&,
ensightFile& os,
const bool deprecatedOrder = false
ensightFile& os
);

31
src/conversion/ensight/output/ensightOutputTemplates.C
View File

@ -171,8 +171,7 @@ bool Foam::ensightOutput::writeCellField
(
const Field<Type>& vf,
const ensightCells& ensCells,
ensightFile& os,
const bool deprecatedOrder
ensightFile& os
)
{
if (ensCells.total())
@ -182,32 +181,6 @@ bool Foam::ensightOutput::writeCellField
os.beginPart(ensCells.index());
}
if (deprecatedOrder)
{
// element ordering used in older versions
ensightCells::elemType oldOrder[5] =
{
ensightCells::HEXA8,
ensightCells::PENTA6,
ensightCells::PYRAMID5,
ensightCells::TETRA4,
ensightCells::NFACED
};
for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
const ensightCells::elemType& what = oldOrder[typei];
writeFieldContent
(
ensightCells::key(what),
Field<Type>(vf, ensCells.cellIds(what)),
os
);
}
return true;
}
for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
const ensightCells::elemType what = ensightCells::elemType(typei);
@ -248,7 +221,7 @@ bool Foam::ensightOutput::writeField
//
if (ensMesh.useInternalMesh())
{
writeCellField(vf, meshCells, os, ensMesh.deprecatedOrder());
writeCellField(vf, meshCells, os);
}
//