zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2014-01-27 13:00:37 +00:00
parent bee3508b38 7054a8be58
commit b461a61777
42 changed files with 131 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/generation/foamyHexMesh/Allwclean
View File

@ -4,7 +4,7 @@ set -x
wclean libso conformalVoronoiMesh
wclean
wclean cvMeshSurfaceSimplify
wclean cvMeshBackgroundMesh
wclean foamyHexMeshSurfaceSimplify
wclean foamyHexMeshBackgroundMesh
# ----------------------------------------------------------------- end-of-file

4
applications/utilities/mesh/generation/foamyHexMesh/Allwmake
View File

@ -6,8 +6,8 @@ if [ -d "$CGAL_ARCH_PATH" ]
then
wmake libso conformalVoronoiMesh
wmake
#wmake cvMeshBackgroundMesh
#(cd cvMeshSurfaceSimplify && ./Allwmake)
#wmake foamyHexMeshBackgroundMesh
#(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
#wmake cellSizeAndAlignmentGrid
fi

5
applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options
View File

@ -21,8 +21,9 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(FOAM_UTILITIES)/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \
-I$(FOAM_UTILITIES)/mesh/generation/cvMesh/vectorTools
-I$(LIB_SRC)/mesh/autoMesh/lnInclude \
-I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \
-I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/vectorTools
EXE_LIBS = \
$(CGAL_LIBS) \

13
applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -285,11 +285,11 @@ int main(int argc, char *argv[])
// - type should be optional
cellShapeControlMesh mesh(runTime);
IOdictionary cvMeshDict
IOdictionary foamyHexMeshDict
(
IOobject
(
"cvMeshDict",
"foamyHexMeshDict",
runTime.system(),
runTime,
IOobject::MUST_READ,
@ -310,7 +310,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
cvMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
);
conformationSurfaces geometryToConformTo
@ -318,7 +319,7 @@ int main(int argc, char *argv[])
runTime,
rndGen,
allGeometry,
cvMeshDict.subDict("surfaceConformation")
foamyHexMeshDict.subDict("surfaceConformation")
);
autoPtr<backgroundMeshDecomposition> bMesh;
@ -331,7 +332,7 @@ int main(int argc, char *argv[])
runTime,
rndGen,
geometryToConformTo,
cvMeshDict.subDict("backgroundMeshDecomposition")
foamyHexMeshDict.subDict("backgroundMeshDecomposition")
)
);
}

5
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -855,7 +855,8 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
IOobject::MUST_READ,
IOobject::NO_WRITE
),
foamyHexMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
),
geometryToConformTo_
(

3
applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files
View File

@ -1,3 +0,0 @@
cvMeshBackgroundMesh.C
EXE = $(FOAM_APPBIN)/cvMeshBackgroundMesh

5
applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,7 +88,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
foamyHexMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
);
// Write some stats

3
applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/files Normal file
View File

@ -0,0 +1,3 @@
foamyHexMeshBackgroundMesh.C
EXE = $(FOAM_APPBIN)/foamyHexMeshBackgroundMesh

3
applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options
View File

@ -11,9 +11,12 @@ EXE_INC = \
-I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/mesh/autoMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I../vectorTools

