exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge of friend function declaration

Browse source
This commit is contained in:
Hrvoje Jasak 2019-04-25 11:12:34 +01:00
parent 84121da55f
commit 109b8456d8
28 changed files with 170 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/cshrc
View file

@ -172,7 +172,7 @@ if ( ! $?WM_NCOMPPROCS ) setenv WM_NCOMPPROCS `$WM_PROJECT_DIR/bin/foamGetSystem
# Run options (floating-point signal handling and memory initialisation)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv FOAM_SIGFPE
# setenv FOAM_SETNAN
setenv FOAM_SETNAN
# Detect system type and set environment variables

1
src/foam/algorithms/octree/octree/octreeDataPoint.H
View file

@ -56,7 +56,6 @@ template<class Type> class octree;
// Forward declaration of friend functions and operators
class octreeDataPoint;
Ostream& operator<<(Ostream&, const octreeDataPoint&);

1
src/foam/algorithms/octree/octree/treeBoundBox.H
View file

@ -71,7 +71,6 @@ class Random;
// Forward declaration of friend functions and operators
class treeBoundBox;
bool operator==(const treeBoundBox&, const treeBoundBox&);
bool operator!=(const treeBoundBox&, const treeBoundBox&);

1
src/foam/coordinateSystems/coordinateSystem.H
View file

@ -148,7 +148,6 @@ class boundBox;
// Forward declaration of friend functions and operators
class coordinateSystem;
bool operator!=(const coordinateSystem&, const coordinateSystem&);
Ostream& operator<<(Ostream&, const coordinateSystem&);

4
src/foam/db/IOstreams/Pstreams/Pstream.C
View file

@ -264,9 +264,9 @@ void Foam::Pstream::allocatePstreamCommunicator
if (index == PstreamGlobals::MPIGroups_.size())
{
// Extend storage with dummy values
MPI_Group newGroup;
MPI_Group newGroup = MPI_GROUP_NULL;
PstreamGlobals::MPIGroups_.append(newGroup);
MPI_Comm newComm;
MPI_Comm newComm = MPI_COMM_NULL;
PstreamGlobals::MPICommunicators_.append(newComm);
}
else if (index > PstreamGlobals::MPIGroups_.size())

1
src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H
View file

@ -53,7 +53,6 @@ namespace Foam
// Forward declaration of friend functions and operators
class dictionaryEntry;
Ostream& operator<<(Ostream&, const dictionaryEntry&);

1
src/foam/fields/CoeffField/diagTensorCoeffField.H
View file

@ -48,7 +48,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<diagTensor>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<diagTensor> >&);

1
src/foam/fields/CoeffField/scalarCoeffField.H
View file

@ -46,7 +46,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<scalar>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<scalar> >&);

1
src/foam/fields/CoeffField/sphericalTensorCoeffField.H
View file

@ -48,7 +48,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<sphericalTensor>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<sphericalTensor> >&);

1
src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H
View file

@ -48,7 +48,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<symmTensor4thOrder>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<symmTensor4thOrder> >&);

1
src/foam/fields/CoeffField/symmTensorCoeffField.H
View file

@ -48,7 +48,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<symmTensor>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<symmTensor> >&);

1
src/foam/fields/CoeffField/tensorCoeffField.H
View file

@ -48,7 +48,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const CoeffField<tensor>&);
Ostream& operator<<(Ostream&, const tmp<CoeffField<tensor> >&);

6
src/foam/interpolations/interpolationTable/interpolationTable.C
View file

@ -273,6 +273,7 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
<< " Zero rate of change."
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{
@ -306,6 +307,7 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
<< " Zero rate of change."
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{
@ -415,6 +417,7 @@ Foam::interpolationTable<Type>::operator[](const label i) const
<< " Continuing with the first entry"
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{
@ -449,6 +452,7 @@ Foam::interpolationTable<Type>::operator[](const label i) const
<< " Continuing with the last entry"
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{
@ -502,6 +506,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
<< " Continuing with the first entry"
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{
@ -535,6 +540,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
<< " Continuing with the last entry"
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case interpolationTable::CLAMP:
{

1
src/foam/matrices/LUscalarMatrix/procLduInterface.H
View file

@ -48,7 +48,6 @@ class lduInterfaceField;
// Forward declaration of friend functions and operators
class procLduInterface;
Ostream& operator<<(Ostream&, const procLduInterface&);

1
src/foam/matrices/crMatrix/crAddressing.H
View file

@ -48,7 +48,6 @@ namespace Foam
// Forward declaration of friend functions and operators
class crAddressing;
Ostream& operator<<(Ostream&, const crAddressing&);

1
src/foam/matrices/crMatrix/crMatrix.H
View file

@ -48,7 +48,6 @@ namespace Foam
// Forward declaration of friend functions and operators
class crMatrix;
Ostream& operator<<(Ostream&, const crMatrix&);

5
src/foam/meshes/boundBox/boundBox.H
View file

@ -39,10 +39,11 @@ Description
namespace Foam
{
// Forward declaration of friend functions and operators
class boundBox;
template<class T> class tmp;
// Forward declaration of friend functions and operators
class boundBox;
Istream& operator>>(Istream& is, boundBox&);
Ostream& operator<<(Ostream& os, const boundBox&);

1
src/foam/primitives/BlockCoeff/scalarBlockCoeff.H
View file

@ -43,7 +43,6 @@ namespace Foam
{
// Forward declaration of friend functions and operators
Ostream& operator<<(Ostream&, const BlockCoeff<scalar>&);

29
src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H
View file

@ -107,7 +107,10 @@ public:
// Access
//- Return component
inline const Cmpt& ii() const;
//- Return access to component
inline Cmpt& ii();
@ -116,6 +119,32 @@ public:
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// VectorSpace operations with component loops need specialisation
// HJ, 24/Apr/2019
template<class Cmpt>
inline Cmpt cmptMax(const SphericalTensor<Cmpt>& st)
{
return st.ii();
}
template<class Cmpt>
inline Cmpt cmptMin(const SphericalTensor<Cmpt>& st)
{
return st.ii();
}
template<class Cmpt>
inline Cmpt cmptSum(const SphericalTensor<Cmpt>& st)
{
return st.ii();
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

51
src/foam/primitives/VectorN/SphericalTensorN.H
View file

@ -25,8 +25,9 @@ Class
SphericalTensorN
Description
Templated NXN SphericalTensor derived from VectorSpace adding construction from
N components, and the inner-product (dot-product) and outer-product operators.
Templated NXN SphericalTensor derived from VectorSpace adding construction
from N components, and the inner-product (dot-product) and
outer-product operators.
SourceFiles
SphericalTensorNI.H
@ -44,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class DiagTensor Declaration
Class SphericalTensorN Declaration
\*---------------------------------------------------------------------------*/
template <class Cmpt, int length>
@ -73,13 +74,20 @@ public:
static const SphericalTensorN I;
//- Component labeling enumeration
enum components { II };
// Constructors
//- Construct null
inline SphericalTensorN();
//- Construct given VectorSpace
inline SphericalTensorN(const VectorSpace<SphericalTensorN<Cmpt, length>, Cmpt, 1>&);
inline SphericalTensorN
(
const VectorSpace<SphericalTensorN<Cmpt, length>, Cmpt, 1>&
);
//- Construct from Istream
inline SphericalTensorN(Istream&);
@ -90,6 +98,15 @@ public:
// Member Functions
// Access
//- Return component
inline const Cmpt& ii() const;
//- Return access to component
inline Cmpt& ii();
//- Diagonal
inline SphericalTensorN<Cmpt, length> diag() const;
@ -98,6 +115,32 @@ public:
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// VectorSpace operations with component loops need specialisation
// HJ, 24/Apr/2019
template<class Cmpt, int length>
inline Cmpt cmptMax(const SphericalTensorN<Cmpt, length>& st)
{
return st.ii();
}
template<class Cmpt, int length>
inline Cmpt cmptMin(const SphericalTensorN<Cmpt, length>& st)
{
return st.ii();
}
template<class Cmpt, int length>
inline Cmpt cmptSum(const SphericalTensorN<Cmpt, length>& st)
{
return st.ii();
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

2
src/foam/primitives/functions/Function1/Table/TableBase.C
View file

@ -239,6 +239,7 @@ bool Foam::Function1Types::TableBase<Type>::checkMinBounds
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case CLAMP:
{
@ -289,6 +290,7 @@ bool Foam::Function1Types::TableBase<Type>::checkMaxBounds
<< endl;
// fall-through to 'CLAMP'
[[fallthrough]];
}
case CLAMP:
{

100
src/foam/primitives/hashes/Hasher/Hasher.C
View file

@ -187,7 +187,7 @@ Description
// acceptable. Do NOT use for cryptographic purposes.
// ----------------------------------------------------------------------------
//- specialized little-endian code
// Specialized little-endian code
#if !defined (__BYTE_ORDER) || (__BYTE_ORDER == __LITTLE_ENDIAN)
static unsigned jenkins_hashlittle
(
@ -224,16 +224,16 @@ static unsigned jenkins_hashlittle
switch (length)
{
case 12: c += k[2]; b += k[1]; a += k[0]; break;
case 11: c += static_cast<uint32_t>(k8[10]) << 16; // fall through
case 10: c += static_cast<uint32_t>(k8[9]) << 8; // fall through
case 9 : c += k8[8]; // fall through
case 11: c += static_cast<uint32_t>(k8[10]) << 16; [[fallthrough]];
case 10: c += static_cast<uint32_t>(k8[9]) << 8; [[fallthrough]];
case 9 : c += k8[8]; [[fallthrough]];
case 8 : b += k[1]; a += k[0]; break;
case 7 : b += static_cast<uint32_t>(k8[6]) << 16; // fall through
case 6 : b += static_cast<uint32_t>(k8[5]) << 8; // fall through
case 5 : b += k8[4]; // fall through
case 7 : b += static_cast<uint32_t>(k8[6]) << 16; [[fallthrough]];
case 6 : b += static_cast<uint32_t>(k8[5]) << 8; [[fallthrough]];
case 5 : b += k8[4]; [[fallthrough]];
case 4 : a += k[0]; break;
case 3 : a += static_cast<uint32_t>(k8[2]) << 16; // fall through
case 2 : a += static_cast<uint32_t>(k8[1]) << 8; // fall through
case 3 : a += static_cast<uint32_t>(k8[2]) << 16; [[fallthrough]];
case 2 : a += static_cast<uint32_t>(k8[1]) << 8; [[fallthrough]];
case 1 : a += k8[0]; break;
case 0 : return c; // zero-length requires no mixing
}
@ -265,7 +265,7 @@ static unsigned jenkins_hashlittle
break;
case 11:
c += static_cast<uint32_t>(k8[10]) << 16;
// fall through
[[fallthrough]];
case 10:
c += k[4];
b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
@ -273,27 +273,27 @@ static unsigned jenkins_hashlittle
break;
case 9 :
c += k8[8];
// fall through
[[fallthrough]];
case 8 :
b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
break;
case 7 :
b += static_cast<uint32_t>(k8[6]) << 16;
// fall through
[[fallthrough]];
case 6 :
b += k[2];
a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
break;
case 5 :
b += k8[4];
// fall through
[[fallthrough]];
case 4 :
a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
break;
case 3 :
a += static_cast<uint32_t>(k8[2]) << 16;
// fall through
[[fallthrough]];
case 2 :
a += k[0];
break;
@ -331,19 +331,19 @@ static unsigned jenkins_hashlittle
// last block: affect all 32 bits of (c)
switch (length) // most case statements fall through
{
case 12: c += static_cast<uint32_t>(k[11]) << 24;
case 11: c += static_cast<uint32_t>(k[10]) << 16;
case 10: c += static_cast<uint32_t>(k[9]) << 8;
case 9 : c += k[8];
case 12: c += static_cast<uint32_t>(k[11]) << 24; [[fallthrough]];
case 11: c += static_cast<uint32_t>(k[10]) << 16; [[fallthrough]];
case 10: c += static_cast<uint32_t>(k[9]) << 8; [[fallthrough]];
case 9 : c += k[8]; [[fallthrough]];
case 8 : b += static_cast<uint32_t>(k[7]) << 24;
case 7 : b += static_cast<uint32_t>(k[6]) << 16;
case 6 : b += static_cast<uint32_t>(k[5]) << 8;
case 5 : b += k[4];
case 8 : b += static_cast<uint32_t>(k[7]) << 24; [[fallthrough]];
case 7 : b += static_cast<uint32_t>(k[6]) << 16; [[fallthrough]];
case 6 : b += static_cast<uint32_t>(k[5]) << 8; [[fallthrough]];
case 5 : b += k[4]; [[fallthrough]];
case 4 : a += static_cast<uint32_t>(k[3]) << 24;
case 3 : a += static_cast<uint32_t>(k[2]) << 16;
case 2 : a += static_cast<uint32_t>(k[1]) << 8;
case 4 : a += static_cast<uint32_t>(k[3]) << 24; [[fallthrough]];
case 3 : a += static_cast<uint32_t>(k[2]) << 16; [[fallthrough]];
case 2 : a += static_cast<uint32_t>(k[1]) << 8; [[fallthrough]];
case 1 : a += k[0];
break;
@ -403,16 +403,16 @@ static unsigned jenkins_hashbig
switch (length) // most the case statements fall through
{
case 12: c += k[2]; b += k[1]; a += k[0]; break;
case 11: c += static_cast<uint32_t>(k8[10]) << 8; // fall through
case 10: c += static_cast<uint32_t>(k8[9]) << 16; // fall through
case 9 : c += static_cast<uint32_t>(k8[8]) << 24; // fall through
case 11: c += static_cast<uint32_t>(k8[10]) << 8; [[fallthrough]];
case 10: c += static_cast<uint32_t>(k8[9]) << 16; [[fallthrough]];
case 9 : c += static_cast<uint32_t>(k8[8]) << 24; [[fallthrough]];
case 8 : b += k[1]; a += k[0]; break;
case 7 : b += static_cast<uint32_t>(k8[6]) << 8; // fall through
case 6 : b += static_cast<uint32_t>(k8[5]) << 16; // fall through
case 5 : b += static_cast<uint32_t>(k8[4]) << 24; // fall through
case 7 : b += static_cast<uint32_t>(k8[6]) << 8; [[fallthrough]];
case 6 : b += static_cast<uint32_t>(k8[5]) << 16; [[fallthrough]];
case 5 : b += static_cast<uint32_t>(k8[4]) << 24; [[fallthrough]];
case 4 : a += k[0]; break;
case 3 : a += static_cast<uint32_t>(k8[2]) << 8; // fall through
case 2 : a += static_cast<uint32_t>(k8[1]) << 16; // fall through
case 3 : a += static_cast<uint32_t>(k8[2]) << 8; [[fallthrough]];
case 2 : a += static_cast<uint32_t>(k8[1]) << 16; [[fallthrough]];
case 1 : a += static_cast<uint32_t>(k8[0]) << 24; break;
case 0 : return c;
}
@ -446,18 +446,18 @@ static unsigned jenkins_hashbig
// last block: affect all 32 bits of (c)
switch (length) // the case statements fall through
{
case 12: c += k[11];
case 11: c += static_cast<uint32_t>(k[10]) << 8;
case 10: c += static_cast<uint32_t>(k[9]) << 16;
case 9 : c += static_cast<uint32_t>(k[8]) << 24;
case 8 : b += k[7];
case 7 : b += static_cast<uint32_t>(k[6]) << 8;
case 6 : b += static_cast<uint32_t>(k[5]) << 16;
case 5 : b += static_cast<uint32_t>(k[4]) << 24;
case 4 : a += k[3];
case 3 : a += static_cast<uint32_t>(k[2]) << 8;
case 2 : a += static_cast<uint32_t>(k[1]) << 16;
case 1 : a += static_cast<uint32_t>(k[0]) << 24;
case 12: c += k[11]; [[fallthrough]];
case 11: c += static_cast<uint32_t>(k[10]) << 8; [[fallthrough]];
case 10: c += static_cast<uint32_t>(k[9]) << 16; [[fallthrough]];
case 9 : c += static_cast<uint32_t>(k[8]) << 24; [[fallthrough]];
case 8 : b += k[7]; [[fallthrough]];
case 7 : b += static_cast<uint32_t>(k[6]) << 8; [[fallthrough]];
case 6 : b += static_cast<uint32_t>(k[5]) << 16; [[fallthrough]];
case 5 : b += static_cast<uint32_t>(k[4]) << 24; [[fallthrough]];
case 4 : a += k[3]; [[fallthrough]];
case 3 : a += static_cast<uint32_t>(k[2]) << 8; [[fallthrough]];
case 2 : a += static_cast<uint32_t>(k[1]) << 16; [[fallthrough]];
case 1 : a += static_cast<uint32_t>(k[0]) << 24; [[fallthrough]];
break;
case 0 : return c;
}
@ -539,10 +539,11 @@ unsigned Foam::HasherInt
// handle the last 3 uint32_t's
switch (length) // all case statements fall through
{
case 3 : c += k[2];
case 2 : b += k[1];
case 3 : c += k[2]; [[fallthrough]];
case 2 : b += k[1]; [[fallthrough]];
case 1 : a += k[0];
bitMixerFinal(a,b,c);
[[fallthrough]];
case 0 : // case 0: nothing left to add
break;
}
@ -585,10 +586,11 @@ unsigned Foam::HasherDual
// handle the last 3 uint32_t's
switch (length) // all case statements fall through
{
case 3 : c += k[2];
case 2 : b += k[1];
case 3 : c += k[2]; [[fallthrough]];
case 2 : b += k[1]; [[fallthrough]];
case 1 : a += k[0];
bitMixerFinal(a,b,c);
[[fallthrough]];
case 0 : // case 0: nothing left to add
break;
}

1
src/foam/primitives/strings/keyType/keyType.H
View file

@ -51,7 +51,6 @@ class Ostream;
// Forward declaration of friend functions and operators
class keyType;
Istream& operator>>(Istream&, keyType&);
Ostream& operator<<(Ostream&, const keyType&);

1
src/surfMesh/surfZone/surfZone/surfZoneIOList.H
View file

@ -47,7 +47,6 @@ namespace Foam
// Forward declaration of friend functions and operators
class surfZoneIOList;
Ostream& operator<<(Ostream&, const surfZoneIOList&);

1
src/surfMesh/surfaceFormats/stl/STLtriangle.H
View file

@ -46,7 +46,6 @@ namespace Foam
// Forward declaration of friend functions and operators
class STLtriangle;
Ostream& operator<<(Ostream&, const STLtriangle&);

7
src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
View file

@ -128,9 +128,9 @@ void Foam::gradientEnthalpyFvPatchScalarField::updateCoeffs()
if
(
!this->db().objectRegistry::found(UName)
|| !this->db().objectRegistry::found(URotName)
|| !this->db().objectRegistry::found(UThetaName)
!this->db().objectRegistry::foundObject<volVectorField>(UName)
|| !this->db().objectRegistry::foundObject<volVectorField>(URotName)
|| !this->db().objectRegistry::foundObject<volScalarField>(UThetaName)
)
{
// Velocities not available, do not update
@ -144,6 +144,7 @@ void Foam::gradientEnthalpyFvPatchScalarField::updateCoeffs()
<< "Performing enthalpy value update for field "
<< this->dimensionedInternalField().name()
<< " and patch " << patchi
<< nl << "objects" << this->db().objectRegistry::sortedToc()
<< endl;
gradient() = thermo.Cp(Tw, patchi)*Tw.snGrad()

19
src/thermophysicalModels/specie/Make/files
View file

@ -16,4 +16,23 @@ $(reactions)/makeChemkinReactions.C
$(reactions)/makeReactionThermoReactions.C
$(reactions)/makeLangmuirHinshelwoodReactions.C
DegussaProcess = reaction/reactionRate/DegussaProcess
$(DegussaProcess)/DegussaConstants.C
$(DegussaProcess)/Degussa1ReactionRate.C
$(DegussaProcess)/Degussa1aReactionRate.C
$(DegussaProcess)/Degussa2ReactionRate.C
$(DegussaProcess)/Degussa3ReactionRate.C
$(DegussaProcess)/Degussa4ReactionRate.C
$(DegussaProcess)/Degussa5ReactionRate.C
$(DegussaProcess)/Degussa6ReactionRate.C
$(DegussaProcess)/Degussa7ReactionRate.C
$(DegussaProcess)/Degussa8ReactionRate.C
$(DegussaProcess)/Degussa9ReactionRate.C
$(DegussaProcess)/Degussa10ReactionRate.C
$(DegussaProcess)/Degussa11ReactionRate.C
$(DegussaProcess)/Degussa12ReactionRate.C
$(DegussaProcess)/Degussa13aReactionRate.C
$(DegussaProcess)/Degussa13bReactionRate.C
$(reactions)/makeDegussaProcessReactions.C
LIB = $(FOAM_LIBBIN)/libspecie