COMP: minor adjustments for compiling with single-precision

This commit is contained in:
Mark Olesen
2016-11-22 15:58:54 +01:00
parent 19bd06c850
commit e619a82ae6
3 changed files with 10 additions and 5 deletions

View File

@ -15,8 +15,13 @@ if [ "$WM_LABEL_SIZE" = 64 ]
then then
# The libccmio uses int32_t. # The libccmio uses int32_t.
# The OpenFOAM adapter thus requires additional work for 64-bit labels. # The OpenFOAM adapter thus requires additional work for 64-bit labels.
echo "Skipping optional component libccm" echo "Skipping optional 'libccm' adapter component"
echo " does not support 64-bit labels" echo " does not support 64-bit labels"
elif [ "$WM_PRECISION_OPTION" = SP ]
then
# The OpenFOAM adapter was originally only designed for 'double'
echo "Skipping optional 'libccm' adapter component"
echo " was not originally designed for 'single precision' values"
elif [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \ elif [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
-a -e $CCMIO_ARCH_PATH/lib/libccmio.a ] -a -e $CCMIO_ARCH_PATH/lib/libccmio.a ]
then then

View File

@ -230,7 +230,7 @@ void Foam::fileFormats::STARCDCore::writePoints
( (
Ostream& os, Ostream& os,
const pointField& points, const pointField& points,
const double scaleFactor const scalar scaleFactor
) )
{ {
writeHeader(os, HEADER_VRT); writeHeader(os, HEADER_VRT);

View File

@ -1104,9 +1104,9 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
fvPatchField<vector>::write(os); fvPatchField<vector>::write(os);
writeEntry("value", os); writeEntry("value", os);
os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl; os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl;
writeEntryIfDifferent(os, "d", 1.0, d_); writeEntryIfDifferent<scalar>(os, "d", 1.0, d_);
writeEntryIfDifferent(os, "kappa", 0.41, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_);
writeEntryIfDifferent(os, "perturb", 1e-5, perturb_); writeEntryIfDifferent<scalar>(os, "perturb", 1e-5, perturb_);
writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_); writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_);
writeEntryIfDifferent(os, "writeEddies", false, writeEddies_); writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);