40
applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,10 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
cvMeshBackGroundMesh
foamyHexMeshBackGroundMesh
Description
Writes out background mesh as constructed by cvMesh and constructs
Writes out background mesh as constructed by foamyHexMesh and constructs
distanceSurface.
\*---------------------------------------------------------------------------*/
@ -346,7 +346,7 @@ tmp<scalarField> signedDistance
// Calculate sideness of these surface points
label geomI = surfaces[surfI];
List<searchableSurface::volumeType> volType;
List<volumeType> volType;
geometry[geomI].getVolumeType(surfPoints, volType);
// Push back to original
@ -355,13 +355,13 @@ tmp<scalarField> signedDistance
label pointI = surfIndices[i];
scalar dist = mag(points[pointI] - nearest[pointI].hitPoint());
searchableSurface::volumeType vT = volType[i];
volumeType vT = volType[i];
if (vT == searchableSurface::OUTSIDE)
if (vT == volumeType::OUTSIDE)
{
fld[pointI] = dist;
}
else if (vT == searchableSurface::INSIDE)
else if (vT == volumeType::INSIDE)
{
fld[i] = -dist;
}
@ -385,7 +385,7 @@ int main(int argc, char *argv[])
{
argList::addNote
(
"Generate cvMesh-consistent representation of surfaces"
"Generate foamyHexMesh-consistent representation of surfaces"
);
argList::addBoolOption
(
@ -413,11 +413,11 @@ int main(int argc, char *argv[])
}
IOdictionary cvMeshDict
IOdictionary foamyHexMeshDict
(
IOobject
(
"cvMeshDict",
"foamyHexMeshDict",
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@ -437,7 +437,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
cvMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
);
Random rndGen(64293*Pstream::myProcNo());
@ -447,18 +448,15 @@ int main(int argc, char *argv[])
runTime,
rndGen,
allGeometry,
cvMeshDict.subDict("surfaceConformation")
foamyHexMeshDict.subDict("surfaceConformation")
);
autoPtr<cellShapeControl> cellShapeControls
cellShapeControl cellShapeControls
(
cellShapeControl::New
(
runTime,
cvMeshDict.subDict("motionControl"),
allGeometry,
geometryToConformTo
)
runTime,
foamyHexMeshDict.subDict("motionControl"),
allGeometry,
geometryToConformTo
);
@ -587,7 +585,7 @@ int main(int argc, char *argv[])
geometryToConformTo,
cellShapeControls(),
rndGen,
cvMeshDict
foamyHexMeshDict
);
if (writeMesh)

6
applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict
View File

@ -75,6 +75,12 @@ geometry
}
}
//Optional: single region surfaces get patch names according to
// surface only. Multi-region surfaces get patch name
// surface "_ "region. Default is true
//singleRegionName false;
// Controls for conforming to the surfaces.
surfaceConformation

0
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Allwmake → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Allwmake
View File

6
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/files
View File

@ -1,5 +1,5 @@
/*
cvMeshSurfaceSimplify_non_octree.C
foamyHexMeshSurfaceSimplify_non_octree.C
MarchingCubes/MarchingCubes.cpp
MarchingCubes/ply.c
*/
@ -17,6 +17,6 @@ $(MarchingCubes)/opt_octree.cpp
$(MarchingCubes)/hash_octree.cpp
*/
cvMeshSurfaceSimplify.C
foamyHexMeshSurfaceSimplify.C
EXE = $(FOAM_APPBIN)/cvMeshSurfaceSimplify
EXE = $(FOAM_APPBIN)/foamyHexMeshSurfaceSimplify

1
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/options
View File

@ -9,6 +9,7 @@ EXE_INC = \
-I$(FASTDUALOCTREE_SRC_PATH) \
-I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/mesh/autoMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude

