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

consistency update - writeCompression in system/controlDict

Browse Source 
allow switch/bool values for writeCompression in system/controlDict

- eg,
    writeCompression false; or writeCompression uncompressed;
    writeCompression true;  or writeCompression compressed;

improves consistency with other controlDict parameters
This commit is contained in:
Mark Olesen
2009-12-07 13:40:32 +01:00
parent 190bbd69de
commit a19e488f1e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
View File

@ -26,6 +26,7 @@ License
#include "IOstream.H" #include "IOstream.H"
#include "error.H" #include "error.H"
#include "Switch.H"
#include <sstream> #include <sstream>
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -60,7 +61,14 @@ Foam::IOstream::formatEnum(const word& format)
Foam::IOstream::compressionType Foam::IOstream::compressionType
Foam::IOstream::compressionEnum(const word& compression) Foam::IOstream::compressionEnum(const word& compression)
{ {
if (compression == "uncompressed") // get Switch (bool) value, but allow it to fail
Switch::switchType sw = Switch::asEnum(compression, true);
if (sw != Switch::INVALID)
{
return sw ? IOstream::COMPRESSED : IOstream::UNCOMPRESSED;
}
else if (compression == "uncompressed")
{ {
return IOstream::UNCOMPRESSED; return IOstream::UNCOMPRESSED;
} }
@ -115,7 +123,7 @@ Foam::string Foam::IOstream::versionNumber::str() const
std::ostringstream os; std::ostringstream os;
os.precision(1); os.precision(1);
os.setf(ios_base::fixed, ios_base::floatfield); os.setf(ios_base::fixed, ios_base::floatfield);
os << versionNumber_; os << versionNumber_;
return os.str(); return os.str();
} }
@ -202,11 +210,11 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::streamFormat& sf)
{ {
if (sf == IOstream::ASCII) if (sf == IOstream::ASCII)
{ {
os << "ascii"; os << "ascii";
} }
else else
{ {
os << "binary"; os << "binary";
} }
return os; return os;
@ -215,7 +223,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::streamFormat& sf)
Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::versionNumber& vn) Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::versionNumber& vn)
{ {
os << vn.str().c_str(); os << vn.str().c_str();
return os; return os;
} }