diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck deleted file mode 100644 index ab882677c7..0000000000 --- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck +++ /dev/null @@ -1,3 +0,0 @@ -makeCells.C - -EXE = $(FOAM_USER_APPBIN)/makeCells diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck deleted file mode 100644 index 7f7271b3af..0000000000 --- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck +++ /dev/null @@ -1,12 +0,0 @@ -EXE_INC = \ - -g -DFULLDEBUG -O0 \ - -I$(LIB_SRC)/LESmodels \ - -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lincompressibleLESmodels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lfoamUtil diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt deleted file mode 100644 index 6efcb1c0a0..0000000000 --- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt +++ /dev/null @@ -1,13 +0,0 @@ -EXE_INC = \ - -I$(FOAM_UTILITIES)/parallelProcessing/decompositionMethods/decompositionMethods/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -ldecompositionMethods \ - -lmeshTools \ - -ldynamicMesh \ - -lparMetisDecompositionMethod \ - -lfoamUtil diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index c9d7409a02..d30a4dfd07 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -322,15 +322,15 @@ int main(int argc, char *argv[]) // Current mesh. # include "createNamedMesh.H" + // VTK/ directory in the case + fileName fvPath(runTime.path()/"VTK"); // Directory of mesh (region0 gets filtered out) fileName regionPrefix = ""; - // make a directory called VTK in the case - fileName fvPath(runTime.path()/"VTK"); - - if (args.options().found("region")) + if (regionName != polyMesh::defaultRegion) { fvPath = fvPath/regionName; + regionPrefix = regionName; } if (dir(fvPath)) @@ -340,6 +340,7 @@ int main(int argc, char *argv[]) args.options().found("time") || args.options().found("latestTime") || cellSetName.size() > 0 + || regionName != polyMesh::defaultRegion ) { Info<< "Keeping old VTK files in " << fvPath << nl << endl; diff --git a/applications/utilities/surface/surfaceTransformPoints/Make/files_bak b/applications/utilities/surface/surfaceTransformPoints/Make/files_bak deleted file mode 100644 index fa405bffbc..0000000000 --- a/applications/utilities/surface/surfaceTransformPoints/Make/files_bak +++ /dev/null @@ -1,4 +0,0 @@ - -surfaceScale.C - -EXE = $(FOAM_APPBIN)/surfaceScale diff --git a/src/OpenFOAM/primitives/pTraits/pTraits.H b/src/OpenFOAM/primitives/pTraits/pTraits.H index 9ba24049a7..bc03885bb6 100644 --- a/src/OpenFOAM/primitives/pTraits/pTraits.H +++ b/src/OpenFOAM/primitives/pTraits/pTraits.H @@ -53,6 +53,11 @@ class pTraits public: + pTraits(const primitive& p) + : + primitive(p) + {} + pTraits(Istream& is) : primitive(is)