17
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
cvMeshSurfaceSimplify
foamyHexMeshSurfaceSimplify
Description
Simplifies surfaces by resampling.
@ -112,7 +112,7 @@ class distanceCalc
surfaces,
samples,
scalarField(1, GREAT),
searchableSurface::OUTSIDE,
volumeType::OUTSIDE,
nearestSurfaces,
distance
);
@ -366,7 +366,7 @@ int main(int argc, char *argv[])
{
argList::addNote
(
"Re-sample surfaces used in cvMesh operation"
"Re-sample surfaces used in foamyHexMesh operation"
);
argList::validArgs.append("outputName");
@ -376,17 +376,17 @@ int main(int argc, char *argv[])
const fileName exportName = args.args()[1];
Info<< "Reading surfaces as specified in the cvMeshDict and"
Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
<< " writing a re-sampled surface to " << exportName
<< nl << endl;
cpuTime timer;
IOdictionary cvMeshDict
IOdictionary foamyHexMeshDict
(
IOobject
(
"cvMeshDict",
"foamyHexMeshDict",
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@ -406,7 +406,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
cvMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
);
Info<< "Geometry read in = "
@ -420,7 +421,7 @@ int main(int argc, char *argv[])
runTime,
rndGen,
allGeometry,
cvMeshDict.subDict("surfaceConformation")
foamyHexMeshDict.subDict("surfaceConformation")
);
Info<< "Set up geometry in = "

17
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C → applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
cvMeshSurfaceSimplify
foamyHexMeshSurfaceSimplify
Description
Simplifies surfaces by resampling.
@ -50,7 +50,7 @@ int main(int argc, char *argv[])
{
argList::addNote
(
"Re-sample surfaces used in cvMesh operation"
"Re-sample surfaces used in foamyHexMesh operation"
);
//argList::validArgs.append("inputFile");
argList::validArgs.append("(nx ny nz)");
@ -63,17 +63,17 @@ int main(int argc, char *argv[])
const Vector<label> n(IStringStream(args.args()[1])());
const fileName exportName = args.args()[2];
Info<< "Reading surfaces as specified in the cvMeshDict and"
Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
<< " writing re-sampled " << n << " to " << exportName
<< nl << endl;
cpuTime timer;
IOdictionary cvMeshDict
IOdictionary foamyHexMeshDict
(
IOobject
(
"cvMeshDict",
"foamyHexMeshDict",
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@ -93,7 +93,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
cvMeshDict.subDict("geometry")
foamyHexMeshDict.subDict("geometry"),
foamyHexMeshDict.lookupOrDefault("singleRegionName", true)
);
Info<< "Geometry read in = "
@ -107,7 +108,7 @@ int main(int argc, char *argv[])
runTime,
rndGen,
allGeometry,
cvMeshDict.subDict("surfaceConformation")
foamyHexMeshDict.subDict("surfaceConformation")
);
Info<< "Set up geometry in = "

5
applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -123,7 +123,8 @@ Foam::CV2D::CV2D
IOobject::MUST_READ,
IOobject::NO_WRITE
),
cvMeshDict.subDict("geometry")
cvMeshDict.subDict("geometry"),
cvMeshDict.lookupOrDefault("singleRegionName", true)
),
qSurf_
(

2
applications/utilities/mesh/generation/foamyQuadMesh/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
${CGAL_INC} \
${c++CGALWARN} \
-I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-I../cvMesh/vectorTools \
/* -I../cvMesh/vectorTools */\
-IconformalVoronoi2DMesh/lnInclude \
-I$(FOAM_APP)/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \

3
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -927,7 +927,8 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
geometryDict
geometryDict,
meshDict.lookupOrDefault("singleRegionName", true)
);

7
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -19,6 +19,13 @@ castellatedMesh true;
snap true;
addLayers false;
//Optional: single region surfaces get patch names according to
// surface only. Multi-region surfaces get patch name
// surface "_ "region. Default is true
//singleRegionName false;
// Geometry. Definition of all surfaces. All surfaces are of class
// searchableSurface.
// Surfaces are used

4
applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -205,7 +205,7 @@ int main(int argc, char *argv[])
runTime
);
// cvMesh vertices
// foamyHexMesh vertices
writeMeshObject<pointIOField>
(
"internalDelaunayVertices",

2
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -816,7 +816,7 @@ int main(int argc, char *argv[])
);
// Now add turning index to faceProcAddressing.
// See reconstrurPar for meaning of turning index.
// See reconstructPar for meaning of turning index.
forAll(faceProcAddr, procFaceI)
{
label masterFaceI = faceProcAddr[procFaceI];

5
applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -305,7 +305,8 @@ int main(int argc, char *argv[])
"triSurface",
runTime
),
dict
dict,
true // assume single-region names get surface name
);
Info<< nl << "Reading surfaces: " << endl;