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 /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
william
2014-01-27 15:49:11 +00:00
parent 4abc681d09 f0cec33f88
commit 7be436b503
50 changed files with 256 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.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
@ -61,74 +61,86 @@ int main(int argc, char *argv[])
surfaceScalarField rho_pos
(
"rho_pos",
fvc::interpolate(rho, pos, "reconstruct(rho)")
);
surfaceScalarField rho_neg
(
"rho_neg",
fvc::interpolate(rho, neg, "reconstruct(rho)")
);
surfaceVectorField rhoU_pos
(
"rhoU_pos",
fvc::interpolate(rhoU, pos, "reconstruct(U)")
);
surfaceVectorField rhoU_neg
(
"rhoU_neg",
fvc::interpolate(rhoU, neg, "reconstruct(U)")
);
volScalarField rPsi(1.0/psi);
surfaceScalarField rPsi_pos
(
"rPsi_pos",
fvc::interpolate(rPsi, pos, "reconstruct(T)")
);
surfaceScalarField rPsi_neg
(
"rPsi_neg",
fvc::interpolate(rPsi, neg, "reconstruct(T)")
);
surfaceScalarField e_pos
(
"e_pos",
fvc::interpolate(e, pos, "reconstruct(T)")
);
surfaceScalarField e_neg
(
"e_neg",
fvc::interpolate(e, neg, "reconstruct(T)")
);
surfaceVectorField U_pos(rhoU_pos/rho_pos);
surfaceVectorField U_neg(rhoU_neg/rho_neg);
surfaceVectorField U_pos("U_pos", rhoU_pos/rho_pos);
surfaceVectorField U_neg("U_neg", rhoU_neg/rho_neg);
surfaceScalarField p_pos(rho_pos*rPsi_pos);
surfaceScalarField p_neg(rho_neg*rPsi_neg);
surfaceScalarField p_pos("p_pos", rho_pos*rPsi_pos);
surfaceScalarField p_neg("p_neg", rho_neg*rPsi_neg);
surfaceScalarField phiv_pos(U_pos & mesh.Sf());
surfaceScalarField phiv_neg(U_neg & mesh.Sf());
surfaceScalarField phiv_pos("phiv_pos", U_pos & mesh.Sf());
surfaceScalarField phiv_neg("phiv_neg", U_neg & mesh.Sf());
volScalarField c(sqrt(thermo.Cp()/thermo.Cv()*rPsi));
surfaceScalarField cSf_pos
(
"cSf_pos",
fvc::interpolate(c, pos, "reconstruct(T)")*mesh.magSf()
);
surfaceScalarField cSf_neg
(
"cSf_neg",
fvc::interpolate(c, neg, "reconstruct(T)")*mesh.magSf()
);
surfaceScalarField ap
(
"ap",
max(max(phiv_pos + cSf_pos, phiv_neg + cSf_neg), v_zero)
);
surfaceScalarField am
(
"am",
min(min(phiv_pos - cSf_pos, phiv_neg - cSf_neg), v_zero)
);
surfaceScalarField a_pos(ap/(ap - am));
surfaceScalarField a_pos("a_pos", ap/(ap - am));
surfaceScalarField amaxSf("amaxSf", max(mag(am), mag(ap)));
surfaceScalarField aSf(am*a_pos);
surfaceScalarField aSf("aSf", am*a_pos);
if (fluxScheme == "Tadmor")
{
@ -136,13 +148,13 @@ int main(int argc, char *argv[])
a_pos = 0.5;
}
surfaceScalarField a_neg(1.0 - a_pos);
surfaceScalarField a_neg("a_neg", 1.0 - a_pos);
phiv_pos *= a_pos;
phiv_neg *= a_neg;
surfaceScalarField aphiv_pos(phiv_pos - aSf);
surfaceScalarField aphiv_neg(phiv_neg + aSf);
surfaceScalarField aphiv_pos("aphiv_pos", phiv_pos - aSf);
surfaceScalarField aphiv_neg("aphiv_neg", phiv_neg + aSf);
// Reuse amaxSf for the maximum positive and negative fluxes
// estimated by the central scheme
@ -166,6 +178,7 @@ int main(int argc, char *argv[])
surfaceScalarField phiEp
(
"phiEp",
aphiv_pos*(rho_pos*(e_pos + 0.5*magSqr(U_pos)) + p_pos)
+ aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg)
+ aSf*p_pos - aSf*p_neg
@ -202,6 +215,7 @@ int main(int argc, char *argv[])
// --- Solve energy
surfaceScalarField sigmaDotU
(
"sigmaDotU",
(
fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U)
+ (mesh.Sf() & fvc::interpolate(tauMC))

5
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.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
@ -77,6 +77,7 @@ void Foam::multiphaseSystem::solveAlphas()
phasei,
new surfaceScalarField
(
"phi" + alpha1.name() + "Corr",
fvc::flux
(
phi_,
@ -106,7 +107,7 @@ void Foam::multiphaseSystem::solveAlphas()
{
surfaceScalarField phic
(
(mag(phi_) + mag(phase1.phi() - phase2.phi()))/mesh_.magSf()
(mag(phi_) + mag(phir))/mesh_.magSf()
);
phir += min(cAlpha()*phic, max(phic))*nHatf(phase1, phase2);

3
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -65,6 +65,7 @@
const volScalarField& alpha = phase;
alphafs.set(phasei, fvc::interpolate(alpha).ptr());
alphafs[phasei].rename("hmm" + alpha.name());
volScalarField dragCoeffi
(
@ -227,7 +228,7 @@
if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField mSfGradp(pEqnIncomp.flux()/rAUf);
surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
phasei = 0;
phi = dimensionedScalar("phi", phi.dimensions(), 0);

3
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.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
@ -569,6 +569,7 @@ void Foam::multiphaseMixture::solveAlphas
phasei,
new surfaceScalarField
(
"phi" + alpha.name() + "Corr",
fvc::flux
(
phi_,

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;

6
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.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
@ -315,10 +315,12 @@ void Foam::primitiveMeshTools::cellClosedness
scalar aspectRatio = maxCmpt/(minCmpt + VSMALL);
if (nDims == 3)
{
scalar v = max(VSMALL, vols[cellI]);
aspectRatio = max
(
aspectRatio,
1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(vols[cellI], 2.0/3.0)
1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(v, 2.0/3.0)
);
}

5
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.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
@ -422,7 +422,8 @@ surfaceDisplacementPointPatchVectorField::surfaces() const
IOobject::MUST_READ,
IOobject::NO_WRITE
),
surfacesDict_
surfacesDict_,
true // allow single-region shortcut
)
);
}

5
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.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
@ -399,7 +399,8 @@ surfaceSlipDisplacementPointPatchVectorField::surfaces() const
IOobject::MUST_READ,
IOobject::NO_WRITE
),
surfacesDict_
surfacesDict_,
true // use single region naming shortcut
)
);
}

