zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paraFoam: Added configuration file to set default fields loaded on start-up

Browse Source 
The new default paraFoam configuration is in the files OpenFOAM-dev/etc/paraFoam
containing the entry

    defaultFields (U p p_rgh T alpha.water alpha.air);

specifying the set of fields which are loaded by default if available.  This
setting maybe overridden by providing additional paraFoam configuration files in
any of the OpenFOAM etc directories searched, listed using

    foamEtcFile -list

e.g.

    ~/.OpenFOAM/dev
    ~/.OpenFOAM
    ~/OpenFOAM/site/dev
    ~/OpenFOAM/site
    ~/OpenFOAM/OpenFOAM-dev/etc

The new configurable set of default fields loaded replaces the original hard-coded default of
"p" and "U" and is much more convenient for current OpenFOAM usage.
This commit is contained in:
Henry Weller
2017-10-02 16:15:44 +01:00
parent c095b5b89f
commit 10b289245f
4 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
View File

@ -31,6 +31,7 @@ License
#include "Time.H"
#include "patchZones.H"
#include "collatedFileOperation.H"
#include "etcFiles.H"
// VTK includes
#include "vtkDataArraySelection.h"
@ -43,7 +44,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(vtkPVFoam, 0);
defineTypeNameAndDebug(vtkPVFoam, 0);
}
@ -250,7 +251,6 @@ Foam::vtkPVFoam::vtkPVFoam
// For now just disable the threaded writer.
fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
// avoid argList and get rootPath/caseName directly from the file
fileName fullCasePath(fileName(FileName).path());
@ -325,6 +325,12 @@ Foam::vtkPVFoam::vtkPVFoam
dbPtr_().functionObjects().off();
fileNameList configDictFiles = findEtcFiles("paraFoam", false);
forAllReverse(configDictFiles, cdfi)
{
configDict_.merge(dictionary(IFstream(configDictFiles[cdfi])()));
}
updateInfo();
}

3
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
View File

@ -250,6 +250,9 @@ class vtkPVFoam
//- OpenFOAM time control
autoPtr<Time> dbPtr_;
//- Configuration dictionary
dictionary configDict_;
//- OpenFOAM mesh
fvMesh* meshPtr_;

17
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
View File

@ -46,16 +46,23 @@ void Foam::vtkPVFoam::updateInfoFields
}
stringList enabledEntries;
// enable 'p' and 'U' on the first call
if (select->GetNumberOfArrays() == 0 && !meshPtr_)
{
enabledEntries.setSize(2);
enabledEntries[0] = "p";
enabledEntries[1] = "U";
wordList defaultFields
(
configDict_.lookupOrDefault("defaultFields", wordList{"p", "U"})
);
enabledEntries.setSize(defaultFields.size());
forAll(defaultFields, i)
{
enabledEntries[i] = defaultFields[i];
}
}
else
{
// preserve the enabled selections
// Preserve the enabled selections
enabledEntries = getSelectedArrayEntries(select);
}