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

GIT: Initial commit after latest foundation merge

Browse Source
This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
parent 69ae5a9a78 e5a029c187
commit fd9d801e2d
4003 changed files with 74634 additions and 37783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -130,7 +130,7 @@ void subsetVolFields
const label patchI,
const Type& exposedValue,
const word GeomVolType,
PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
@ -202,7 +202,7 @@ void subsetSurfaceFields
const label patchI,
const Type& exposedValue,
const word GeomSurfType,
PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
@ -581,10 +581,10 @@ int main(int argc, char *argv[])
);
// Per faceSet the patch to put the baffles into
const List<Pair<word> > setsAndPatches(dict.lookup("blockedFaces"));
const List<Pair<word>> setsAndPatches(dict.lookup("blockedFaces"));
// Per faceSet the patch to put the coupled baffles into
DynamicList<FixedList<word, 3> > coupledAndPatches(10);
DynamicList<FixedList<word, 3>> coupledAndPatches(10);
const dictionary& functionDicts = dict.subDict("coupledFaces");
forAllConstIter(dictionary, functionDicts, iter)
{
@ -782,7 +782,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<scalar>::zero,
scalar(Zero),
volScalarField::typeName,
scalarFlds
);
@ -794,7 +794,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<vector>::zero,
vector(Zero),
volVectorField::typeName,
vectorFlds
);
@ -812,7 +812,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<sphericalTensor>::zero,
sphericalTensor(Zero),
volSphericalTensorField::typeName,
sphericalTensorFlds
);
@ -824,7 +824,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<symmTensor>::zero,
symmTensor(Zero),
volSymmTensorField::typeName,
symmTensorFlds
);
@ -836,7 +836,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<tensor>::zero,
tensor(Zero),
volTensorField::typeName,
tensorFlds
);
@ -850,7 +850,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<scalar>::zero,
scalar(Zero),
surfaceScalarField::typeName,
surfScalarFlds
);
@ -862,7 +862,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<vector>::zero,
vector(Zero),
surfaceVectorField::typeName,
surfVectorFlds
);
@ -880,7 +880,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<sphericalTensor>::zero,
sphericalTensor(Zero),
surfaceSphericalTensorField::typeName,
surfSphericalTensorFlds
);
@ -900,7 +900,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<symmTensor>::zero,
symmTensor(Zero),
surfaceSymmTensorField::typeName,
surfSymmTensorFlds
);
@ -912,7 +912,7 @@ int main(int argc, char *argv[])
subsetter,
objects,
defaultPatchI,
pTraits<tensor>::zero,
tensor(Zero),
surfaceTensorField::typeName,
surfTensorFlds
);
@ -1076,25 +1076,25 @@ int main(int argc, char *argv[])
(
subsetter.subMesh(),
map,
vector::zero
Zero
);
initCreatedPatches<volSphericalTensorField>
(
subsetter.subMesh(),
map,
sphericalTensor::zero
Zero
);
initCreatedPatches<volSymmTensorField>
(
subsetter.subMesh(),
map,
symmTensor::zero
Zero
);
initCreatedPatches<volTensorField>
(
subsetter.subMesh(),
map,
tensor::zero
Zero
);
initCreatedPatches<surfaceScalarField>
@ -1107,25 +1107,25 @@ int main(int argc, char *argv[])
(
subsetter.subMesh(),
map,
vector::zero
Zero
);
initCreatedPatches<surfaceSphericalTensorField>
(
subsetter.subMesh(),
map,
sphericalTensor::zero
Zero
);
initCreatedPatches<surfaceSymmTensorField>
(
subsetter.subMesh(),
map,
symmTensor::zero
Zero
);
initCreatedPatches<surfaceTensorField>
(
subsetter.subMesh(),
map,
tensor::zero
Zero
);

4
applications/utilities/mesh/advanced/autoRefineMesh/Make/files
View File

