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://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2010-11-12 12:13:49 +00:00
parent 8490014bf6 f53538b831
commit 9b73aba1d9
275 changed files with 1821 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/reactingFoam/chemistry.H
View File

@ -11,7 +11,7 @@
if (turbulentReaction)
{
volScalarField tk =
Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
volScalarField tc = chemistry.tc();
// Chalmers PaSR model

4
applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
View File

@ -325,8 +325,8 @@ void Foam::MULES::limiter
const fvMesh& mesh = psi.mesh();
const unallocLabelList& owner = mesh.owner();
const unallocLabelList& neighb = mesh.neighbour();
const labelUList& owner = mesh.owner();
const labelUList& neighb = mesh.neighbour();
tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
const scalarField& V = tVsc();

6
applications/test/PackedList4/PackedListTest4.C
View File

@ -96,7 +96,7 @@ int main(int argc, char *argv[])
(list3 |= list2).printBits(Info);
}
Info<< "\noperator|= with UList<label>\n";
Info<< "\noperator|= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 |= list2Labels).printBits(Info);
@ -114,7 +114,7 @@ int main(int argc, char *argv[])
(list3 += list2).printBits(Info);
}
Info<< "\noperator+= with UList<label>\n";
Info<< "\noperator+= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 += list2Labels).printBits(Info);
@ -126,7 +126,7 @@ int main(int argc, char *argv[])
(list3 -= list2).printBits(Info);
}
Info<< "\noperator-= with UList<label>\n";
Info<< "\noperator-= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 -= list2Labels).printBits(Info);

6
applications/test/vector/vectorTest.C
View File

@ -27,7 +27,11 @@ int main()
Info<< magSqr(d) << endl;
vector d2(0.5, 0.51, -0.5);
Info<< cmptMax(d2) << " " << cmptSum(d2) << " " << cmptMag(d2) << endl;
Info<< cmptMax(d2) << " "
<< cmptSum(d2) << " "
<< cmptProduct(d2) << " "
<< cmptMag(d2)
<< endl;
Info<< min(d, d2) << endl;
return 0;
}

4
applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
View File

@ -124,8 +124,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const
fluentMeshFile
<< "))" << std::endl << std::endl;
const unallocLabelList& own = owner();
const unallocLabelList& nei = neighbour();
const labelUList& own = owner();
const labelUList& nei = neighbour();
const faceList& fcs = faces();

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

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: 1.7.1 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -106,7 +106,8 @@ castellatedMeshControls
// Explicit feature edge refinement
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Specifies a level for any cell intersected by its edges.
// Specifies a level for any cell intersected by explicitly provided
// edges.
// This is a featureEdgeMesh, read from constant/triSurface for now.
features
(

2
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -138,7 +138,7 @@ Foam::label Foam::checkTopology
{
if (patches[patchI].coupled())
{
const unallocLabelList& owners = patches[patchI].faceCells();
const labelUList& owners = patches[patchI].faceCells();
forAll(owners, i)
{

4
applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
View File

@ -128,7 +128,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
// Distribute internal faces
labelListList newCellFaces(oldCells.size());
const unallocLabelList& oldOwnerStart = lduAddr().ownerStartAddr();
const labelUList& oldOwnerStart = lduAddr().ownerStartAddr();
forAll(newCellFaces, cellI)
{
@ -168,7 +168,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
curInsBouFace = false;
// Get faceCells for face insertion
const unallocLabelList& curFaceCells = curPatch.faceCells();
const labelUList& curFaceCells = curPatch.faceCells();
const label curStart = curPatch.start();
forAll(curPatch, faceI)

10
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
View File

@ -164,7 +164,7 @@ void Foam::domainDecomposition::decomposeMesh()
// Normal patch. Add faces to processor where the cell
// next to the face lives
const unallocLabelList& patchFaceCells =
const labelUList& patchFaceCells =
patches[patchi].faceCells();
forAll(patchFaceCells, facei)
@ -185,9 +185,9 @@ void Foam::domainDecomposition::decomposeMesh()
patches[patchi]
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const labelUList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
forAll(patchFaceCells, facei)
@ -259,8 +259,8 @@ void Foam::domainDecomposition::decomposeMesh()
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& patchFaceCells = pp.faceCells();
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
// Store old sizes. Used to detect which inter-proc patches

8
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
View File

@ -30,7 +30,7 @@ License
Foam::fvFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
)
:
@ -48,7 +48,7 @@ Foam::fvFieldDecomposer::processorVolPatchFieldDecomposer::
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
directAddressing_(addressingSlice.size())
@ -95,7 +95,7 @@ processorVolPatchFieldDecomposer
Foam::fvFieldDecomposer::processorSurfacePatchFieldDecomposer::
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
addressing_(addressingSlice.size()),
@ -171,7 +171,7 @@ Foam::fvFieldDecomposer::fvFieldDecomposer
processorSurfacePatchFieldDecomposerPtrs_[patchi] =
new processorSurfacePatchFieldDecomposer
(
static_cast<const unallocLabelList&>
static_cast<const labelUList&>
(
procMesh_.boundary()[patchi].patchSlice
(

10
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
View File

@ -71,7 +71,7 @@ public:
//- Construct given addressing
patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
);
@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
@ -112,7 +112,7 @@ public:
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);
@ -128,7 +128,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
@ -149,7 +149,7 @@ public:
//- Construct given addressing
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);

2
applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
View File

@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}

1
applications/utilities/postProcessing/sampling/sample/sampleDict
View File

@ -27,6 +27,7 @@ setFormat raw;
// Surface output format. Choice of
// null : suppress output
// ensight : Ensight Gold format, one field per case file
// foamFile : separate points, faces and values file
// dx : DX scalar or vector format
// vtk : VTK ascii format