16
src/meshTools/searchableSurface/searchableSurfaces.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
@ -175,7 +175,8 @@ Foam::searchableSurfaces::searchableSurfaces(const label size)
Foam::searchableSurfaces::searchableSurfaces
(
const IOobject& io,
const dictionary& topDict
const dictionary& topDict,
const bool singleRegionName
)
:
PtrList<searchableSurface>(topDict.size()),
@ -233,9 +234,16 @@ Foam::searchableSurfaces::searchableSurfaces
wordList& rNames = regionNames_[surfI];
rNames.setSize(localNames.size());
forAll(localNames, regionI)
if (singleRegionName && localNames.size() == 1)
{
rNames[regionI] = names_[surfI] + '_' + localNames[regionI];
rNames[0] = names_[surfI];
}
else
{
forAll(localNames, regionI)
{
rNames[regionI] = names_[surfI] + '_' + localNames[regionI];
}
}
// See if dictionary provides any global region names.

14
src/meshTools/searchableSurface/searchableSurfaces.H
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
@ -101,8 +101,16 @@ public:
////- Construct from list of dictionaries
//searchableSurfaces(const IOobject&, const PtrList<dictionary>&);
//- Construct from dictionary
searchableSurfaces(const IOobject&, const dictionary&);
//- Construct from dictionary and whether to construct names always
// as surfaceName "_" regionName (singleRegionName false) or
// for single region surfaces as surfaceName only (singleRegionName
// true)
searchableSurfaces
(
const IOobject&,
const dictionary&,
const bool singleRegionName
);
// Member Functions

