mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: refactor coordSet writers (#2347)
- the very old 'writer' class was fully stateless and always templated on an particular output type. This is now replaced with a 'coordSetWriter' with similar concepts as previously introduced for surface writers (#1206). - writers change from being a generic state-less set of routines to more properly conforming to the normal notion of a writer. - Parallel data is done *outside* of the writers, since they are used in a wide variety of contexts and the caller is currently still in a better position for deciding how to combine parallel data. ENH: update sampleSets to sample on per-field basis (#2347) - sample/write a field in a single step. - support for 'sampleOnExecute' to obtain values at execution intervals without writing. - support 'sets' input as a dictionary entry (as well as a list), which is similar to the changes for sampled-surface and permits use of changeDictionary to modify content. - globalIndex for gather to reduce parallel communication, less code - qualify the sampleSet results (properties) with the name of the set. The sample results were previously without a qualifier, which meant that only the last property value was actually saved (previous ones overwritten). For example, ``` sample1 { scalar { average(line,T) 349.96521; min(line,T) 349.9544281; max(line,T) 350; average(cells,T) 349.9854619; min(cells,T) 349.6589286; max(cells,T) 350.4967271; average(line,epsilon) 0.04947733869; min(line,epsilon) 0.04449639927; max(line,epsilon) 0.06452856475; } label { size(line,T) 79; size(cells,T) 1720; size(line,epsilon) 79; } } ``` ENH: update particleTracks application - use globalIndex to manage original parcel addressing and for gathering. Simplify code by introducing a helper class, storing intermediate fields in hash tables instead of separate lists. ADDITIONAL NOTES: - the regionSizeDistribution largely retains separate writers since the utility of placing sum/dev/count for all fields into a single file is questionable. - the streamline writing remains a "soft" upgrade, which means that scalar and vector fields are still collected a priori and not on-the-fly. This is due to how the streamline infrastructure is currently handled (should be upgraded in the future).
This commit is contained in:
@ -11,7 +11,7 @@
|
||||
#include "checkTools.H"
|
||||
#include "functionObject.H"
|
||||
|
||||
#include "vtkSetWriter.H"
|
||||
#include "vtkCoordSetWriter.H"
|
||||
#include "vtkSurfaceWriter.H"
|
||||
|
||||
#include "cyclicACMIPolyPatch.H"
|
||||
@ -537,7 +537,7 @@ Foam::label Foam::checkGeometry
|
||||
const polyMesh& mesh,
|
||||
const bool allGeometry,
|
||||
autoPtr<surfaceWriter>& surfWriter,
|
||||
const autoPtr<writer<scalar>>& setWriter
|
||||
autoPtr<coordSetWriter>& setWriter
|
||||
)
|
||||
{
|
||||
label noFailedChecks = 0;
|
||||
@ -594,7 +594,7 @@ Foam::label Foam::checkGeometry
|
||||
<< nonAlignedPoints.name() << endl;
|
||||
nonAlignedPoints.instance() = mesh.pointsInstance();
|
||||
nonAlignedPoints.write();
|
||||
if (setWriter)
|
||||
if (setWriter && setWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*setWriter, nonAlignedPoints);
|
||||
}
|
||||
@ -628,7 +628,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " non closed cells to set " << cells.name() << endl;
|
||||
cells.instance() = mesh.pointsInstance();
|
||||
cells.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, cells);
|
||||
}
|
||||
@ -644,7 +644,7 @@ Foam::label Foam::checkGeometry
|
||||
<< aspectCells.name() << endl;
|
||||
aspectCells.instance() = mesh.pointsInstance();
|
||||
aspectCells.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, aspectCells);
|
||||
}
|
||||
@ -665,7 +665,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " zero area faces to set " << faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -687,7 +687,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " zero volume cells to set " << cells.name() << endl;
|
||||
cells.instance() = mesh.pointsInstance();
|
||||
cells.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, cells);
|
||||
}
|
||||
@ -710,7 +710,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " non-orthogonal faces to set " << faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -732,7 +732,7 @@ Foam::label Foam::checkGeometry
|
||||
<< faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -754,7 +754,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " skew faces to set " << faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -778,7 +778,7 @@ Foam::label Foam::checkGeometry
|
||||
<< faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -811,7 +811,7 @@ Foam::label Foam::checkGeometry
|
||||
<< "decomposition tets to set " << faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -836,7 +836,7 @@ Foam::label Foam::checkGeometry
|
||||
<< endl;
|
||||
points.instance() = mesh.pointsInstance();
|
||||
points.write();
|
||||
if (setWriter)
|
||||
if (setWriter && setWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*setWriter, points);
|
||||
}
|
||||
@ -859,7 +859,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " apart) points to set " << nearPoints.name() << endl;
|
||||
nearPoints.instance() = mesh.pointsInstance();
|
||||
nearPoints.write();
|
||||
if (setWriter)
|
||||
if (setWriter && setWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*setWriter, nearPoints);
|
||||
}
|
||||
@ -883,7 +883,7 @@ Foam::label Foam::checkGeometry
|
||||
<< endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -906,7 +906,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " warped faces to set " << faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -927,7 +927,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " under-determined cells to set " << cells.name() << endl;
|
||||
cells.instance() = mesh.pointsInstance();
|
||||
cells.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, cells);
|
||||
}
|
||||
@ -947,7 +947,7 @@ Foam::label Foam::checkGeometry
|
||||
<< " concave cells to set " << cells.name() << endl;
|
||||
cells.instance() = mesh.pointsInstance();
|
||||
cells.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, cells);
|
||||
}
|
||||
@ -968,7 +968,7 @@ Foam::label Foam::checkGeometry
|
||||
<< faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
@ -989,7 +989,7 @@ Foam::label Foam::checkGeometry
|
||||
<< faces.name() << endl;
|
||||
faces.instance() = mesh.pointsInstance();
|
||||
faces.write();
|
||||
if (surfWriter)
|
||||
if (surfWriter && surfWriter->enabled())
|
||||
{
|
||||
mergeAndWrite(*surfWriter, faces);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user