From c3dcdcdc4aa7503d79f3474ad527594352b5b391 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 14 Jul 2009 13:04:30 +0100 Subject: [PATCH 1/2] cosmetics - code formatting --- .../isoSurface/sampledIsoSurface.C | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C index c2f32da1b6..235af8607a 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C @@ -35,7 +35,13 @@ License namespace Foam { defineTypeNameAndDebug(sampledIsoSurface, 0); - addNamedToRunTimeSelectionTable(sampledSurface, sampledIsoSurface, word, isoSurface); + addNamedToRunTimeSelectionTable + ( + sampledSurface, + sampledIsoSurface, + word, + isoSurface + ); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -574,8 +580,7 @@ bool Foam::sampledIsoSurface::update() } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volScalarField& vField ) const @@ -584,8 +589,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volVectorField& vField ) const @@ -594,8 +598,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volSphericalTensorField& vField ) const @@ -604,8 +607,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volSymmTensorField& vField ) const @@ -614,8 +616,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volTensorField& vField ) const @@ -624,8 +625,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -634,8 +634,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -643,8 +642,7 @@ Foam::sampledIsoSurface::interpolate return interpolateField(interpolator); } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -653,8 +651,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -663,8 +660,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const From e5c36daef853d1752f7613ef500f0d7f9893e0b7 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 17 Jul 2009 18:06:33 +0100 Subject: [PATCH 2/2] using fieldname as label for point field data instead of volPointInterpolate(X) --- .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H index 63b5c0c3a6..fc421ff4a2 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H @@ -132,7 +132,6 @@ void Foam::vtkPV3Foam::convertPointFields } - template void Foam::vtkPV3Foam::convertPointFieldBlock ( @@ -162,7 +161,6 @@ void Foam::vtkPV3Foam::convertPointFieldBlock } - template void Foam::vtkPV3Foam::convertPointField ( @@ -193,7 +191,7 @@ void Foam::vtkPV3Foam::convertPointField pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size()); pointData->SetNumberOfComponents(nComp); pointData->Allocate(nComp*(nPoints + addPointCellLabels.size())); - pointData->SetName(ptf.name().c_str()); + pointData->SetName(tf.name().c_str()); if (debug) { @@ -269,6 +267,7 @@ void Foam::vtkPV3Foam::convertPointField pointData->Delete(); } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #endif