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
2009-09-10 22:43:56 +01:00
parent 5467d69f5b c34b49aad8
commit 10caa3dd12
6 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/reactingFoam/reactingFoam.C
View File

@ -68,10 +68,10 @@ int main(int argc, char *argv[])
#include "chemistry.H" #include "chemistry.H"
#include "rhoEqn.H" #include "rhoEqn.H"
#include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++) for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
{ {
#include "UEqn.H"
#include "YEqn.H" #include "YEqn.H"
#define Db turbulence->alphaEff() #define Db turbulence->alphaEff()

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

@ -167,6 +167,16 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
forAll (oldPatches, patchI) forAll (oldPatches, patchI)
{ {
const polyPatch& curPatch = oldPatches[patchI]; const polyPatch& curPatch = oldPatches[patchI];
if (curPatch.coupled())
{
WarningIn("mirrorFvMesh::mirrorFvMesh(const IOobject&)")
<< "Found coupled patch " << curPatch.name() << endl
<< " Mirroring faces on coupled patches destroys"
<< " the ordering. This might be fixed by running a dummy"
<< " createPatch afterwards." << endl;
}
boolList& curInsBouFace = insertedBouFace[patchI]; boolList& curInsBouFace = insertedBouFace[patchI];
curInsBouFace.setSize(curPatch.size()); curInsBouFace.setSize(curPatch.size());

28
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -237,23 +237,28 @@ int main(int argc, char *argv[])
if (writeCellDist) if (writeCellDist)
{ {
const labelList& procIds = mesh.cellToProc();
// Write the decomposition as labelList for use with 'manual' // Write the decomposition as labelList for use with 'manual'
// decomposition method. // decomposition method.
labelIOList cellDecomposition
// FIXME: may attempt to write to a non-existent "region0/"
OFstream os
( (
runTime.path() IOobject
/ mesh.facesInstance() (
/ regionName "cellDecomposition",
/ "cellDecomposition" mesh.facesInstance(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
procIds
); );
cellDecomposition.write();
os << mesh.cellToProc();
Info<< nl << "Wrote decomposition to " Info<< nl << "Wrote decomposition to "
<< os.name() << " for use in manual decomposition." << cellDecomposition.objectPath()
<< endl; << " for use in manual decomposition." << endl;
// Write as volScalarField for postprocessing. // Write as volScalarField for postprocessing.
volScalarField cellDist volScalarField cellDist
@ -271,7 +276,6 @@ int main(int argc, char *argv[])
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
); );
const labelList& procIds = mesh.cellToProc();
forAll(procIds, celli) forAll(procIds, celli)
{ {
cellDist[celli] = procIds[celli]; cellDist[celli] = procIds[celli];

2
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
View File

@ -191,7 +191,7 @@ void Foam::vtkPV3Foam::convertPointField
pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size()); pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
pointData->SetNumberOfComponents(nComp); pointData->SetNumberOfComponents(nComp);
pointData->Allocate(nComp*(nPoints + addPointCellLabels.size())); pointData->Allocate(nComp*(nPoints + addPointCellLabels.size()));
pointData->SetName(tf.name().c_str()); pointData->SetName(ptf.name().c_str());
if (debug) if (debug)
{ {

6
src/finiteVolume/fvMesh/fvPatches/derived/directMapped/directMappedWallFvPatch.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef directMappedWallFvPatch_H #ifndef directMappedWallFvPatch_H
#define directMappedWallFvPatch_H #define directMappedWallFvPatch_H
#include "fvPatch.H" #include "wallFvPatch.H"
#include "directMappedWallPolyPatch.H" #include "directMappedWallPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,7 +50,7 @@ namespace Foam
class directMappedWallFvPatch class directMappedWallFvPatch
: :
public fvPatch public wallFvPatch
{ {
public: public:
@ -68,7 +68,7 @@ public:
const fvBoundaryMesh& bm const fvBoundaryMesh& bm
) )
: :
fvPatch(patch, bm) wallFvPatch(patch, bm)
{} {}
}; };

6
src/meshTools/directMapped/directMappedPointPatch/directMappedWallPointPatch.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef directMappedWallPointPatch_H #ifndef directMappedWallPointPatch_H
#define directMappedWallPointPatch_H #define directMappedWallPointPatch_H
#include "facePointPatch.H" #include "wallPointPatch.H"
#include "directMappedWallPolyPatch.H" #include "directMappedWallPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,7 +50,7 @@ namespace Foam
class directMappedWallPointPatch class directMappedWallPointPatch
: :
public facePointPatch public wallPointPatch
{ {
public: public:
@ -68,7 +68,7 @@ public:
const pointBoundaryMesh& bm const pointBoundaryMesh& bm
) )
: :
facePointPatch(patch, bm) wallPointPatch(patch, bm)
{} {}
}; };