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

ENH: make "file" property in functionObjects a relative path (issue #1125)

Browse Source 
- partial solution for issue #1091

  This generates file properties that are case-relative,
  Eg,

      plane0
      {
          p
          {
              file "<case>/postProcessing/plane0/1/p_plane0.vtk";
          }
          U
          {
              file "<case>/postProcessing/plane0/1/U_plane0.vtk";
          }
      }

   This allows the case to be moved elsewhere and still find its files.

   This functionality was previously added for vtkCloud, but now also
   applies to streamLine, sampledSets and sampledSurfaces
This commit is contained in:
Mark Olesen
2018-12-14 18:03:12 +01:00
parent 2617c326d8
commit 2f9c511be5
6 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,26 +41,6 @@ namespace runTimePostPro
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
bool Foam::functionObjects::runTimePostPro::functionObjectBase::removeFile
(
const word& keyword,
const word& subDictName
)
{
dictionary dict;
state_.getObjectDict(functionObjectName_, subDictName, dict);
fileName fName;
if (dict.readIfPresent(keyword, fName))
{
Foam::rm(fName);
return true;
}
return false;
}
Foam::fileName
Foam::functionObjects::runTimePostPro::functionObjectBase::getFileName
(
@ -71,7 +51,25 @@ Foam::functionObjects::runTimePostPro::functionObjectBase::getFileName
dictionary dict;
state_.getObjectDict(functionObjectName_, subDictName, dict);
return dict.lookupOrDefault<fileName>(keyword, fileName::null);
fileName f;
if (dict.readIfPresent<fileName>(keyword, f))
{
f.expand();
}
return f;
}
bool Foam::functionObjects::runTimePostPro::functionObjectBase::removeFile
(
const word& keyword,
const word& subDictName
)
{
// Foam::rm() ignores empty names etc.
return Foam::rm(getFileName(keyword, subDictName));
}
@ -91,12 +89,6 @@ Foam::functionObjects::runTimePostPro::functionObjectBase::functionObjectBase
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::runTimePostPro::functionObjectBase::~functionObjectBase()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::functionObjects::runTimePostPro::functionObjectBase::clear()

25
src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,17 +62,6 @@ class functionObjectBase
:
public fieldVisualisationBase
{
private:
// Private Member Functions
//- No copy construct
functionObjectBase(const functionObjectBase&) = delete;
//- No copy assignment
void operator=(const functionObjectBase&) = delete;
protected:
// Protected data
@ -100,11 +89,11 @@ protected:
// \verbatim
// T
// {
// file "path/T_object.vtk";
// file "<case>/relpath/T_object.vtk";
// }
// defaultCloud
// {
// file "path/cloud_0001.vtp";
// file "<case>/relpath/cloud_0001.vtp";
// fields (T U);
// }
// \endverbatim
@ -121,6 +110,12 @@ protected:
bool removeFile(const word& keyword, const word& subDictName);
//- No copy construct
functionObjectBase(const functionObjectBase&) = delete;
//- No copy assignment
void operator=(const functionObjectBase&) = delete;
public:
//- Run-time type information
@ -139,7 +134,7 @@ public:
//- Destructor
virtual ~functionObjectBase();
virtual ~functionObjectBase() = default;
// Member Functions