6
src/surfMesh/surfaceFormats/obj/OBJstream.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
@ -223,7 +223,7 @@ Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n)
}
Foam::Ostream& Foam::OBJstream::write(const edge& e, const pointField& points)
Foam::Ostream& Foam::OBJstream::write(const edge& e, const UList<point>& points)
{
write(points[e[0]]);
write(points[e[1]]);
@ -290,7 +290,7 @@ Foam::Ostream& Foam::OBJstream::write
Foam::Ostream& Foam::OBJstream::write
(
const face& f,
const pointField& points,
const UList<point>& points,
const bool lines
)
{

6
src/surfMesh/surfaceFormats/obj/OBJstream.H
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
@ -130,7 +130,7 @@ public:
Ostream& write(const point&, const vector&);
//- Write edge as points with line
Ostream& write(const edge&, const pointField&);
Ostream& write(const edge&, const UList<point>&);
//- Write line
Ostream& write(const linePointRef&);
@ -150,7 +150,7 @@ public:
Ostream& write
(
const face&,
const pointField&,
const UList<point>&,
const bool lines = true
);

1
tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
View File

@ -8,7 +8,6 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication snappyHexMesh -overwrite
sed -i 's/_solid//g' constant/polyMesh/boundary
if [ -d 0 ] ; then
rm -rf 0

1
tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict
View File

@ -268,7 +268,6 @@ meshQualityControls
}
}
debug 0;
mergeTolerance 1e-6;
// ************************************************************************* //

8
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
View File

@ -363,14 +363,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

8
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
View File

@ -352,14 +352,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

2
tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict
View File

@ -24,7 +24,7 @@ actions
source patchToFace;
sourceInfo
{
name innerCylinder;
name outerCylinder;
}
}

8
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
View File

@ -312,14 +312,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

8
tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict
View File

@ -315,14 +315,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;

8
tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
View File

@ -386,14 +386,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

8
tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
View File

@ -294,14 +294,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

8
tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
View File

@ -303,14 +303,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;

8
tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict
View File

@ -370,14 +370,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;

7
tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict
View File

@ -557,13 +557,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;

1
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
View File

@ -40,6 +40,7 @@ boundaryField
{
type zeroGradient;
value $internalField;
}
}
// ************************************************************************* //

89
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/boundary Normal file
View File

@ -0,0 +1,89 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
9
(
inlet
{
type patch;
nFaces 0;
startFace 1576984;
}
outlet
{
type patch;
nFaces 0;
startFace 1576984;
}
outerCylinder
{
type wall;
inGroups 1(wall);
nFaces 1404;
startFace 1576984;
}
propellerTip
{
type wall;
inGroups 1(wall);
nFaces 21703;
startFace 1578388;
}
propellerStem1
{
type wall;
inGroups 1(wall);
nFaces 192;
startFace 1600091;
}
propellerStem2
{
type wall;
inGroups 1(wall);
nFaces 576;
startFace 1600283;
}
propellerStem3
{
type wall;
inGroups 1(wall);
nFaces 1536;
startFace 1600859;
}
AMI1
{
type cyclicAMI;
inGroups 1(cyclicAMI);
nFaces 18496;
startFace 1602395;
matchTolerance 0.0001;
transform noOrdering;
neighbourPatch AMI2;
}
AMI2
{
type cyclicAMI;
inGroups 1(cyclicAMI);
nFaces 18720;
startFace 1620891;
matchTolerance 0.0001;
transform noOrdering;
neighbourPatch AMI1;
}
)
// ************************************************************************* //

2
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
View File

@ -24,7 +24,7 @@ actions
source patchToFace;
sourceInfo
{
name innerCylinder;
name outerCylinder;
}
}

8
tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
View File

@ -335,14 +335,6 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1e-6;