diff --git a/applications/utilities/miscellaneous/expandDictionary/Make/files b/applications/utilities/miscellaneous/expandDictionary/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..9693938e70ffa7368cb1b4d1c2efb8a5540720c7
--- /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 0000000000000000000000000000000000000000..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1
--- /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 0000000000000000000000000000000000000000..c08f9d014ce69f015bfbc4d30231c42ced0a77d2
--- /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;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H
index 9720edd6202814333f1b6307a5c9aad6380a8af9..91e6a981a8f4443f1f6f78cc3c9378833f80990c 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; i<ppsf.size(); i++)
{
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
index a09911063a200c0d9136a036e2441523a4bf196d..d9d9e6f946424a6feac985add5cf4ca3817b99ee 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
@@ -154,7 +154,10 @@ void Foam::vtkPV3Foam::convertPointField
pointData->SetNumberOfTuples(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<psf.size(); i++)
{
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
index ee737e6a880aca298804a451a4a7151ad95b2790..ab771d6a350d72cdbae20c5f1ca3afa06127c44b 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
@@ -118,7 +118,8 @@ void Foam::vtkPV3Foam::convertVolFields
);
convertPointField
(
- tptf(), tf,
+ tptf(),
+ tf,
output,
selectInfoVolume_,
selectedRegionDatasetIds_[regionId]
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 693f58b1c320553ba34adfa78cb3d3ec0386394c..db09e9f5771728dd84d122d619aeb6477a304998 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;
}
+
// ************************************************************************* //