ENH: relocate zero_one to pTraits, allows reuse for scalar clamping

ENH: add pTraits and IO for std::int8_t

STYLE: cull some implicitly available includes

- pTraits.H is included by label/scalar etc
- zero.H is included by UList

STYLE: cull redundant forward declarations for Istream/Ostream
This commit is contained in:
Mark Olesen
2023-02-22 18:25:33 +01:00
parent f3d447579a
commit d88272f031
102 changed files with 475 additions and 427 deletions

View File

@ -81,7 +81,7 @@ namespace ListPolicy
{
// Override on a per-type basis
template<> struct short_length<short> : std::integral_constant<short,20> {};
template<> struct short_length<short> : std::integral_constant<int,20> {};
} // End namespace ListPolicy
} // End namespace Detail

View File

@ -146,7 +146,7 @@ int main(int argc, char *argv[])
Random rnd(4567);
for (scalar& val : someField)
{
val = rnd.position(-0.2, 1.2);
val = rnd.position(scalar(-0.2), scalar(1.2));
}
Info<< nl
@ -171,6 +171,7 @@ int main(int argc, char *argv[])
// nope << " : " << clamp(val, zero_one{})
// nope << " : " << clamp(val, scalarMinMax(zero_one{}))
<< " : " << clamp(val, 0, 1)
<< " : " << clamp(val, zero_one{})
<< nl;
}

View File

@ -33,7 +33,7 @@ Description
#include "Switch.H"
#include "string.H"
#include "dictionary.H"
#include "nil.H"
#include "zero.H"
#include "IOstreams.H"
#include "PstreamBuffers.H"
#include "argList.H"
@ -82,8 +82,8 @@ int main(int argc, char *argv[])
}
{
nil x;
cout<<"nil:" << sizeof(x) << nl;
zero x;
cout<<"zero:" << sizeof(x) << nl;
}
#if 0
{

View File

@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef edgeStats_H
#define edgeStats_H
#ifndef Foam_edgeStats_H
#define Foam_edgeStats_H
#include "direction.H"
#include "scalar.H"
@ -45,9 +45,8 @@ SourceFiles
namespace Foam
{
// Forward declaration of classes
// Forward Declarations
class polyMesh;
class Ostream;
class twoDPointCorrector;
/*---------------------------------------------------------------------------*\

View File

@ -62,7 +62,7 @@ namespace Foam
// Volume porosity -> blockage
inline scalar getPorosity(const dictionary& dict)
{
return 1 - clamp(dict.getOrDefault<scalar>("porosity", 0), 0, 1);
return 1 - clamp(dict.getOrDefault<scalar>("porosity", 0), zero_one{});
}
// Direction porosities -> blockage
@ -74,7 +74,7 @@ inline vector getPorosities(const dictionary& dict)
{
for (scalar& val : blockage)
{
val = 1 - clamp(val, 0, 1);
val = 1 - clamp(val, zero_one{});
}
}

View File

@ -108,7 +108,7 @@ void setAlpha
{
cutCell.calcSubCell(cellI, 0.0);
alpha1[cellI] = clamp(cutCell.VolumeOfFluid(), 0, 1);
alpha1[cellI] = clamp(cutCell.VolumeOfFluid(), zero_one{});
if (writeOBJ && (mag(cutCell.faceArea()) >= 1e-14))
{