From ba585fef7f517fb94e44013c28084bb054b963ea Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 10 Jun 2008 10:48:44 +0100 Subject: [PATCH 1/3] Added "Application" entry in header. --- .../preProcessing/changeDictionary/changeDictionary.C | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index 693f58b1c3..db09e9f577 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -22,6 +22,9 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Application + changeDictionary + Description Simple dictionary changing tool. Can be used to e.g. change the patch type. Reads dictionaries (fields) and entries to change from a dictionary. @@ -62,7 +65,7 @@ namespace Foam } - +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Main program: int main(int argc, char *argv[]) @@ -220,4 +223,5 @@ int main(int argc, char *argv[]) return 0; } + // ************************************************************************* // From 5569015b4a779c08b2e2715d4e93e3aa4cbe498f Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 10 Jun 2008 11:07:52 +0100 Subject: [PATCH 2/3] New application: Application expandDictionary Description Read the dictionary provided as an argument, expand the macros etc. and write the resulting dictionary to standard output. --- .../miscellaneous/expandDictionary/Make/files | 4 ++ .../expandDictionary/Make/options | 5 ++ .../expandDictionary/expandDictionary.C | 57 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 applications/utilities/miscellaneous/expandDictionary/Make/files create mode 100644 applications/utilities/miscellaneous/expandDictionary/Make/options create mode 100644 applications/utilities/miscellaneous/expandDictionary/expandDictionary.C diff --git a/applications/utilities/miscellaneous/expandDictionary/Make/files b/applications/utilities/miscellaneous/expandDictionary/Make/files new file mode 100644 index 0000000000..9693938e70 --- /dev/null +++ b/applications/utilities/miscellaneous/expandDictionary/Make/files @@ -0,0 +1,4 @@ + +expandDictionary.C + +EXE = $(FOAM_APPBIN)/expandDictionary diff --git a/applications/utilities/miscellaneous/expandDictionary/Make/options b/applications/utilities/miscellaneous/expandDictionary/Make/options new file mode 100644 index 0000000000..fa15f12452 --- /dev/null +++ b/applications/utilities/miscellaneous/expandDictionary/Make/options @@ -0,0 +1,5 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude + +EXE_LIBS = \ + -lfiniteVolume diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C new file mode 100644 index 0000000000..c08f9d014c --- /dev/null +++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C @@ -0,0 +1,57 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Application + expandDictionary + +Description + Read the dictionary provided as an argument, expand the macros etc. and + write the resulting dictionary to standard output. + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" +#include "IFstream.H" +#include "dictionary.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Main program: + +int main(int argc, char *argv[]) +{ + argList::validArgs.clear(); + argList::validArgs.append("inputDict"); + argList args(argc, argv); + + IFstream dictStream(args.additionalArgs()[0]); + dictionary inputDict(dictStream); + Info<< inputDict << endl; + + return 0; +} + + +// ************************************************************************* // From 5b92011d93f87cf4a2b4f24f4e34532058320c67 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 10 Jun 2008 11:27:31 +0100 Subject: [PATCH 3/3] changed volPointInterpolate() labels to vpi() --- .../vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H | 10 ++++++++-- .../vtkPV3Foam/vtkPV3FoamConvertPointFields.H | 10 ++++++++-- .../vtkPV3Foam/vtkPV3FoamConvertVolFields.H | 3 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H index 9720edd620..91e6a981a8 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H @@ -54,7 +54,10 @@ void Foam::vtkPV3Foam::convertPatchPointField pointData->SetNumberOfTuples(pptf.size()); pointData->SetNumberOfComponents(Type::nComponents); pointData->Allocate(Type::nComponents*pptf.size()); - pointData->SetName(name.c_str()); +// pointData->SetName(name.c_str()); + string dataSetName = name; + string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi"); + pointData->SetName(newDataSetName.c_str()); float vec[Type::nComponents]; @@ -92,7 +95,10 @@ void Foam::vtkPV3Foam::convertPatchPointField pointData->SetNumberOfTuples(ppsf.size()); pointData->SetNumberOfComponents(1); pointData->Allocate(ppsf.size()); - pointData->SetName(name.c_str()); +// pointData->SetName(name.c_str()); + string dataSetName = name; + string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi"); + pointData->SetName(newDataSetName.c_str()); for (int i=0; iSetNumberOfTuples(ptf.size() + addPointCellLabels_.size()); pointData->SetNumberOfComponents(Type::nComponents); pointData->Allocate(Type::nComponents*ptf.size()); - pointData->SetName(ptf.name().c_str()); +// pointData->SetName(ptf.name().c_str()); + string dataSetName = ptf.name(); + string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi"); + pointData->SetName(newDataSetName.c_str()); float vec[Type::nComponents]; @@ -223,7 +226,10 @@ void Foam::vtkPV3Foam::convertPointField pointData->SetNumberOfTuples(psf.size() + addPointCellLabels_.size()); pointData->SetNumberOfComponents(1); pointData->Allocate(psf.size()); - pointData->SetName(psf.name().c_str()); +// pointData->SetName(psf.name().c_str()); + string dataSetName = psf.name(); + string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi"); + pointData->SetName(newDataSetName.c_str()); for (int i=0; i