@ -1,4 +1,4 @@
autoRefineMesh.C
snappyRefineMesh.C
EXE = $(FOAM_APPBIN)/autoRefineMesh
EXE = $(FOAM_APPBIN)/snappyRefineMesh

6
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C → applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
autoRefineMesh
snappyRefineMesh
Description
Utility to refine cells near to a surface.
@ -670,7 +670,7 @@ int main(int argc, char *argv[])
(
IOobject
(
"autoRefineMeshDict",
"snappyRefineMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,

2
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict → applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
object autoRefineMeshDict;
object snappyRefineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

25
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -80,6 +80,7 @@ int main(int argc, char *argv[])
"Collapse faces that are in the supplied face set"
);
#include "addDictOption.H"
#include "addOverwriteOption.H"
#include "setRootCase.H"
#include "createTime.H"
@ -91,6 +92,13 @@ int main(int argc, char *argv[])
const word oldInstance = mesh.pointsInstance();
const word dictName("collapseDict");
#include "setSystemMeshDictionaryIO.H"
Info<< "Reading " << dictName << nl << endl;
IOdictionary collapseDict(dictIO);
const bool overwrite = args.optionFound("overwrite");
const bool collapseFaces = args.optionFound("collapseFaces");
@ -155,7 +163,10 @@ int main(int argc, char *argv[])
{
meshFilterPtr.set(new polyMeshFilter(mesh, pointPriority));
meshFilterPtr.set
(
new polyMeshFilter(mesh, pointPriority, collapseDict)
);
polyMeshFilter& meshFilter = meshFilterPtr();
// newMesh will be empty until it is filtered
@ -177,7 +188,10 @@ int main(int argc, char *argv[])
if (collapseFaceSet)
{
meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
meshFilterPtr.reset
(
new polyMeshFilter(mesh, pointPriority, collapseDict)
);
polyMeshFilter& meshFilter = meshFilterPtr();
const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();
@ -198,7 +212,10 @@ int main(int argc, char *argv[])
if (collapseFaces)
{
meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
meshFilterPtr.reset
(
new polyMeshFilter(mesh, pointPriority, collapseDict)
);
polyMeshFilter& meshFilter = meshFilterPtr();
const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();

16
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -355,9 +355,9 @@ int main(int argc, char *argv[])
);
// Read all from the dictionary.
List<Pair<point> > pointsToMove(dict.lookup("pointsToMove"));
List<Pair<point> > edgesToSplit(dict.lookup("edgesToSplit"));
List<Pair<point> > facesToTriangulate
List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
List<Pair<point>> facesToTriangulate
(
dict.lookup("facesToTriangulate")
);
@ -369,15 +369,15 @@ int main(int argc, char *argv[])
|| facesToTriangulate.size()
);
List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
List<Pair<point>> edgesToCollapse(dict.lookup("edgesToCollapse"));
bool collapseEdge = edgesToCollapse.size();
List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
List<Pair<point>> cellsToPyramidise(dict.lookup("cellsToSplit"));
bool cellsToSplit = cellsToPyramidise.size();
// List<Tuple2<pointField,point> >
// List<Tuple2<pointField,point>>
// cellsToCreate(dict.lookup("cellsToCreate"));
Info<< "Read from " << dict.name() << nl
@ -442,7 +442,7 @@ int main(int argc, char *argv[])
Info<< nl << "Looking up edges to split ..." << nl << endl;
Map<List<point> > edgeToCuts(edgesToSplit.size());
Map<List<point>> edgeToCuts(edgesToSplit.size());
forAll(edgesToSplit, i)
{
const Pair<point>& pts = edgesToSplit[i];

4
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -122,7 +122,7 @@ int main(int argc, char *argv[])
SortableList<scalar> sortedVols(vols);
// All cell labels, sorted per bin.
DynamicList<DynamicList<label> > bins;
DynamicList<DynamicList<label>> bins;
// Lower/upper limits
DynamicList<scalar> lowerLimits;