From d0a6150dc3443c5a6e238c60ad8b27a028f69d04 Mon Sep 17 00:00:00 2001 From: Ivor Clifford Date: Mon, 24 Oct 2011 13:26:58 -0600 Subject: [PATCH] Fixed GGI transform --- .../ggiLduInterfaceField.H | 22 ------------------- .../constraint/cyclicGgi/cyclicGgiPolyPatch.C | 2 +- .../constraint/cyclicGgi/cyclicGgiPolyPatch.H | 2 +- .../polyPatches/constraint/ggi/ggiPolyPatch.C | 2 +- .../polyPatches/constraint/ggi/ggiPolyPatch.H | 2 +- .../cyclicGgi/cyclicGgiFvPatchFields.C | 9 +------- 6 files changed, 5 insertions(+), 34 deletions(-) diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/ggiLduInterfaceField/ggiLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/ggiLduInterfaceField/ggiLduInterfaceField.H index 261b91168..32a2a91c9 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/ggiLduInterfaceField/ggiLduInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/ggiLduInterfaceField/ggiLduInterfaceField.H @@ -95,24 +95,8 @@ public: scalarField& psiInternal, const direction cmpt ) const; - - - //- Transform given patch internal field - template - void transformCoupleField - ( - Field& psiInternal - ) const; }; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//- Transform given patch internal field -template<> -void ggiLduInterfaceField::transformCoupleField -( - scalarField& psiInternal -) const; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -120,12 +104,6 @@ void ggiLduInterfaceField::transformCoupleField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "ggiLduInterfaceFieldTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C index aebb0d6c1..74d0a2717 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C @@ -241,7 +241,7 @@ const Foam::cyclicGgiPolyPatch& Foam::cyclicGgiPolyPatch::cyclicShadow() const } -void Foam::cyclicGgiPolyPatch::calcTransforms() +void Foam::cyclicGgiPolyPatch::calcTransforms() const { if (active() && debug) { diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.H index 48034ea98..f686557b2 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.H @@ -75,7 +75,7 @@ class cyclicGgiPolyPatch //- Calculate cyclic transforms (rotation and translation) // Virtual over-ride for base GGI patch. HJ, 14/Jan/2009 - virtual void calcTransforms(); + virtual void calcTransforms() const; //- Check definition: angles and offsets void checkDefinition() const; diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C index 664dffd09..f6298e540 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C @@ -859,7 +859,7 @@ void Foam::ggiPolyPatch::updateMesh() } -void Foam::ggiPolyPatch::calcTransforms() +void Foam::ggiPolyPatch::calcTransforms() const { // Simplest GGI: no transform or separation. HJ, 24/Oct/2008 forwardT_.setSize(0); diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H index c96f41df6..e3e7b5685 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H @@ -127,7 +127,7 @@ class ggiPolyPatch void calcReconFaceCellCentres() const; //- Force calculation of transformation tensors - virtual void calcTransforms(); + virtual void calcTransforms() const; // Parallel communication optimisation, stored on master processor diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchFields.C index 6f6b8105d..8bb29e950 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchFields.C @@ -106,14 +106,7 @@ void cyclicGgiFvPatchField::initInterfaceMatrixUpdate sField[i] = psiInternal[sfc[i]]; } - // Transform according to the transformation tensor, using the slave - // side transform. Warning: forwardT() corresponds to the slave - // patch. HJ, 12/Jan/2009 - transformCoupleField(sField); - - // Note: scalar interpolate does not get a transform, so this is safe - // HJ, 12/Jan/2009 - // TODO - IC, Is this safe for vectors? + // Transformation is handled in interpolation. HJ, 7/Jan/2009 Field pnf = cyclicGgiPatch_.interpolate(sField); if (coeffs.activeType() == blockCoeffBase::SCALAR)