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 commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-08-06 18:08:53 +02:00
parent de195bf1fd 731d257f34
commit f5e73da8aa
13 changed files with 282 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View File

@ -178,6 +178,11 @@ public:
{
return lambda_;
}
const volScalarField& kappa() const
{
return kappa_;
}
};

7
applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
View File

@ -89,13 +89,11 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::validArgs.append("Neutral file");
argList::validOptions.insert("overwrite", "");
# include "setRootCase.H"
# include "createTime.H"
fileName neuFile(args.additionalArgs()[0]);
bool overwrite = args.options().found("overwrite");
IFstream str(neuFile);
@ -300,11 +298,6 @@ int main(int argc, char *argv[])
}
if (!overwrite)
{
runTime++;
}
polyMesh mesh
(
IOobject

209
applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
View File

@ -54,8 +54,9 @@ Description
NOTE:
- for some reason boundary faces point inwards. I just reverse them
always. Might use some geometric check instead.
- marked faces might not actually be boundary faces of mesh. This is not handled
and you'll have to run without face file (-noFaceFile option)
- marked faces might not actually be boundary faces of mesh.
This is hopefully handled now by first constructing without boundaries
and then reconstructing with boundary faces.
\*---------------------------------------------------------------------------*/
@ -69,20 +70,40 @@ using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Find label of face.
label findFace(const primitiveMesh& mesh, const face& f)
{
const labelList& pFaces = mesh.pointFaces()[f[0]];
forAll(pFaces, i)
{
label faceI = pFaces[i];
if (mesh.faces()[faceI] == f)
{
return faceI;
}
}
FatalErrorIn("findFace(const primitiveMesh&, const face&)")
<< "Cannot find face " << f << " in mesh." << abort(FatalError);
return -1;
}
// Main program:
int main(int argc, char *argv[])
{
argList::validArgs.append("file prefix");
argList::validOptions.insert("noFaceFile", "");
argList::validOptions.insert("overwrite", "");
# include "setRootCase.H"
# include "createTime.H"
bool readFaceFile = !args.options().found("noFaceFile");
bool overwrite = args.options().found("overwrite");
fileName prefix(args.additionalArgs()[0]);
@ -287,16 +308,44 @@ int main(int argc, char *argv[])
}
label nPatches = 0;
//
// Construct mesh with default boundary only
//
autoPtr<polyMesh> meshPtr
(
new polyMesh
(
IOobject
(
polyMesh::defaultRegion,
runTime.constant(),
runTime
),
points,
cells,
faceListList(0),
wordList(0), //boundaryPatchNames
wordList(0), //boundaryPatchTypes
"defaultFaces",
polyPatch::typeName,
wordList(0)
)
);
const polyMesh& mesh = meshPtr;
// List of Foam vertices per boundary face
faceList boundaryFaces;
// For each boundary faces the Foam patchID
labelList boundaryPatch;
if (readFaceFile)
{
label nPatches = 0;
// List of Foam vertices per boundary face
faceList boundaryFaces;
// For each boundary faces the Foam patchID
labelList boundaryPatch;
//
// read boundary faces
//
@ -366,48 +415,59 @@ int main(int argc, char *argv[])
f[2-i] = nodeToPoint[nodeI];
}
boundaryFaces[faceI] = f;
if (nFaceAttr > 0)
if (findFace(mesh, f) >= mesh.nInternalFaces())
{
// First attribute is the region number
faceLine >> region;
boundaryFaces[faceI] = f;
// Get Foam patchID and update region->patch table.
label patchI = 0;
Map<label>::iterator patchFind = regionToPatch.find(region);
if (patchFind == regionToPatch.end())
if (nFaceAttr > 0)
{
patchI = nPatches;
// First attribute is the region number
faceLine >> region;
Info<< "Mapping tetgen region " << region
<< " to Foam patch "
<< patchI << endl;
regionToPatch.insert(region, nPatches++);
}
else
{
patchI = patchFind();
// Get Foam patchID and update region->patch table.
label patchI = 0;
Map<label>::iterator patchFind =
regionToPatch.find(region);
if (patchFind == regionToPatch.end())
{
patchI = nPatches;
Info<< "Mapping tetgen region " << region
<< " to Foam patch "
<< patchI << endl;
regionToPatch.insert(region, nPatches++);
}
else
{
patchI = patchFind();
}
boundaryPatch[faceI] = patchI;
// Skip remaining attributes
for (label i = 1; i < nFaceAttr; i++)
{
faceLine >> dummy;
}
}
boundaryPatch[faceI] = patchI;
// Skip remaining attributes
for (label i = 1; i < nFaceAttr; i++)
{
faceLine >> dummy;
}
faceI++;
}
faceI++;
}
}
// Print region to patch mapping
// Trim
boundaryFaces.setSize(faceI);
boundaryPatch.setSize(faceI);
// Print region to patch mapping
Info<< "Regions:" << endl;
for
@ -421,28 +481,23 @@ int main(int argc, char *argv[])
<< iter() << endl;
}
Info<< endl;
}
// Storage for boundary faces
// Storage for boundary faces
faceListList patchFaces(nPatches);
wordList patchNames(nPatches);
faceListList patchFaces(nPatches);
forAll(patchNames, patchI)
{
patchNames[patchI] = word("patch") + name(patchI);
}
wordList patchNames(nPatches);
forAll(patchNames, patchI)
{
patchNames[patchI] = word("patch") + name(patchI);
}
wordList patchTypes(nPatches, polyPatch::typeName);
word defaultFacesName = "defaultFaces";
word defaultFacesType = polyPatch::typeName;
wordList patchPhysicalTypes(nPatches, polyPatch::typeName);
wordList patchTypes(nPatches, polyPatch::typeName);
word defaultFacesName = "defaultFaces";
word defaultFacesType = polyPatch::typeName;
wordList patchPhysicalTypes(nPatches, polyPatch::typeName);
if (readFaceFile)
{
// Sort boundaryFaces by patch using boundaryPatch.
List<DynamicList<face> > allPatchFaces(nPatches);
@ -464,34 +519,34 @@ int main(int argc, char *argv[])
}
Info<< endl;
}
if (!overwrite)
{
runTime++;
}
polyMesh mesh
(
IOobject
meshPtr.reset
(
polyMesh::defaultRegion,
runTime.constant(),
runTime
),
points,
cells,
patchFaces,
patchNames,
patchTypes,
defaultFacesName,
defaultFacesType,
patchPhysicalTypes
);
new polyMesh
(
IOobject
(
polyMesh::defaultRegion,
runTime.constant(),
runTime
),
points,
cells,
patchFaces,
patchNames,
patchTypes,
defaultFacesName,
defaultFacesType,
patchPhysicalTypes
)
);
}
Info<< "Writing mesh to " << runTime.constant() << endl << endl;
mesh.write();
meshPtr().write();
Info<< "End\n" << endl;

37
src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
View File

@ -485,6 +485,43 @@ void HashTable<T, Key, Hash>::operator=(const HashTable<T, Key, Hash>& ht)
}
template<class T, class Key, class Hash>
bool HashTable<T, Key, Hash>::operator==(const HashTable<T, Key, Hash>& ht)
const
{
// Are all my elements in ht?
for (const_iterator iter = begin(); iter != end(); ++iter)
{
const_iterator fnd = ht.find(iter.key());
if (fnd == ht.end() || (fnd() != iter()))
{
return false;
}
}
// Are all ht elements in me?
for (const_iterator iter = ht.begin(); iter != ht.end(); ++iter)
{
const_iterator fnd = find(iter.key());
if (fnd == end() || (fnd() != iter()))
{
return false;
}
}
return true;
}
template<class T, class Key, class Hash>
bool HashTable<T, Key, Hash>::operator!=(const HashTable<T, Key, Hash>& ht)
const
{
return !(operator==(ht));
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

9
src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
View File

@ -223,6 +223,15 @@ public:
//- Assignment
void operator=(const HashTable<T, Key, Hash>&);
//- Equality. Two hashtables are equal if all contents of first are
// also in second and vice versa. So does not depend on table size or
// order!
bool operator==(const HashTable<T, Key, Hash>&) const;
//- The opposite of the equality operation. Takes linear time.
bool operator!=(const HashTable<T, Key, Hash>&) const;
// STL type definitions

4
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
View File

@ -570,7 +570,9 @@ public:
// region and split them.
autoPtr<mapPolyMesh> dupNonManifoldPoints();
//- Create baffle for every internal face where ownPatch != -1
//- Create baffle for every internal face where ownPatch != -1.
// External faces get repatched according to ownPatch (neiPatch
// should be -1 for these)
autoPtr<mapPolyMesh> createBaffles
(
const labelList& ownPatch,

13
src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
View File

@ -236,6 +236,17 @@ void Foam::layerAdditionRemoval::removeCellLayer
];
}
label newNei;
if (curFaceID < mesh.nInternalFaces())
{
newNei = nei[curFaceID];
}
else
{
newNei = -1;
}
// Modify the face
ref.setAction
(
@ -244,7 +255,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
newFace, // modified face
curFaceID, // label of face being modified
own[curFaceID], // owner
nei[curFaceID], // neighbour
newNei, // neighbour
false, // face flip
mesh.boundaryMesh().whichPatch(curFaceID),// patch for face
false, // remove from zone

12
src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
View File

@ -214,6 +214,18 @@ void Foam::removeCells::setRefinement
{
label patchI = exposedPatchIDs[i];
if (patchI < 0 || patchI >= patches.size())
{
FatalErrorIn
(
"removeCells::setRefinement(const labelList&"
", const labelList&, const labelList&, polyTopoChange&)"
) << "Invalid patch " << patchI
<< " for exposed face " << exposedFaceLabels[i] << endl
<< "Valid patches 0.." << patches.size()-1
<< abort(FatalError);
}
if (patches[patchI].coupled())
{
FatalErrorIn

1
src/lagrangian/solidParticle/solidParticleCloud.C
View File

@ -35,6 +35,7 @@ License
namespace Foam
{
defineParticleTypeNameAndDebug(solidParticle, 0);
defineTemplateTypeNameAndDebug(Cloud<solidParticle>, 0);
};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

7
src/meshTools/searchableSurface/searchableSphere.C
View File

@ -233,10 +233,9 @@ void Foam::searchableSphere::findLineAll
{
info.setSize(start.size());
pointIndexHit near, far;
forAll(start, i)
{
pointIndexHit near, far;
findLineAll(start[i], end[i], near, far);
if (near.hit())
@ -260,6 +259,10 @@ void Foam::searchableSphere::findLineAll
info[i].setSize(1);
info[i][0] = far;
}
else
{
info[i].clear();
}
}
}
}

10
src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
View File

@ -206,10 +206,7 @@ void Foam::fieldToCell::applyToSet
}
else if (fieldObject.headerClassName() == "volScalarField")
{
IFstream str
(
mesh().time().path()/mesh().time().timeName()/fieldName_
);
IFstream str(fieldObject.filePath());
// Read dictionary
dictionary fieldDict(str);
@ -220,10 +217,7 @@ void Foam::fieldToCell::applyToSet
}
else if (fieldObject.headerClassName() == "volVectorField")
{
IFstream str
(
mesh().time().path()/mesh().time().timeName()/fieldName_
);
IFstream str(fieldObject.filePath());
// Read dictionary
dictionary fieldDict(str);

22
src/thermophysicalModels/pdfs/pdf/newPdf.C
View File

@ -37,31 +37,23 @@ autoPtr<Foam::pdf> Foam::pdf::New
Random& rndGen
)
{
word pdfType
(
dict.lookup("pdfType")
);
word pdfType(dict.lookup("pdfType"));
Info << "Selecting pdfType "
<< pdfType << endl;
Info<< "Selecting pdfType " << pdfType << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(pdfType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalError
<< "pdf::New(const dictionary&, Random&) : " << endl
<< " unknown pdfType type "
<< pdfType
<< ", constructor not in hash table" << endl << endl
<< " Valid pdf types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
FatalErrorIn("pdf::New(const dictionary&, Random&)")
<< "unknown pdf type " << pdfType << endl << endl
<< "Valid pdf types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< exit(FatalError);
}
return autoPtr<pdf>(cstrIter()(dict, rndGen));
//return autoPtr<pdf>(new pdf);
}
// ************************************************************************* //

56
tutorials/sonicTurbFoam/nacaAirfoil/system/controlDict
View File

@ -44,4 +44,60 @@ timePrecision 6;
runTimeModifiable yes;
functions
(
//forces
//{
// type forces;
// functionObjectLibs ("libforces.so");
//
// // Patches to sample
// patches (WALL10);
// // Name of fields
// pName p;
// Uname U;
// // Dump to file
// log true;
// // Density
// rhoInf 1;
// // Centre of rotation
// CofR (0 0 0);
//}
forces
{
type forceCoeffs;
functionObjectLibs ("libforces.so");
// Patches to sample
patches (WALL10);
// Name of fields
pName p;
Uname U;
// Dump to file
log true;
// Density
rhoInf 1;
// Centre of rotation
CofR (0 0 0);
// Direction for lift
liftDir (-0.239733 0.970839 0);
// Direction for drag
dragDir ( 0.970839 0.239733 0);
// Pitching axis
pitchAxis (0 0 1);
magUInf 618.022;
lRef 1.0;
Aref 1.0;
}
);
// ************************************************************************* //