Commit 80d69c27 authored by Mark Olesen's avatar Mark Olesen
Browse files

COMP: compilation with WM_SP

- STLpoint.H
- isoAdvection.C
- checkMesh/writeFields.C

STYLE: drop construct STLpoint(Istream&), since it doesn't make much sense

- No use case for reading via an OpenFOAM stream and tokenizer.
  Should always be parsing ASCII or reading binary directly.
parent 06b59ad9
......@@ -97,7 +97,7 @@ void Foam::writeFields
(
radToDeg
(
Foam::acos(min(1.0, faceOrthogonality))
Foam::acos(min(scalar(1.0), faceOrthogonality))
)
);
......
......@@ -34,7 +34,6 @@ Description
#include "point.H"
#include "floatVector.H"
#include "Istream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -58,36 +57,30 @@ public:
inline STLpoint()
{}
//- Construct from base class
inline STLpoint(const floatVector& v)
//- Construct from single-precision point
inline STLpoint(const Vector<float>& p)
:
floatVector(v)
floatVector(p)
{}
//- Construct from components
//- Construct from double-precision point
inline STLpoint(const Vector<double>& p)
:
floatVector(float(p.x()), float(p.y()), float(p.z()))
{}
//- Construct from single-precision components
inline STLpoint(float x, float y, float z)
:
floatVector(x, y, z)
{}
//- Construct from components
//- Construct from double-precision components
inline STLpoint(double x, double y, double z)
:
floatVector(float(x), float(y), float(z))
{}
//- Construct from point
inline STLpoint(const point& pt)
:
floatVector(float(pt.x()), float(pt.y()), float(pt.z()))
{}
//- Construct from istream
inline STLpoint(Istream& is)
:
floatVector(is)
{}
// Member Operators
......
......@@ -1024,7 +1024,7 @@ void Foam::isoAdvection::applyBruteForceBounding()
bool clip = dict_.lookupOrDefault<bool>("clip", true);
if (clip)
{
alpha1_ = min(1.0, max(0.0, alpha1_));
alpha1_ = min(scalar(1.0), max(scalar(0.0), alpha1_));
alpha1Changed = true;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment