Commit fb22fdba authored by Franjo's avatar Franjo

Merge branch 'release'

parents 01431025 579918ba
#if defined(__GNUC__)
OMP_FLAGS = -DUSE_OMP -fopenmp
# if defined(darwinIntel64)
OMP_FLAGS =
# else
OMP_FLAGS = -DUSE_OMP -fopenmp
# endif
#else
OMP_FLAGS =
#endif
......
......@@ -35,6 +35,8 @@ SourceFiles
#ifndef boundaryLayers_H
#define boundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "meshSurfacePartitioner.H"
......
......@@ -36,6 +36,8 @@ SourceFiles
#ifndef extrudeLayer_H
#define extrudeLayer_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "VRWGraphList.H"
#include "labelPair.H"
......
......@@ -36,6 +36,8 @@ SourceFiles
#ifndef refineBoundaryLayers_H
#define refineBoundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "DynList.H"
......
......@@ -866,14 +866,19 @@ void checkMeshDict::updateBoundaryLayers
const std::map<word, wordList>::const_iterator it =
patchesFromPatch.find(pName);
const wordList& newNames = it->second;
forAll(newNames, i)
//- patch name may be a regex
if( it != patchesFromPatch.end() )
{
patchBndLayers.add(newNames[i], dict);
}
const wordList& newNames = it->second;
patchBndLayers.remove(pName);
forAll(newNames, i)
{
patchBndLayers.add(newNames[i], dict);
}
patchBndLayers.remove(pName);
}
}
}
}
......
......@@ -35,6 +35,8 @@ SourceFiles
#ifndef checkMeshDict_H
#define checkMeshDict_H
#include "objectRegistry.H"
#include "Time.H"
#include "IOdictionary.H"
#include <map>
......
......@@ -27,8 +27,6 @@ License
#include "Ostream.H"
#include "token.H"
#include "Time.H"
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class T, Foam::label Offset>
......
......@@ -42,6 +42,7 @@ SourceFiles
#include "label.H"
#include "bool.H"
#include "IOstreams.H"
#include "error.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,6 +37,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "objectRegistry.H"
#include "Time.H"
#include "meshSubset.H"
#include "pointFieldPMG.H"
......
......@@ -29,10 +29,7 @@ Description
#include "demandDrivenData.H"
#include "IFstream.H"
#include "OFstream.H"
#include "Time.H"
#include "gzstream.h"
#include "triSurface.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,6 +37,7 @@ SourceFiles
#define meshOctreeAutomaticRefinement_H
#include "meshOctreeModifier.H"
#include "IOdictionary.H"
//#include "volFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,6 +37,7 @@ SourceFiles
#include "boolList.H"
#include "DynList.H"
#include "IOdictionary.H"
#include "meshOctreeModifier.H"
//#include "volFields.H"
#include "patchRefinementList.H"
......@@ -49,7 +50,6 @@ namespace Foam
{
// Forward declarations
class IOdictionary;
class meshOctreeCube;
/*---------------------------------------------------------------------------*\
......
......@@ -26,6 +26,8 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "edgeExtractor.H"
#include "meshSurfaceEngine.H"
......
......@@ -38,6 +38,8 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "objectRegistry.H"
#include "Time.H"
#include "labelList.H"
#include "labelLongList.H"
#include "VRWGraph.H"
......
......@@ -37,6 +37,8 @@ SourceFiles
#ifndef meshSurfaceCheckEdgeTypes_H
#define meshSurfaceCheckEdgeTypes_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,6 +37,8 @@ SourceFiles
#ifndef meshSurfaceCheckInvertedVertices_H
#define meshSurfaceCheckInvertedVertices_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "HashSet.H"
......
......@@ -35,6 +35,8 @@ SourceFiles
#ifndef meshSurfaceEngine_H
#define meshSurfaceEngine_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "SubList.H"
#include "boolList.H"
......
......@@ -37,6 +37,7 @@ SourceFiles
#ifndef triSurfacePatchManipulator_H
#define triSurfacePatchManipulator_H
#include "IOdictionary.H"
#include "triSurf.H"
#include "VRWGraph.H"
......
......@@ -3,4 +3,5 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication cartesianMesh
runApplication improveSymmetryPlanes
runApplication checkMesh
......@@ -3,8 +3,8 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication preparePar
runParallel cartesianMesh 4
runParallel checkMesh 4
runParallel `which cartesianMesh` 4
runParallel `which checkMesh` 4
if [ "$WM_PROJECT" = "OpenFOAM" ]
then
runApplication reconstructParMesh -constant -fullMatch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment