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 state after latest Foundation merge

Browse Source
This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
parent 4ea1613653 360ab50ed6
commit 9fbd612672
4571 changed files with 115696 additions and 74609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
applications/utilities/miscellaneous/patchSummary/patchSummary.C
View File

@ -132,20 +132,20 @@ int main(int argc, char *argv[])
{
// Print each patch separately
forAll(bm, patchI)
forAll(bm, patchi)
{
Info<< bm[patchI].type() << "\t: " << bm[patchI].name() << nl;
outputFieldList(vsf, patchI);
outputFieldList(vvf, patchI);
outputFieldList(vsptf, patchI);
outputFieldList(vsytf, patchI);
outputFieldList(vtf, patchI);
Info<< bm[patchi].type() << "\t: " << bm[patchi].name() << nl;
outputFieldList(vsf, patchi);
outputFieldList(vvf, patchi);
outputFieldList(vsptf, patchi);
outputFieldList(vsytf, patchi);
outputFieldList(vtf, patchi);
outputFieldList(psf, patchI);
outputFieldList(pvf, patchI);
outputFieldList(psptf, patchI);
outputFieldList(psytf, patchI);
outputFieldList(ptf, patchI);
outputFieldList(psf, patchi);
outputFieldList(pvf, patchi);
outputFieldList(psptf, patchi);
outputFieldList(psytf, patchi);
outputFieldList(ptf, patchi);
Info<< endl;
}
}
@ -158,32 +158,32 @@ int main(int argc, char *argv[])
DynamicList<HashTable<word>> fieldToTypes(bm.size());
// Per 'group' the patches
DynamicList<DynamicList<label>> groupToPatches(bm.size());
forAll(bm, patchI)
forAll(bm, patchi)
{
HashTable<word> fieldToType;
collectFieldList(vsf, patchI, fieldToType);
collectFieldList(vvf, patchI, fieldToType);
collectFieldList(vsptf, patchI, fieldToType);
collectFieldList(vsytf, patchI, fieldToType);
collectFieldList(vtf, patchI, fieldToType);
collectFieldList(vsf, patchi, fieldToType);
collectFieldList(vvf, patchi, fieldToType);
collectFieldList(vsptf, patchi, fieldToType);
collectFieldList(vsytf, patchi, fieldToType);
collectFieldList(vtf, patchi, fieldToType);
collectFieldList(psf, patchI, fieldToType);
collectFieldList(pvf, patchI, fieldToType);
collectFieldList(psptf, patchI, fieldToType);
collectFieldList(psytf, patchI, fieldToType);
collectFieldList(ptf, patchI, fieldToType);
collectFieldList(psf, patchi, fieldToType);
collectFieldList(pvf, patchi, fieldToType);
collectFieldList(psptf, patchi, fieldToType);
collectFieldList(psytf, patchi, fieldToType);
collectFieldList(ptf, patchi, fieldToType);
label groupI = findIndex(fieldToTypes, fieldToType);
if (groupI == -1)
{
DynamicList<label> group(1);
group.append(patchI);
group.append(patchi);
groupToPatches.append(group);
fieldToTypes.append(fieldToType);
}
else
{
groupToPatches[groupI].append(patchI);
groupToPatches[groupI].append(patchi);
}
}
@ -230,20 +230,20 @@ int main(int argc, char *argv[])
// No group.
forAll(patchIDs, i)
{
label patchI = patchIDs[i];
Info<< bm[patchI].type()
<< "\t: " << bm[patchI].name() << nl;
outputFieldList(vsf, patchI);
outputFieldList(vvf, patchI);
outputFieldList(vsptf, patchI);
outputFieldList(vsytf, patchI);
outputFieldList(vtf, patchI);
label patchi = patchIDs[i];
Info<< bm[patchi].type()
<< "\t: " << bm[patchi].name() << nl;
outputFieldList(vsf, patchi);
outputFieldList(vvf, patchi);
outputFieldList(vsptf, patchi);
outputFieldList(vsytf, patchi);
outputFieldList(vtf, patchi);
outputFieldList(psf, patchI);
outputFieldList(pvf, patchI);
outputFieldList(psptf, patchI);
outputFieldList(psytf, patchI);
outputFieldList(ptf, patchI);
outputFieldList(psf, patchi);
outputFieldList(pvf, patchi);
outputFieldList(psptf, patchi);
outputFieldList(psytf, patchi);
outputFieldList(ptf, patchi);
Info<< endl;
}
}

26
applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.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
@ -33,7 +33,7 @@ void Foam::addToFieldList
(
PtrList<GeoField>& fieldList,
const IOobject& obj,
const label fieldI,
const label fieldi,
const typename GeoField::Mesh& mesh
)
{
@ -41,7 +41,7 @@ void Foam::addToFieldList
{
fieldList.set
(
fieldI,
fieldi,
new GeoField(obj, mesh)
);
Info<< " " << GeoField::typeName << tab << obj.name() << endl;
@ -53,17 +53,17 @@ template<class GeoField>
void Foam::outputFieldList
(
const PtrList<GeoField>& fieldList,
const label patchI
const label patchi
)
{
forAll(fieldList, fieldI)
forAll(fieldList, fieldi)
{
if (fieldList.set(fieldI))
if (fieldList.set(fieldi))
{
Info<< " " << pTraits<typename GeoField::value_type>::typeName
<< tab << tab
<< fieldList[fieldI].name() << tab << tab
<< fieldList[fieldI].boundaryField()[patchI].type() << nl;
<< fieldList[fieldi].name() << tab << tab
<< fieldList[fieldi].boundaryField()[patchi].type() << nl;
}
}
}
@ -73,18 +73,18 @@ template<class GeoField>
void Foam::collectFieldList
(
const PtrList<GeoField>& fieldList,
const label patchI,
const label patchi,
HashTable<word>& fieldToType
)
{
forAll(fieldList, fieldI)
forAll(fieldList, fieldi)
{
if (fieldList.set(fieldI))
if (fieldList.set(fieldi))
{
fieldToType.insert
(
fieldList[fieldI].name(),
fieldList[fieldI].boundaryField()[patchI].type()
fieldList[fieldi].name(),
fieldList[fieldi].boundaryField()[patchi].type()
);
}
}

8
applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
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
@ -38,7 +38,7 @@ namespace Foam
(
PtrList<GeoField>& fieldList,
const IOobject& obj,
const label fieldI,
const label fieldi,
const typename GeoField::Mesh& mesh
);
@ -46,14 +46,14 @@ namespace Foam
void outputFieldList
(
const PtrList<GeoField>& fieldList,
const label patchI
const label patchi
);
template<class GeoField>
void collectFieldList
(
const PtrList<GeoField>& fieldList,
const label patchI,
const label patchi,
HashTable<word>& fieldToType
);
} // End namespace Foam