BUG: foamToVTK produces invalid files (fixes #154)
- broken by commit 2027059b
(2016-03-09) where the pTraits
nComponents type was changed from int to Foam::direction
This commit is contained in:
parent
a39ffa66f2
commit
db467dbcf8
@ -3,7 +3,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 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -49,7 +49,8 @@ void Foam::lagrangianWriter::writeIOField(const wordList& objects)
|
|||||||
|
|
||||||
IOField<Type> fld(header);
|
IOField<Type> fld(header);
|
||||||
|
|
||||||
os_ << object << ' ' << pTraits<Type>::nComponents << ' '
|
os_ << object << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< fld.size() << " float" << std::endl;
|
<< fld.size() << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*fld.size());
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*fld.size());
|
||||||
|
@ -3,7 +3,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-2016 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -38,7 +38,8 @@ void Foam::patchWriter::write
|
|||||||
{
|
{
|
||||||
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldI];
|
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldI];
|
||||||
|
|
||||||
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os_ << fld.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nFaces_ << " float" << std::endl;
|
<< nFaces_ << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nFaces_);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nFaces_);
|
||||||
@ -74,7 +75,8 @@ void Foam::patchWriter::write
|
|||||||
const GeometricField<Type, pointPatchField, pointMesh>& fld =
|
const GeometricField<Type, pointPatchField, pointMesh>& fld =
|
||||||
flds[fieldI];
|
flds[fieldI];
|
||||||
|
|
||||||
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os_ << fld.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nPoints_ << " float" << std::endl;
|
<< nPoints_ << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
|
||||||
@ -103,7 +105,8 @@ void Foam::patchWriter::write
|
|||||||
{
|
{
|
||||||
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldI];
|
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldI];
|
||||||
|
|
||||||
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os_ << fld.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nPoints_ << " float" << std::endl;
|
<< nPoints_ << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
|
||||||
|
@ -3,7 +3,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-2016 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -71,7 +71,8 @@ void Foam::surfaceMeshWriter::write
|
|||||||
const GeometricField<Type, fvsPatchField, surfaceMesh>& fld =
|
const GeometricField<Type, fvsPatchField, surfaceMesh>& fld =
|
||||||
sflds[fieldI];
|
sflds[fieldI];
|
||||||
|
|
||||||
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os_ << fld.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< pp_.size() << " float" << std::endl;
|
<< pp_.size() << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*pp_.size());
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*pp_.size());
|
||||||
|
@ -3,7 +3,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-2016 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -74,7 +74,8 @@ void Foam::writeFuns::write
|
|||||||
|
|
||||||
label nValues = mesh.nCells() + superCells.size();
|
label nValues = mesh.nCells() + superCells.size();
|
||||||
|
|
||||||
os << vvf.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os << vvf.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nValues << " float" << std::endl;
|
<< nValues << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
|
||||||
@ -106,7 +107,8 @@ void Foam::writeFuns::write
|
|||||||
const labelList& addPointCellLabels = topo.addPointCellLabels();
|
const labelList& addPointCellLabels = topo.addPointCellLabels();
|
||||||
const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
|
const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
|
||||||
|
|
||||||
os << pvf.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os << pvf.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nTotPoints << " float" << std::endl;
|
<< nTotPoints << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
|
||||||
@ -139,7 +141,8 @@ void Foam::writeFuns::write
|
|||||||
const labelList& addPointCellLabels = topo.addPointCellLabels();
|
const labelList& addPointCellLabels = topo.addPointCellLabels();
|
||||||
const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
|
const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
|
||||||
|
|
||||||
os << vvf.name() << ' ' << pTraits<Type>::nComponents << ' '
|
os << vvf.name() << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nTotPoints << " float" << std::endl;
|
<< nTotPoints << " float" << std::endl;
|
||||||
|
|
||||||
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
|
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
|
||||||
|
@ -3,7 +3,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-2016 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -119,8 +119,9 @@ void writeVTKFields
|
|||||||
forAll(values, fieldI)
|
forAll(values, fieldI)
|
||||||
{
|
{
|
||||||
Info<< " writing field " << fieldNames[fieldI] << endl;
|
Info<< " writing field " << fieldNames[fieldI] << endl;
|
||||||
os << nl << fieldNames[fieldI] << ' ' << pTraits<Type>::nComponents
|
os << nl << fieldNames[fieldI] << ' '
|
||||||
<< ' ' << values[fieldI].size() << " float" << nl;
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
|
<< values[fieldI].size() << " float" << nl;
|
||||||
label offset = 0;
|
label offset = 0;
|
||||||
forAll(addr, trackI)
|
forAll(addr, trackI)
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,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-2016 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
This file is part of OpenFOAM.
|
This file is part of OpenFOAM.
|
||||||
@ -85,7 +85,8 @@ void Foam::vtkSetWriter<Type>::write
|
|||||||
|
|
||||||
forAll(valueSetNames, setI)
|
forAll(valueSetNames, setI)
|
||||||
{
|
{
|
||||||
os << valueSetNames[setI] << ' ' << pTraits<Type>::nComponents << ' '
|
os << valueSetNames[setI] << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< points.size() << " float" << nl;
|
<< points.size() << " float" << nl;
|
||||||
|
|
||||||
const Field<Type>& fld = *valueSets[setI];
|
const Field<Type>& fld = *valueSets[setI];
|
||||||
@ -169,7 +170,8 @@ void Foam::vtkSetWriter<Type>::write
|
|||||||
|
|
||||||
forAll(valueSetNames, setI)
|
forAll(valueSetNames, setI)
|
||||||
{
|
{
|
||||||
os << valueSetNames[setI] << ' ' << pTraits<Type>::nComponents << ' '
|
os << valueSetNames[setI] << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nPoints << " float" << nl;
|
<< nPoints << " float" << nl;
|
||||||
|
|
||||||
const List<Field<Type>>& fieldVals = valueSets[setI];
|
const List<Field<Type>>& fieldVals = valueSets[setI];
|
||||||
|
@ -65,7 +65,8 @@ void Foam::CloudToVTK<CloudType>::writeFieldData
|
|||||||
) const
|
) const
|
||||||
{
|
{
|
||||||
vtkOs
|
vtkOs
|
||||||
<< title << ' ' << pTraits<Type>::nComponents << ' '
|
<< title << ' '
|
||||||
|
<< int(pTraits<Type>::nComponents) << ' '
|
||||||
<< nParcels << " float" << std::endl;
|
<< nParcels << " float" << std::endl;
|
||||||
writeData(vtkOs, binary, data);
|
writeData(vtkOs, binary, data);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user