zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenFOAM field reading: Automated the handling of <field>.orig files

Browse Source 
Now if a <field> file does not exist first the compressed <field>.gz file is
searched for and if that also does not exist the <field>.orig file is searched
for.

This simplifies case setup and run scripts as now setField for example can read
the <field>.orig file directly and generate the <field> file from it which is
then read by the solver.  Additionally the cleanCase function used by
foamCleanCase and the Allclean scripts automatically removed <field> files if
there is a corresponding <field>.orig file.  So now there is no need for the
Allrun scripts to copy <field>.orig files into <field> or for the Allclean
scripts to explicitly remove them.
This commit is contained in:
Henry Weller
2018-02-14 17:42:14 +00:00
parent 019c2c08dc
commit df6e2da2dd
82 changed files with 31 additions and 95562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OSspecific/POSIX/POSIX.C
View File

@ -563,9 +563,11 @@ bool Foam::isFile
error::printStack(Pout);
}
}
return
S_ISREG(mode(name, followLink))
|| (checkGzip && S_ISREG(mode(name + ".gz", followLink)));
|| (checkGzip && S_ISREG(mode(name + ".gz", followLink)))
|| (checkGzip && S_ISREG(mode(name + ".orig", followLink)));
}

31
src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,20 +53,29 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
ifPtr_ = new ifstream(pathname.c_str());
// If the file is compressed, decompress it before reading.
if (!ifPtr_->good() && isFile(pathname + ".gz", false))
if (!ifPtr_->good())
{
if (IFstream::debug)
if (isFile(pathname + ".gz", false))
{
InfoInFunction << "Decompressing " << pathname + ".gz" << endl;
delete ifPtr_;
if (IFstream::debug)
{
InfoInFunction << "Decompressing " << pathname + ".gz" << endl;
}
ifPtr_ = new igzstream((pathname + ".gz").c_str());
if (ifPtr_->good())
{
compression_ = IOstream::COMPRESSED;
}
}
delete ifPtr_;
ifPtr_ = new igzstream((pathname + ".gz").c_str());
if (ifPtr_->good())
else if (isFile(pathname + ".orig", false))
{
compression_ = IOstream::COMPRESSED;
delete ifPtr_;
ifPtr_ = new ifstream((pathname + ".orig").c_str());
}
}
}