songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs 2012-05-29 10:40:45 +01:00
commit cc6d07c40e
7 changed files with 65 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
View File

@ -661,10 +661,10 @@ void Foam::PairCollision<CloudType>::collide()
{
preInteraction();
parcelInteraction();
wallInteraction();
parcelInteraction();
postInteraction();
}

4
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
View File

@ -411,10 +411,10 @@ void Foam::ThermoSurfaceFilm<CloudType>::splashInteraction
const scalar EKIn = 0.5*m*magSqr(Urel);
// incident surface energy [J]
const scalar ESigmaIn = sigma*p.areaS(d);
const scalar ESigmaIn = np*sigma*p.areaS(d);
// dissipative energy
const scalar Ed = max(0.8*EKIn, Wec/12*pi*sigma*sqr(d));
const scalar Ed = max(0.8*EKIn, np*Wec/12*pi*sigma*sqr(d));
// total energy [J]
const scalar EKs = EKIn + ESigmaIn - ESigmaSec - Ed;

75
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View File

@ -142,8 +142,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::writeIntersectionOBJ
template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::checkPatches
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const
{
const scalar maxBoundsError = 0.05;
@ -166,8 +166,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::checkPatches
(
"AMIInterpolation<SourcePatch, TargetPatch>::checkPatches"
"("
"const primitivePatch&, "
"const primitivePatch&"
"const SourcePatch&, "
"const TargetPatch&"
")"
) << "Source and target patch bounding boxes are not similar" << nl
<< " source box span : " << bbSrc.span() << nl
@ -182,7 +182,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::checkPatches
template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::resetTree
(
const primitivePatch& tgtPatch
const TargetPatch& tgtPatch
)
{
// Clear the old octree
@ -212,8 +212,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::resetTree
template<class SourcePatch, class TargetPatch>
Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const
{
label procI = 0;
@ -297,7 +297,7 @@ template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::distributePatches
(
const mapDistribute& map,
const primitivePatch& pp,
const TargetPatch& pp,
const globalIndex& gi,
List<faceList>& faces,
List<pointField>& points,
@ -394,7 +394,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::
distributeAndMergePatches
(
const mapDistribute& map,
const primitivePatch& tgtPatch,
const TargetPatch& tgtPatch,
const globalIndex& gi,
faceList& tgtFaces,
pointField& tgtPoints,
@ -509,8 +509,8 @@ template<class SourcePatch, class TargetPatch>
Foam::autoPtr<Foam::mapDistribute>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const
{
// Get decomposition of patch
@ -711,7 +711,7 @@ template<class SourcePatch, class TargetPatch>
Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::findTargetFace
(
const label srcFaceI,
const primitivePatch& srcPatch
const SourcePatch& srcPatch
) const
{
label targetFaceI = -1;
@ -745,7 +745,7 @@ template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::appendNbrFaces
(
const label faceI,
const primitivePatch& patch,
const TargetPatch& patch,
const DynamicList<label>& visitedFaces,
DynamicList<label>& faceIDs
) const
@ -793,8 +793,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::setNextFaces
label& startSeedI,
label& srcFaceI,
label& tgtFaceI,
const primitivePatch& srcPatch0,
const primitivePatch& tgtPatch0,
const SourcePatch& srcPatch0,
const TargetPatch& tgtPatch0,
const boolList& mapFlag,
labelList& seedFaces,
const DynamicList<label>& visitedFaces
@ -897,8 +897,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::setNextFaces
"label&, "
"label&, "
"label&, "
"const primitivePatch&, "
"const primitivePatch&, "
"const SourcePatch&, "
"const TargetPatch&, "
"const boolList&, "
"labelList&, "
"const DynamicList<label>&"
@ -913,8 +913,8 @@ Foam::scalar Foam::AMIInterpolation<SourcePatch, TargetPatch>::interArea
(
const label srcFaceI,
const label tgtFaceI,
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const
{
const pointField& srcPoints = srcPatch.points();
@ -964,20 +964,17 @@ Foam::scalar Foam::AMIInterpolation<SourcePatch, TargetPatch>::interArea
template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch,
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch,
label srcFaceI,
label tgtFaceI
)
{
if (!srcPatch.size() || !tgtPatch.size())
if (debug && (!srcPatch.size() || !tgtPatch.size()))
{
if (debug)
{
Pout<< "AMI: Patches not on processor: Source faces = "
<< srcPatch.size() << ", target faces = " << tgtPatch.size()
<< endl;
}
Pout<< "AMI: Patches not on processor: Source faces = "
<< srcPatch.size() << ", target faces = " << tgtPatch.size()
<< endl;
}
if (!srcPatch.size())
@ -991,8 +988,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
"void Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
"calcAddressing"
"("
"const primitivePatch&, "
"const primitivePatch&, "
"const SourcePatch&, "
"const TargetPatch&, "
"label, "
"label"
")"
@ -1036,8 +1033,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
"void Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
"calcAddressing"
"("
"const primitivePatch&, "
"const primitivePatch&, "
"const SourcePatch&, "
"const TargetPatch&, "
"label, "
"label"
")"
@ -1543,7 +1540,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
{
// create new patches for source and target
pointField srcPoints = srcPatch.points();
primitivePatch srcPatch0
SourcePatch srcPatch0
(
SubList<face>
(
@ -1564,7 +1561,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
}
pointField tgtPoints = tgtPatch.points();
primitivePatch tgtPatch0
TargetPatch tgtPatch0
(
SubList<face>
(
@ -1735,8 +1732,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::~AMIInterpolation()
template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
)
{
// Calculate face areas
@ -1785,7 +1782,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
tgtFaceIDs
);
primitivePatch
TargetPatch
newTgtPatch
(
SubList<face>
@ -2145,8 +2142,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
template<class SourcePatch, class TargetPatch>
void Foam::AMIInterpolation<SourcePatch, TargetPatch>::writeFaceConnectivity
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch,
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch,
const labelListList& srcAddress
)
const

42
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
View File

@ -160,12 +160,12 @@ class AMIInterpolation
//- Check that patches are valid
void checkPatches
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const;
//- Reset the octree for the traget patch face search
void resetTree(const primitivePatch& tgtPatch);
void resetTree(const TargetPatch& tgtPatch);
@ -174,8 +174,8 @@ class AMIInterpolation
//- Calculate if patches are on multiple processors
label calcDistribution
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const;
label calcOverlappingProcs
@ -188,7 +188,7 @@ class AMIInterpolation
void distributePatches
(
const mapDistribute& map,
const primitivePatch& pp,
const TargetPatch& pp,
const globalIndex& gi,
List<faceList>& faces,
List<pointField>& points,
@ -198,7 +198,7 @@ class AMIInterpolation
void distributeAndMergePatches
(
const mapDistribute& map,
const primitivePatch& tgtPatch,
const TargetPatch& tgtPatch,
const globalIndex& gi,
faceList& tgtFaces,
pointField& tgtPoints,
@ -207,8 +207,8 @@ class AMIInterpolation
autoPtr<mapDistribute> calcProcMap
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const;
@ -228,14 +228,14 @@ class AMIInterpolation
label findTargetFace
(
const label srcFaceI,
const primitivePatch& srcPatch
const SourcePatch& srcPatch
) const;
//- Add faces neighbouring faceI to the ID list
void appendNbrFaces
(
const label faceI,
const primitivePatch& patch,
const TargetPatch& patch,
const DynamicList<label>& visitedFaces,
DynamicList<label>& faceIDs
) const;
@ -246,8 +246,8 @@ class AMIInterpolation
label& startSeedI,
label& srcFaceI,
label& tgtFaceI,
const primitivePatch& srcPatch0,
const primitivePatch& tgtPatch0,
const SourcePatch& srcPatch0,
const TargetPatch& tgtPatch0,
const boolList& mapFlag,
labelList& seedFaces,
const DynamicList<label>& visitedFaces
@ -261,15 +261,15 @@ class AMIInterpolation
(
const label srcFaceI,
const label tgtFaceI,
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
) const;
//- Calculate addressing
void calcAddressing
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch,
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch,
label srcFaceI = -1,
label tgtFaceI = -1
);
@ -398,8 +398,8 @@ public:
//- Update addressing and weights
void update
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch
);
@ -495,8 +495,8 @@ public:
//- Write face connectivity as OBJ file
void writeFaceConnectivity
(
const primitivePatch& srcPatch,
const primitivePatch& tgtPatch,
const SourcePatch& srcPatch,
const TargetPatch& tgtPatch,
const labelListList& srcAddress
) const;
};

16
src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
View File

@ -78,25 +78,13 @@ void Foam::porousMedia::fixedTemperature::addEnthalpySource
}
const fvMesh& mesh = pZone_.mesh();
const scalarField& V = mesh.V();
scalarField& hDiag = hEqn.diag();
scalarField& hSource = hEqn.source();
const scalarField T(hDiag.size(), T_);
const scalar rate = 1e6;
const scalarField T(hEqn.diag().size(), T_);
forAll(zones, zoneI)
{
const labelList& cells = mesh.cellZones()[zones[zoneI]];
tmp<scalarField> h = thermo.h(T, cells);
forAll(cells, i)
{
hDiag[cells[i]] += rate*V[cells[i]]*rho[cells[i]];
hSource[cells[i]] +=
rate*V[cells[i]]*rho[cells[i]]*h()[cells[i]];
}
hEqn.setValues(cells, h());
}
}

4
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
View File

@ -87,7 +87,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()),
oldMode_(unknown),
oldMode_(ptf.oldMode_),
q_(ptf.q_, mapper),
h_(ptf.h_, mapper),
Ta_(ptf.Ta_, mapper)
@ -166,7 +166,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
:
mixedFvPatchScalarField(tppsf),
temperatureCoupledBase(tppsf),
oldMode_(unknown),
oldMode_(tppsf.oldMode_),
q_(tppsf.q_),
h_(tppsf.h_),
Ta_(tppsf.Ta_)

4
tutorials/incompressible/pimpleDyMFoam/propeller/system/changeDictionaryDict
View File

@ -21,8 +21,6 @@ dictionaryReplacement
AMI1
{
type cyclicAMI;
nFaces 0;
startFace 1756182;
neighbourPatch AMI2;
transform noOrdering;
surface
@ -32,8 +30,6 @@ dictionaryReplacement
AMI2
{
type cyclicAMI;
nFaces 0;
startFace 1756182;
neighbourPatch AMI1;
transform noOrdering;
surface