Minor renaming
This commit is contained in:
parent
fc0cbfa6b4
commit
af06811c2a
7 changed files with 22 additions and 22 deletions
|
@ -21,7 +21,7 @@ LINK_DIRECTORIES(
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
$ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
|
$ENV{WM_PROJECT_DIR}/src/foam/lnInclude
|
||||||
$ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
|
$ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
|
||||||
${PROJECT_SOURCE_DIR}/../vtkPV4Foam
|
${PROJECT_SOURCE_DIR}/../vtkPV4Foam
|
||||||
)
|
)
|
||||||
|
@ -53,7 +53,7 @@ ADD_PARAVIEW_PLUGIN(
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(
|
TARGET_LINK_LIBRARIES(
|
||||||
PV4FoamReader_SM
|
PV4FoamReader_SM
|
||||||
OpenFOAM
|
foam
|
||||||
finiteVolume
|
finiteVolume
|
||||||
vtkPV4Foam
|
vtkPV4Foam
|
||||||
pqCore
|
pqCore
|
||||||
|
|
|
@ -26,8 +26,8 @@ InClass
|
||||||
|
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#ifndef vtkFOAMTupleRemap_H
|
#ifndef vtkFoamTupleRemap_H
|
||||||
#define vtkFOAMTupleRemap_H
|
#define vtkFoamTupleRemap_H
|
||||||
|
|
||||||
// FOAM includes
|
// FOAM includes
|
||||||
#include "StaticAssert.H"
|
#include "StaticAssert.H"
|
||||||
|
@ -36,7 +36,7 @@ InClass
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
inline void vtkFOAMTupleRemap(float vec[]);
|
inline void vtkFoamTupleRemap(float vec[]);
|
||||||
|
|
||||||
|
|
||||||
// a symmTensor specialization to remap FOAM -> ParaView naming order
|
// a symmTensor specialization to remap FOAM -> ParaView naming order
|
||||||
|
@ -52,7 +52,7 @@ StaticAssert(Foam::symmTensor::nComponents == 6);
|
||||||
|
|
||||||
// Template specialization for symmTensor
|
// Template specialization for symmTensor
|
||||||
template<>
|
template<>
|
||||||
inline void vtkFOAMTupleRemap<Foam::symmTensor>(float vec[])
|
inline void vtkFoamTupleRemap<Foam::symmTensor>(float vec[])
|
||||||
{
|
{
|
||||||
Foam::Swap(vec[1], vec[3]); // swap XY <-> YY
|
Foam::Swap(vec[1], vec[3]); // swap XY <-> YY
|
||||||
Foam::Swap(vec[2], vec[5]); // swap XZ <-> ZZ
|
Foam::Swap(vec[2], vec[5]); // swap XZ <-> ZZ
|
||||||
|
@ -60,7 +60,7 @@ inline void vtkFOAMTupleRemap<Foam::symmTensor>(float vec[])
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
inline void vtkFOAMTupleRemap(float vec[])
|
inline void vtkFoamTupleRemap(float vec[])
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ InClass
|
||||||
#include "vtkMultiBlockDataSet.h"
|
#include "vtkMultiBlockDataSet.h"
|
||||||
#include "vtkPolyData.h"
|
#include "vtkPolyData.h"
|
||||||
|
|
||||||
#include "vtkFOAMTupleRemap.H"
|
#include "vtkFoamTupleRemap.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::convertFaceField
|
||||||
vec[d] = 0;
|
vec[d] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
cellData->InsertTuple(faceI, vec);
|
cellData->InsertTuple(faceI, vec);
|
||||||
}
|
}
|
||||||
|
@ -186,7 +186,7 @@ void Foam::vtkPV4Foam::convertFaceField
|
||||||
vec[d] = 0;
|
vec[d] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
cellData->InsertTuple(faceI, vec);
|
cellData->InsertTuple(faceI, vec);
|
||||||
++faceI;
|
++faceI;
|
||||||
|
|
|
@ -31,7 +31,7 @@ InClass
|
||||||
|
|
||||||
#include "Cloud.H"
|
#include "Cloud.H"
|
||||||
|
|
||||||
#include "vtkFOAMTupleRemap.H"
|
#include "vtkFoamTupleRemap.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ void Foam::vtkPV4Foam::convertLagrangianField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i, vec);
|
pointData->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ InClass
|
||||||
#include "vtkPointData.h"
|
#include "vtkPointData.h"
|
||||||
#include "vtkPolyData.h"
|
#include "vtkPolyData.h"
|
||||||
|
|
||||||
#include "vtkFOAMTupleRemap.H"
|
#include "vtkFoamTupleRemap.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ void Foam::vtkPV4Foam::convertPatchField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
cellData->InsertTuple(i, vec);
|
cellData->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
@ -108,7 +108,7 @@ void Foam::vtkPV4Foam::convertPatchPointField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i, vec);
|
pointData->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ InClass
|
||||||
// Foam includes
|
// Foam includes
|
||||||
#include "interpolatePointToCell.H"
|
#include "interpolatePointToCell.H"
|
||||||
|
|
||||||
#include "vtkFOAMTupleRemap.H"
|
#include "vtkFoamTupleRemap.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ void Foam::vtkPV4Foam::convertPointField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i, vec);
|
pointData->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
@ -229,7 +229,7 @@ void Foam::vtkPV4Foam::convertPointField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i, vec);
|
pointData->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
@ -247,7 +247,7 @@ void Foam::vtkPV4Foam::convertPointField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i++, vec);
|
pointData->InsertTuple(i++, vec);
|
||||||
}
|
}
|
||||||
|
@ -261,7 +261,7 @@ void Foam::vtkPV4Foam::convertPointField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
pointData->InsertTuple(i++, vec);
|
pointData->InsertTuple(i++, vec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ InClass
|
||||||
#include "vtkPV4FoamFaceField.H"
|
#include "vtkPV4FoamFaceField.H"
|
||||||
#include "vtkPV4FoamPatchField.H"
|
#include "vtkPV4FoamPatchField.H"
|
||||||
|
|
||||||
#include "vtkFOAMTupleRemap.H"
|
#include "vtkFoamTupleRemap.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -355,7 +355,7 @@ void Foam::vtkPV4Foam::convertVolField
|
||||||
{
|
{
|
||||||
vec[d] = component(t, d);
|
vec[d] = component(t, d);
|
||||||
}
|
}
|
||||||
vtkFOAMTupleRemap<Type>(vec);
|
vtkFoamTupleRemap<Type>(vec);
|
||||||
|
|
||||||
celldata->InsertTuple(i, vec);
|
celldata->InsertTuple(i, vec);
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue