zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: simpler logic for doTransform() check

Browse Source 
- test pTraits rank first (compile-time) and then parallel()
This commit is contained in:
Mark Olesen
2023-01-09 20:19:10 +01:00
parent 33c9df7741
commit 248e5ff86f
15 changed files with 45 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
View File

@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicPointPatchField_H #ifndef Foam_cyclicPointPatchField_H
#define cyclicPointPatchField_H #define Foam_cyclicPointPatchField_H
#include "coupledPointPatchField.H" #include "coupledPointPatchField.H"
#include "cyclicPointPatch.H" #include "cyclicPointPatch.H"
@ -142,7 +142,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !cyclicPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor

12
src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
View File

@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef processorPointPatchField_H #ifndef Foam_processorPointPatchField_H
#define processorPointPatchField_H #define Foam_processorPointPatchField_H
#include "coupledPointPatchField.H" #include "coupledPointPatchField.H"
#include "processorPointPatch.H" #include "processorPointPatch.H"
@ -145,10 +145,10 @@ public:
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return
!( (
procPatch_.procPolyPatch().parallel() pTraits<Type>::rank
|| pTraits<Type>::rank == 0 && !procPatch_.procPolyPatch().parallel()
); );
} }

12
src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
View File

@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef processorCyclicPointPatchField_H #ifndef Foam_processorCyclicPointPatchField_H
#define processorCyclicPointPatchField_H #define Foam_processorCyclicPointPatchField_H
#include "coupledPointPatchField.H" #include "coupledPointPatchField.H"
#include "processorCyclicPointPatch.H" #include "processorCyclicPointPatch.H"
@ -149,10 +149,10 @@ public:
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return
!( (
pTraits<Type>::rank == 0 pTraits<Type>::rank
|| procPatch_.procPolyPatch().parallel() && !procPatch_.procPolyPatch().parallel()
); );
} }

6
src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
View File

@ -39,8 +39,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicFaPatchField_H #ifndef Foam_cyclicFaPatchField_H
#define cyclicFaPatchField_H #define Foam_cyclicFaPatchField_H
#include "coupledFaPatchField.H" #include "coupledFaPatchField.H"
#include "cyclicLduInterfaceField.H" #include "cyclicLduInterfaceField.H"
@ -205,7 +205,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !cyclicPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor

6
src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
View File

@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef processorFaPatchField_H #ifndef Foam_processorFaPatchField_H
#define processorFaPatchField_H #define Foam_processorFaPatchField_H
#include "coupledFaPatchField.H" #include "coupledFaPatchField.H"
#include "processorLduInterfaceField.H" #include "processorLduInterfaceField.H"
@ -254,7 +254,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(procPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !procPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
View File

@ -53,8 +53,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicFvPatchField_H #ifndef Foam_cyclicFvPatchField_H
#define cyclicFvPatchField_H #define Foam_cyclicFvPatchField_H
#include "coupledFvPatchField.H" #include "coupledFvPatchField.H"
#include "cyclicLduInterfaceField.H" #include "cyclicLduInterfaceField.H"
@ -220,7 +220,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !cyclicPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor

2
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
View File

@ -183,7 +183,7 @@ Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
if (doTransform()) if (doTransform())
{ {
tpnf.ref() = transform(forwardT(), tpnf()); transform(tpnf.ref(), forwardT(), tpnf());
} }
return tpnf; return tpnf;

7
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
View File

@ -52,8 +52,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicACMIFvPatchField_H #ifndef Foam_cyclicACMIFvPatchField_H
#define cyclicACMIFvPatchField_H #define Foam_cyclicACMIFvPatchField_H
#include "coupledFvPatchField.H" #include "coupledFvPatchField.H"
#include "cyclicACMILduInterfaceField.H" #include "cyclicACMILduInterfaceField.H"
@ -255,8 +255,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return (pTraits<Type>::rank && !cyclicACMIPatch_.parallel());
!(cyclicACMIPatch_.parallel() || pTraits<Type>::rank == 0);
} }
//- Return face transformation tensor //- Return face transformation tensor

2
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
View File

@ -168,7 +168,7 @@ Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
if (doTransform()) if (doTransform())
{ {
tpnf.ref() = transform(forwardT(), tpnf()); transform(tpnf.ref(), forwardT(), tpnf());
} }
return tpnf; return tpnf;

8
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
View File

@ -57,9 +57,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicAMIFvPatchField_H #ifndef Foam_cyclicAMIFvPatchField_H
#define cyclicAMIFvPatchField_H #define Foam_cyclicAMIFvPatchField_H
#include "coupledFvPatchField.H" #include "coupledFvPatchField.H"
#include "cyclicAMILduInterfaceField.H" #include "cyclicAMILduInterfaceField.H"
@ -242,8 +241,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return (pTraits<Type>::rank && !cyclicAMIPatch_.parallel());
!(cyclicAMIPatch_.parallel() || pTraits<Type>::rank == 0);
} }
//- Return face transformation tensor //- Return face transformation tensor

2
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
View File

@ -120,7 +120,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
if (this->doTransform()) if (this->doTransform())
{ {
tpnf = transform(this->forwardT(), tpnf); transform(tpnf.ref(), this->forwardT(), tpnf());
} }
tmp<Field<Type>> tjf = jump(); tmp<Field<Type>> tjf = jump();

8
src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
View File

@ -47,8 +47,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef processorFvPatchField_H #ifndef Foam_processorFvPatchField_H
#define processorFvPatchField_H #define Foam_processorFvPatchField_H
#include "coupledFvPatchField.H" #include "coupledFvPatchField.H"
#include "processorLduInterfaceField.H" #include "processorLduInterfaceField.H"
@ -251,7 +251,6 @@ public:
const scalarField& coeffs, const scalarField& coeffs,
const Pstream::commsTypes commsType const Pstream::commsTypes commsType
) const; ) const;
//- Processor coupled interface functions //- Processor coupled interface functions
@ -277,7 +276,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(procPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !procPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor
@ -291,7 +290,6 @@ public:
{ {
return pTraits<Type>::rank; return pTraits<Type>::rank;
} }
}; };

6
src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
View File

@ -53,8 +53,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef processorCyclicFvPatchField_H #ifndef Foam_processorCyclicFvPatchField_H
#define processorCyclicFvPatchField_H #define Foam_processorCyclicFvPatchField_H
#include "processorCyclicFvPatch.H" #include "processorCyclicFvPatch.H"
#include "processorFvPatchField.H" #include "processorFvPatchField.H"
@ -162,7 +162,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return !(procPatch_.parallel() || pTraits<Type>::rank == 0); return (pTraits<Type>::rank && !procPatch_.parallel());
} }
//- Return face transformation tensor //- Return face transformation tensor

10
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
View File

@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicACMIPointPatchField_H #ifndef Foam_cyclicACMIPointPatchField_H
#define cyclicACMIPointPatchField_H #define Foam_cyclicACMIPointPatchField_H
#include "coupledPointPatchField.H" #include "coupledPointPatchField.H"
#include "cyclicACMIPointPatch.H" #include "cyclicACMIPointPatch.H"
@ -189,11 +189,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return (pTraits<Type>::rank && !cyclicACMIPatch_.parallel());
!(
cyclicACMIPatch_.parallel()
|| pTraits<Type>::rank == 0
);
} }
//- Return face transformation tensor //- Return face transformation tensor

10
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
View File

@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef cyclicAMIPointPatchField_H #ifndef Foam_cyclicAMIPointPatchField_H
#define cyclicAMIPointPatchField_H #define Foam_cyclicAMIPointPatchField_H
#include "coupledPointPatchField.H" #include "coupledPointPatchField.H"
#include "cyclicAMIPointPatch.H" #include "cyclicAMIPointPatch.H"
@ -189,11 +189,7 @@ public:
//- Does the patch field perform the transformation //- Does the patch field perform the transformation
virtual bool doTransform() const virtual bool doTransform() const
{ {
return return (pTraits<Type>::rank && !cyclicAMIPatch_.parallel());
!(
cyclicAMIPatch_.parallel()
|| pTraits<Type>::rank == 0
);
} }
//- Return face transformation tensor //- Return face transformation tensor