diff --git a/etc/cshrc b/etc/cshrc index 1214a2fd3..f814072cd 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -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 diff --git a/src/foam/algorithms/octree/octree/octreeDataPoint.H b/src/foam/algorithms/octree/octree/octreeDataPoint.H index bdf816acf..ee27781bb 100644 --- a/src/foam/algorithms/octree/octree/octreeDataPoint.H +++ b/src/foam/algorithms/octree/octree/octreeDataPoint.H @@ -56,7 +56,6 @@ template class octree; // Forward declaration of friend functions and operators class octreeDataPoint; - Ostream& operator<<(Ostream&, const octreeDataPoint&); diff --git a/src/foam/algorithms/octree/octree/treeBoundBox.H b/src/foam/algorithms/octree/octree/treeBoundBox.H index 2ddc1a2e0..a9d900803 100644 --- a/src/foam/algorithms/octree/octree/treeBoundBox.H +++ b/src/foam/algorithms/octree/octree/treeBoundBox.H @@ -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&); diff --git a/src/foam/coordinateSystems/coordinateSystem.H b/src/foam/coordinateSystems/coordinateSystem.H index ea6c459be..d207abd56 100644 --- a/src/foam/coordinateSystems/coordinateSystem.H +++ b/src/foam/coordinateSystems/coordinateSystem.H @@ -148,13 +148,12 @@ class boundBox; // Forward declaration of friend functions and operators class coordinateSystem; - bool operator!=(const coordinateSystem&, const coordinateSystem&); Ostream& operator<<(Ostream&, const coordinateSystem&); /*---------------------------------------------------------------------------*\ - Class coordinateSystem Declaration + Class coordinateSystem Declaration \*---------------------------------------------------------------------------*/ class coordinateSystem diff --git a/src/foam/db/IOstreams/Pstreams/Pstream.C b/src/foam/db/IOstreams/Pstreams/Pstream.C index 7af8d838a..0c6afaa97 100644 --- a/src/foam/db/IOstreams/Pstreams/Pstream.C +++ b/src/foam/db/IOstreams/Pstreams/Pstream.C @@ -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()) diff --git a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H index bd0e60df9..e1627529d 100644 --- a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H +++ b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H @@ -53,7 +53,6 @@ namespace Foam // Forward declaration of friend functions and operators class dictionaryEntry; - Ostream& operator<<(Ostream&, const dictionaryEntry&); diff --git a/src/foam/fields/CoeffField/diagTensorCoeffField.H b/src/foam/fields/CoeffField/diagTensorCoeffField.H index 8e1189ce4..2a5125e9f 100644 --- a/src/foam/fields/CoeffField/diagTensorCoeffField.H +++ b/src/foam/fields/CoeffField/diagTensorCoeffField.H @@ -48,7 +48,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/scalarCoeffField.H b/src/foam/fields/CoeffField/scalarCoeffField.H index 13357ec73..7a39bd38a 100644 --- a/src/foam/fields/CoeffField/scalarCoeffField.H +++ b/src/foam/fields/CoeffField/scalarCoeffField.H @@ -46,7 +46,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H index fec8a0f73..5296e268b 100644 --- a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H +++ b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H @@ -48,7 +48,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H index e7303216b..1eb3ac7f9 100644 --- a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H @@ -48,7 +48,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/symmTensorCoeffField.H b/src/foam/fields/CoeffField/symmTensorCoeffField.H index 4a424e246..6c928b382 100644 --- a/src/foam/fields/CoeffField/symmTensorCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensorCoeffField.H @@ -48,7 +48,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/tensorCoeffField.H b/src/foam/fields/CoeffField/tensorCoeffField.H index 8fc9a7c84..c9a45ba3a 100644 --- a/src/foam/fields/CoeffField/tensorCoeffField.H +++ b/src/foam/fields/CoeffField/tensorCoeffField.H @@ -48,7 +48,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const CoeffField&); Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/interpolations/interpolationTable/interpolationTable.C b/src/foam/interpolations/interpolationTable/interpolationTable.C index 8e429006c..766f463c3 100644 --- a/src/foam/interpolations/interpolationTable/interpolationTable.C +++ b/src/foam/interpolations/interpolationTable/interpolationTable.C @@ -273,6 +273,7 @@ Type Foam::interpolationTable::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::rateOfChange(const scalar value) const << " Zero rate of change." << endl; // fall-through to 'CLAMP' + [[fallthrough]]; } case interpolationTable::CLAMP: { @@ -415,6 +417,7 @@ Foam::interpolationTable::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::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::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::operator()(const scalar value) const << " Continuing with the last entry" << endl; // fall-through to 'CLAMP' + [[fallthrough]]; } case interpolationTable::CLAMP: { diff --git a/src/foam/matrices/LUscalarMatrix/procLduInterface.H b/src/foam/matrices/LUscalarMatrix/procLduInterface.H index d5470eae7..96eb19b56 100644 --- a/src/foam/matrices/LUscalarMatrix/procLduInterface.H +++ b/src/foam/matrices/LUscalarMatrix/procLduInterface.H @@ -48,7 +48,6 @@ class lduInterfaceField; // Forward declaration of friend functions and operators class procLduInterface; - Ostream& operator<<(Ostream&, const procLduInterface&); diff --git a/src/foam/matrices/crMatrix/crAddressing.H b/src/foam/matrices/crMatrix/crAddressing.H index 605a22f5d..d98a7a233 100644 --- a/src/foam/matrices/crMatrix/crAddressing.H +++ b/src/foam/matrices/crMatrix/crAddressing.H @@ -48,7 +48,6 @@ namespace Foam // Forward declaration of friend functions and operators class crAddressing; - Ostream& operator<<(Ostream&, const crAddressing&); diff --git a/src/foam/matrices/crMatrix/crMatrix.H b/src/foam/matrices/crMatrix/crMatrix.H index 5a5ba50a3..8056cd02f 100644 --- a/src/foam/matrices/crMatrix/crMatrix.H +++ b/src/foam/matrices/crMatrix/crMatrix.H @@ -48,7 +48,6 @@ namespace Foam // Forward declaration of friend functions and operators class crMatrix; - Ostream& operator<<(Ostream&, const crMatrix&); diff --git a/src/foam/meshes/boundBox/boundBox.H b/src/foam/meshes/boundBox/boundBox.H index 8d2742abb..bf6585f9e 100644 --- a/src/foam/meshes/boundBox/boundBox.H +++ b/src/foam/meshes/boundBox/boundBox.H @@ -39,10 +39,11 @@ Description namespace Foam { -// Forward declaration of friend functions and operators -class boundBox; template class tmp; +// Forward declaration of friend functions and operators + +class boundBox; Istream& operator>>(Istream& is, boundBox&); Ostream& operator<<(Ostream& os, const boundBox&); diff --git a/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H b/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H index d7385e44a..ff812b906 100644 --- a/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H +++ b/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H @@ -43,7 +43,6 @@ namespace Foam { // Forward declaration of friend functions and operators - Ostream& operator<<(Ostream&, const BlockCoeff&); diff --git a/src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H b/src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H index df27abb42..fcb585ae5 100644 --- a/src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H +++ b/src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H @@ -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 +inline Cmpt cmptMax(const SphericalTensor& st) +{ + return st.ii(); +} + + +template +inline Cmpt cmptMin(const SphericalTensor& st) +{ + return st.ii(); +} + + +template +inline Cmpt cmptSum(const SphericalTensor& st) +{ + return st.ii(); +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/foam/primitives/VectorN/SphericalTensorN.H b/src/foam/primitives/VectorN/SphericalTensorN.H index fcedbf177..05e0e42d2 100644 --- a/src/foam/primitives/VectorN/SphericalTensorN.H +++ b/src/foam/primitives/VectorN/SphericalTensorN.H @@ -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 @@ -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, Cmpt, 1>&); + inline SphericalTensorN + ( + const VectorSpace, 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 diag() const; @@ -98,6 +115,32 @@ public: }; +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// VectorSpace operations with component loops need specialisation +// HJ, 24/Apr/2019 + +template +inline Cmpt cmptMax(const SphericalTensorN& st) +{ + return st.ii(); +} + + +template +inline Cmpt cmptMin(const SphericalTensorN& st) +{ + return st.ii(); +} + + +template +inline Cmpt cmptSum(const SphericalTensorN& st) +{ + return st.ii(); +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/foam/primitives/VectorSpace/VectorSpaceI.H b/src/foam/primitives/VectorSpace/VectorSpaceI.H index e8c95ff8f..d9989ddb4 100644 --- a/src/foam/primitives/VectorSpace/VectorSpaceI.H +++ b/src/foam/primitives/VectorSpace/VectorSpaceI.H @@ -658,7 +658,7 @@ inline Cmpt operator&& ) { Cmpt ddProd = vs1.v_[0]*vs2.v_[0]; - for (int i=1; i::checkMinBounds << endl; // fall-through to 'CLAMP' + [[fallthrough]]; } case CLAMP: { @@ -289,6 +290,7 @@ bool Foam::Function1Types::TableBase::checkMaxBounds << endl; // fall-through to 'CLAMP' + [[fallthrough]]; } case CLAMP: { diff --git a/src/foam/primitives/hashes/Hasher/Hasher.C b/src/foam/primitives/hashes/Hasher/Hasher.C index a47de699c..e26ba7262 100644 --- a/src/foam/primitives/hashes/Hasher/Hasher.C +++ b/src/foam/primitives/hashes/Hasher/Hasher.C @@ -29,7 +29,7 @@ Description #include "HasherInt.H" #if defined (__GLIBC__) -# include +# include #endif // Left-rotate a 32-bit value and carry by nBits @@ -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(k8[10]) << 16; // fall through - case 10: c += static_cast(k8[9]) << 8; // fall through - case 9 : c += k8[8]; // fall through + case 11: c += static_cast(k8[10]) << 16; [[fallthrough]]; + case 10: c += static_cast(k8[9]) << 8; [[fallthrough]]; + case 9 : c += k8[8]; [[fallthrough]]; case 8 : b += k[1]; a += k[0]; break; - case 7 : b += static_cast(k8[6]) << 16; // fall through - case 6 : b += static_cast(k8[5]) << 8; // fall through - case 5 : b += k8[4]; // fall through + case 7 : b += static_cast(k8[6]) << 16; [[fallthrough]]; + case 6 : b += static_cast(k8[5]) << 8; [[fallthrough]]; + case 5 : b += k8[4]; [[fallthrough]]; case 4 : a += k[0]; break; - case 3 : a += static_cast(k8[2]) << 16; // fall through - case 2 : a += static_cast(k8[1]) << 8; // fall through + case 3 : a += static_cast(k8[2]) << 16; [[fallthrough]]; + case 2 : a += static_cast(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(k8[10]) << 16; - // fall through + [[fallthrough]]; case 10: c += k[4]; b += k[2] + (static_cast(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(k[3]) << 16); a += k[0] + (static_cast(k[1]) << 16); break; case 7 : b += static_cast(k8[6]) << 16; - // fall through + [[fallthrough]]; case 6 : b += k[2]; a += k[0] + (static_cast(k[1]) << 16); break; case 5 : b += k8[4]; - // fall through + [[fallthrough]]; case 4 : a += k[0] + (static_cast(k[1]) << 16); break; case 3 : a += static_cast(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(k[11]) << 24; - case 11: c += static_cast(k[10]) << 16; - case 10: c += static_cast(k[9]) << 8; - case 9 : c += k[8]; + case 12: c += static_cast(k[11]) << 24; [[fallthrough]]; + case 11: c += static_cast(k[10]) << 16; [[fallthrough]]; + case 10: c += static_cast(k[9]) << 8; [[fallthrough]]; + case 9 : c += k[8]; [[fallthrough]]; - case 8 : b += static_cast(k[7]) << 24; - case 7 : b += static_cast(k[6]) << 16; - case 6 : b += static_cast(k[5]) << 8; - case 5 : b += k[4]; + case 8 : b += static_cast(k[7]) << 24; [[fallthrough]]; + case 7 : b += static_cast(k[6]) << 16; [[fallthrough]]; + case 6 : b += static_cast(k[5]) << 8; [[fallthrough]]; + case 5 : b += k[4]; [[fallthrough]]; - case 4 : a += static_cast(k[3]) << 24; - case 3 : a += static_cast(k[2]) << 16; - case 2 : a += static_cast(k[1]) << 8; + case 4 : a += static_cast(k[3]) << 24; [[fallthrough]]; + case 3 : a += static_cast(k[2]) << 16; [[fallthrough]]; + case 2 : a += static_cast(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(k8[10]) << 8; // fall through - case 10: c += static_cast(k8[9]) << 16; // fall through - case 9 : c += static_cast(k8[8]) << 24; // fall through + case 11: c += static_cast(k8[10]) << 8; [[fallthrough]]; + case 10: c += static_cast(k8[9]) << 16; [[fallthrough]]; + case 9 : c += static_cast(k8[8]) << 24; [[fallthrough]]; case 8 : b += k[1]; a += k[0]; break; - case 7 : b += static_cast(k8[6]) << 8; // fall through - case 6 : b += static_cast(k8[5]) << 16; // fall through - case 5 : b += static_cast(k8[4]) << 24; // fall through + case 7 : b += static_cast(k8[6]) << 8; [[fallthrough]]; + case 6 : b += static_cast(k8[5]) << 16; [[fallthrough]]; + case 5 : b += static_cast(k8[4]) << 24; [[fallthrough]]; case 4 : a += k[0]; break; - case 3 : a += static_cast(k8[2]) << 8; // fall through - case 2 : a += static_cast(k8[1]) << 16; // fall through + case 3 : a += static_cast(k8[2]) << 8; [[fallthrough]]; + case 2 : a += static_cast(k8[1]) << 16; [[fallthrough]]; case 1 : a += static_cast(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(k[10]) << 8; - case 10: c += static_cast(k[9]) << 16; - case 9 : c += static_cast(k[8]) << 24; - case 8 : b += k[7]; - case 7 : b += static_cast(k[6]) << 8; - case 6 : b += static_cast(k[5]) << 16; - case 5 : b += static_cast(k[4]) << 24; - case 4 : a += k[3]; - case 3 : a += static_cast(k[2]) << 8; - case 2 : a += static_cast(k[1]) << 16; - case 1 : a += static_cast(k[0]) << 24; + case 12: c += k[11]; [[fallthrough]]; + case 11: c += static_cast(k[10]) << 8; [[fallthrough]]; + case 10: c += static_cast(k[9]) << 16; [[fallthrough]]; + case 9 : c += static_cast(k[8]) << 24; [[fallthrough]]; + case 8 : b += k[7]; [[fallthrough]]; + case 7 : b += static_cast(k[6]) << 8; [[fallthrough]]; + case 6 : b += static_cast(k[5]) << 16; [[fallthrough]]; + case 5 : b += static_cast(k[4]) << 24; [[fallthrough]]; + case 4 : a += k[3]; [[fallthrough]]; + case 3 : a += static_cast(k[2]) << 8; [[fallthrough]]; + case 2 : a += static_cast(k[1]) << 16; [[fallthrough]]; + case 1 : a += static_cast(k[0]) << 24; [[fallthrough]]; break; case 0 : return c; } @@ -480,11 +480,11 @@ unsigned Foam::Hasher ) { #ifdef __BYTE_ORDER -# if (__BYTE_ORDER == __BIG_ENDIAN) +#if (__BYTE_ORDER == __BIG_ENDIAN) return jenkins_hashbig(key, length, initval); -# else +#else return jenkins_hashlittle(key, length, initval); -# endif +#endif #else // endian-ness not known at compile-time: runtime endian test const short endianTest = 0x0100; @@ -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; } diff --git a/src/foam/primitives/strings/keyType/keyType.H b/src/foam/primitives/strings/keyType/keyType.H index 32a3b52ab..af150d609 100644 --- a/src/foam/primitives/strings/keyType/keyType.H +++ b/src/foam/primitives/strings/keyType/keyType.H @@ -51,7 +51,6 @@ class Ostream; // Forward declaration of friend functions and operators class keyType; - Istream& operator>>(Istream&, keyType&); Ostream& operator<<(Ostream&, const keyType&); diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H index 2de1e0571..3b9929580 100644 --- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H +++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H @@ -47,7 +47,6 @@ namespace Foam // Forward declaration of friend functions and operators class surfZoneIOList; - Ostream& operator<<(Ostream&, const surfZoneIOList&); diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangle.H b/src/surfMesh/surfaceFormats/stl/STLtriangle.H index aef7de706..c1357632c 100644 --- a/src/surfMesh/surfaceFormats/stl/STLtriangle.H +++ b/src/surfMesh/surfaceFormats/stl/STLtriangle.H @@ -46,7 +46,6 @@ namespace Foam // Forward declaration of friend functions and operators class STLtriangle; - Ostream& operator<<(Ostream&, const STLtriangle&); diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C index c335a8809..f3127f036 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C @@ -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(UName) + || !this->db().objectRegistry::foundObject(URotName) + || !this->db().objectRegistry::foundObject(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() diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files index 3aa166ed1..d4bf988f0 100644 --- a/src/thermophysicalModels/specie/Make/files +++ b/src/thermophysicalModels/specie/Make/files @@ -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