Commit 9ee870e0 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: impose type-narrowing for Ensight output

parent fedcbff6
......@@ -225,78 +225,76 @@ Foam::Ostream& Foam::ensightFile::write
}
Foam::Ostream& Foam::ensightFile::write(const label value)
Foam::Ostream& Foam::ensightFile::write(const int32_t val)
{
if (format() == IOstream::BINARY)
{
unsigned int ivalue(value);
write
(
reinterpret_cast<const char *>(&ivalue),
sizeof(ivalue)
reinterpret_cast<const char *>(&val),
sizeof(int32_t)
);
}
else
{
stdStream().width(10);
stdStream() << value;
stdStream() << val;
}
return *this;
}
Foam::Ostream& Foam::ensightFile::write
(
const label value,
const label fieldWidth
)
Foam::Ostream& Foam::ensightFile::write(const int64_t val)
{
int32_t ivalue(narrowInt32(val));
return write(ivalue);
}
Foam::Ostream& Foam::ensightFile::write(const floatScalar val)
{
if (format() == IOstream::BINARY)
{
unsigned int ivalue(value);
write
(
reinterpret_cast<const char *>(&ivalue),
sizeof(ivalue)
reinterpret_cast<const char *>(&val),
sizeof(floatScalar)
);
}
else
{
stdStream().width(fieldWidth);
stdStream() << value;
stdStream().width(12);
stdStream() << val;
}
return *this;
}
Foam::Ostream& Foam::ensightFile::write(const scalar value)
Foam::Ostream& Foam::ensightFile::write(const doubleScalar val)
{
float fvalue(value);
float fvalue(narrowFloat(val));
return write(fvalue);
}
// TBD: limit range?
// #if defined(WM_DP)
// if (mag(value) < scalar(floatScalarVSMALL))
// {
// fvalue = 0;
// }
// #endif
Foam::Ostream& Foam::ensightFile::write
(
const label value,
const label fieldWidth
)
{
if (format() == IOstream::BINARY)
{
write
(
reinterpret_cast<const char *>(&fvalue),
sizeof(fvalue)
);
write(value);
}
else
{
stdStream().width(12);
stdStream() << fvalue;
stdStream().width(fieldWidth);
stdStream() << value;
}
return *this;
......
......@@ -172,6 +172,21 @@ public:
//- Write undef value
Ostream& writeUndef();
//- Writing token does not make sense
virtual bool write(const token&)
{
NotImplemented;
return false;
}
//- Writing single character does not make sense
virtual Ostream& write(const char)
{
NotImplemented;
return *this;
}
//- Binary write
virtual Ostream& write(const char* buf, std::streamsize count);
......@@ -185,13 +200,19 @@ public:
virtual Ostream& write(const string& str);
//- Write integer as "%10d" or as binary
Ostream& write(const label value);
virtual Ostream& write(const int32_t val);
//- Write integer as "%10d" or as binary
virtual Ostream& write(const int64_t val);
//- Write integer with specified width or as binary
Ostream& write(const label value, const label fieldWidth);
//- Write float as "%12.5e" or as binary
Ostream& write(const scalar value);
//- Write floating-point as "%12.5e" or as binary
virtual Ostream& write(const floatScalar val);
//- Write floating-point as "%12.5e" or as binary
virtual Ostream& write(const doubleScalar val);
//- Add carriage return to ascii stream
void newline();
......
......@@ -241,7 +241,7 @@ public:
//- optionally write all element addresses
virtual void writeDict(Ostream& os, const bool full=false) const;
//- Write geometry, using a mesh reference (serial only)
//- Write geometry, using a mesh reference
virtual void write
(
ensightGeoFile& os,
......
......@@ -117,6 +117,13 @@ public:
//- Write a field of point values (serial-only)
template<class Type>
void writePointData(ensightFile& os, const Field<Type>& fld) const;
// Housekeeping
//- Cannot write geometry with a mesh reference
virtual void write(ensightGeoFile&, const polyMesh&, bool) const
{}
};
......
Markdown is supported
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