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

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry
2009-12-02 22:42:27 +00:00
parent c8f03c3bef 1665a86206
commit 3e2425b72b
9 changed files with 133 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/containers/Lists/ListOps/ListOps.H
View File

@ -172,7 +172,7 @@ template<class ListType>
ListType createWithValues
(
const label sz,
const typename ListType::const_reference initValue,
typename ListType::const_reference initValue,
const UList<label>& indices,
typename ListType::const_reference setValue
);

35
src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
View File

@ -129,28 +129,29 @@ void Foam::SHA1::processBytes(const void *data, size_t len)
}
// Process available complete blocks
if (len >= 64)
{
#if !_STRING_ARCH_unaligned
# define alignof(type) offsetof (struct { char c; type x; }, x)
# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
if (UNALIGNED_P (data))
{
while (len > 64)
// if (len >= 64)
// {
//#if !_STRING_ARCH_unaligned
//# define alignof(type) offsetof (struct { char c; type x; }, x)
//# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
// if (UNALIGNED_P (data))
// {
// while (len > 64)
while (len >= 64)
{
processBlock(memcpy (buffer_, data, 64), 64);
data = reinterpret_cast<const unsigned char*>(data) + 64;
len -= 64;
}
}
else
#endif
{
processBlock(data, len & ~63);
data = reinterpret_cast<const unsigned char*>(data) + (len & ~63);
len &= 63;
}
}
// }
// else
//#endif
// {
// processBlock(data, len & ~63);
// data = reinterpret_cast<const unsigned char*>(data) + (len & ~63);
// len &= 63;
// }
// }
// Move remaining bytes in internal buffer.
if (len > 0)

4
src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
View File

@ -157,14 +157,14 @@ namespace fvc
);
//- Interpolate tmp field onto faces using central differencing
//- Interpolate tmp field onto faces using 'interpolate(<name>)'
template<class Type>
static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
);
//- Interpolate field onto faces using central differencing
//- Interpolate tmp field onto faces using 'interpolate(<name>)'
template<class Type>
static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
(

4
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
View File

@ -67,6 +67,10 @@ Foam::word Foam::PatchInteractionModel<CloudType>::interactionTypeToWord
return "other";
}
}
#ifdef __ICC
// Prevent Icc complaining about missing return statement.
return word::null;
#endif
}