Commit 38ca205e authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote branch 'OpenCFD/master' into olesenm

Include revert for ca7a6f51 + aec1bace
- Henry's version is simpler.
parents ca7a6f51 344fba92
......@@ -574,11 +574,10 @@ class vtkPV3Foam
const label datasetNo
);
//- Lagrangian field, use specified display name
//- Lagrangian field
template<class Type>
void convertLagrangianField
(
const word& displayName,
const IOField<Type>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
......@@ -595,22 +594,20 @@ class vtkPV3Foam
vtkMultiBlockDataSet* output
);
//- Point field - all selected parts, use specified display name
//- Point field - all selected parts
template<class Type>
void convertPointFieldBlock
(
const word& displayName,
const GeometricField<Type, pointPatchField, pointMesh>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
const List<polyDecomp>&
);
//- Point field, use specified display name
//- Point fields
template<class Type>
void convertPointField
(
const word& displayName,
const GeometricField<Type, pointPatchField, pointMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
vtkMultiBlockDataSet* output,
......@@ -619,11 +616,11 @@ class vtkPV3Foam
const polyDecomp&
);
//- Patch point field, use specified display name
//- Patch point field
template<class Type>
void convertPatchPointField
(
const word& displayName,
const word& name,
const Field<Type>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
......
......@@ -51,9 +51,7 @@ void Foam::vtkPV3Foam::convertLagrangianFields
if (iter()->headerClassName() == IOField<Type>::typeName)
{
IOField<Type> tf(*iter());
// display name for lagrangian field
const word& displayName = tf.name();
convertLagrangianField(displayName, tf, output, range, datasetNo);
convertLagrangianField(tf, output, range, datasetNo);
}
}
}
......@@ -62,7 +60,6 @@ void Foam::vtkPV3Foam::convertLagrangianFields
template<class Type>
void Foam::vtkPV3Foam::convertLagrangianField
(
const word& displayName,
const IOField<Type>& tf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
......@@ -75,7 +72,7 @@ void Foam::vtkPV3Foam::convertLagrangianField
pointData->SetNumberOfTuples(tf.size());
pointData->SetNumberOfComponents(nComp);
pointData->Allocate(nComp*tf.size());
pointData->SetName(displayName.c_str());
pointData->SetName(tf.name().c_str());
if (debug)
{
......
......@@ -76,7 +76,6 @@ void Foam::vtkPV3Foam::convertPointFields
// Convert activated internalMesh regions
convertPointFieldBlock
(
fieldName,
ptf,
output,
arrayRangeVolume_,
......@@ -86,7 +85,6 @@ void Foam::vtkPV3Foam::convertPointFields
// Convert activated cellZones
convertPointFieldBlock
(
fieldName,
ptf,
output,
arrayRangeCellZones_,
......@@ -96,7 +94,6 @@ void Foam::vtkPV3Foam::convertPointFields
// Convert activated cellSets
convertPointFieldBlock
(
fieldName,
ptf,
output,
arrayRangeCellSets_,
......@@ -139,7 +136,6 @@ void Foam::vtkPV3Foam::convertPointFields
template<class Type>
void Foam::vtkPV3Foam::convertPointFieldBlock
(
const word& displayName,
const GeometricField<Type, pointPatchField, pointMesh>& ptf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
......@@ -154,7 +150,6 @@ void Foam::vtkPV3Foam::convertPointFieldBlock
{
convertPointField
(
displayName,
ptf,
GeometricField<Type, fvPatchField, volMesh>::null(),
output,
......@@ -170,7 +165,6 @@ void Foam::vtkPV3Foam::convertPointFieldBlock
template<class Type>
void Foam::vtkPV3Foam::convertPointField
(
const word& displayName,
const GeometricField<Type, pointPatchField, pointMesh>& ptf,
const GeometricField<Type, fvPatchField, volMesh>& tf,
vtkMultiBlockDataSet* output,
......@@ -198,7 +192,10 @@ void Foam::vtkPV3Foam::convertPointField
pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
pointData->SetNumberOfComponents(nComp);
pointData->Allocate(nComp*(nPoints + addPointCellLabels.size()));
pointData->SetName(displayName.c_str());
// Note: using the name of the original volField
// not the name generated by the interpolation "volPointInterpolate(<name>)"
pointData->SetName(tf.name().c_str());
if (debug)
{
......
......@@ -110,11 +110,6 @@ void Foam::vtkPV3Foam::convertVolFields
//
// Convert patches - if activated
//
// The name for the interpolated patch point field must be consistent
// with the interpolated volume point field.
const word& pointFldName = tf.name();
for
(
int partId = arrayRangePatches_.start();
......@@ -161,7 +156,7 @@ void Foam::vtkPV3Foam::convertVolFields
convertPatchPointField
(
pointFldName,
tf.name(),
ppInterpList[patchId].faceToPointInterpolate(tpptf)(),
output,
arrayRangePatches_,
......@@ -181,7 +176,7 @@ void Foam::vtkPV3Foam::convertVolFields
convertPatchPointField
(
pointFldName,
tf.name(),
ppInterpList[patchId].faceToPointInterpolate(ptf)(),
output,
arrayRangePatches_,
......@@ -275,14 +270,21 @@ void Foam::vtkPV3Foam::convertVolFieldBlock
const List<polyDecomp>& decompLst
)
{
const word& pointFldName = tf.name();
for (int partId = range.start(); partId < range.end(); ++partId)
{
const label datasetNo = partDataset_[partId];
if (datasetNo >= 0 && partStatus_[partId])
{
convertVolField
(
tf,
output,
range,
datasetNo,
decompLst[datasetNo]
);
if (!ptfPtr.valid())
{
if (debug)
......@@ -297,18 +299,8 @@ void Foam::vtkPV3Foam::convertVolFieldBlock
);
}
convertVolField
(
tf,
output,
range,
datasetNo,
decompLst[datasetNo]
);
convertPointField
(
pointFldName,
ptfPtr(),
tf,
output,
......
......@@ -79,12 +79,15 @@ find -H $packDir \
-e "\@$packDir/lib/@d" \
-e '\@/\.git/@d' \
-e '\@/\.tags/@d' \
-e '\@/\README\.org@d' \
-e '\@applications/bin/@d' \
-e '\@wmake/bin/@d' \
-e '\@/t/@d' \
-e '\@/Make[.A-Za-z]*/[^/]*/@d'\
-e '\@/platforms/@d' \
-e '\@libccmio.*/@d' \
-e '\@/download/@d' \
-e '\@/libccmio-.*/@d' \
-e '\@/debian/@d'
> $tmpFile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment