Merge commit 'origin/master' into olesenm

applications/utilities/miscellaneous/expandDictionary/Make/files

@@ -0,0 +1,4 @@
+
+expandDictionary.C
+
+EXE = $(FOAM_APPBIN)/expandDictionary

applications/utilities/miscellaneous/expandDictionary/Make/options

@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume

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;
+}
+
+
+// ************************************************************************* //

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++)
     {

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++)
     {

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]

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;
 }
 
+
 // ************************************************************************* //