songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen 2009-07-20 11:14:18 +02:00
commit 2ee0b4923c
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
View File

@ -132,7 +132,6 @@ void Foam::vtkPV3Foam::convertPointFields
}
template<class Type>
void Foam::vtkPV3Foam::convertPointFieldBlock
(
@ -162,7 +161,6 @@ void Foam::vtkPV3Foam::convertPointFieldBlock
}
template<class Type>
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

38
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -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::scalarField>
Foam::sampledIsoSurface::sample
Foam::tmp<Foam::scalarField> Foam::sampledIsoSurface::sample
(
const volScalarField& vField
) const
@ -584,8 +589,7 @@ Foam::sampledIsoSurface::sample
}
Foam::tmp<Foam::vectorField>
Foam::sampledIsoSurface::sample
Foam::tmp<Foam::vectorField> Foam::sampledIsoSurface::sample
(
const volVectorField& vField
) const
@ -594,8 +598,7 @@ Foam::sampledIsoSurface::sample
}
Foam::tmp<Foam::sphericalTensorField>
Foam::sampledIsoSurface::sample
Foam::tmp<Foam::sphericalTensorField> Foam::sampledIsoSurface::sample
(
const volSphericalTensorField& vField
) const
@ -604,8 +607,7 @@ Foam::sampledIsoSurface::sample
}
Foam::tmp<Foam::symmTensorField>
Foam::sampledIsoSurface::sample
Foam::tmp<Foam::symmTensorField> Foam::sampledIsoSurface::sample
(
const volSymmTensorField& vField
) const
@ -614,8 +616,7 @@ Foam::sampledIsoSurface::sample
}
Foam::tmp<Foam::tensorField>
Foam::sampledIsoSurface::sample
Foam::tmp<Foam::tensorField> Foam::sampledIsoSurface::sample
(
const volTensorField& vField
) const
@ -624,8 +625,7 @@ Foam::sampledIsoSurface::sample
}
Foam::tmp<Foam::scalarField>
Foam::sampledIsoSurface::interpolate
Foam::tmp<Foam::scalarField> Foam::sampledIsoSurface::interpolate
(
const interpolation<scalar>& interpolator
) const
@ -634,8 +634,7 @@ Foam::sampledIsoSurface::interpolate
}
Foam::tmp<Foam::vectorField>
Foam::sampledIsoSurface::interpolate
Foam::tmp<Foam::vectorField> Foam::sampledIsoSurface::interpolate
(
const interpolation<vector>& interpolator
) const
@ -643,8 +642,7 @@ Foam::sampledIsoSurface::interpolate
return interpolateField(interpolator);
}
Foam::tmp<Foam::sphericalTensorField>
Foam::sampledIsoSurface::interpolate
Foam::tmp<Foam::sphericalTensorField> Foam::sampledIsoSurface::interpolate
(
const interpolation<sphericalTensor>& interpolator
) const
@ -653,8 +651,7 @@ Foam::sampledIsoSurface::interpolate
}
Foam::tmp<Foam::symmTensorField>
Foam::sampledIsoSurface::interpolate
Foam::tmp<Foam::symmTensorField> Foam::sampledIsoSurface::interpolate
(
const interpolation<symmTensor>& interpolator
) const
@ -663,8 +660,7 @@ Foam::sampledIsoSurface::interpolate
}
Foam::tmp<Foam::tensorField>
Foam::sampledIsoSurface::interpolate
Foam::tmp<Foam::tensorField> Foam::sampledIsoSurface::interpolate
(
const interpolation<tensor>& interpolator
) const