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

Browse Source 
Conflicts:
	src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
This commit is contained in:
Mark Olesen
2010-05-31 11:50:56 +02:00
parent ff30e6b61a 9c69403419
commit f9f988d82f
1421 changed files with 21173 additions and 9427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/postProcessing/functionObjects/field/fieldAverage/controlDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

18
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
View File

@ -27,7 +27,7 @@ License
#include "fvMesh.H"
#include "cyclicPolyPatch.H"
#include "emptyPolyPatch.H"
#include "processorPolyPatch.H"
#include "coupledPolyPatch.H"
#include "surfaceFields.H"
#include "volFields.H"
@ -96,9 +96,9 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
{
facePatchId = mesh().boundaryMesh().whichPatch(faceI);
const polyPatch& pp = mesh().boundaryMesh()[facePatchId];
if (isA<processorPolyPatch>(pp))
if (isA<coupledPolyPatch>(pp))
{
if (refCast<const processorPolyPatch>(pp).owner())
if (refCast<const coupledPolyPatch>(pp).owner())
{
faceId = pp.whichFace(faceI);
}
@ -107,18 +107,6 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
faceId = -1;
}
}
else if (isA<cyclicPolyPatch>(pp))
{
label patchFaceI = faceI - pp.start();
if (patchFaceI < pp.size()/2)
{
faceId = patchFaceI;
}
else
{
faceId = -1;
}
}
else if (!isA<emptyPolyPatch>(pp))
{
faceId = faceI - pp.start();

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
View File

@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionConstraint.C
dynamicFvMeshNew.C
sixDoFRigidBodyMotionConstraintNew.C
\*---------------------------------------------------------------------------*/

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
View File

@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionRestraint.C
dynamicFvMeshNew.C
sixDoFRigidBodyMotionRestraintNew.C
\*---------------------------------------------------------------------------*/

53
src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,7 +28,6 @@ License
#include "error.H"
#include "Time.H"
#include "OSspecific.H"
#include "PstreamReduceOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -53,12 +52,8 @@ const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
void Foam::abortCalculation::removeFile() const
{
bool hasAbort = isFile(abortFile_);
reduce(hasAbort, orOp<bool>());
if (hasAbort && Pstream::master())
if (isFile(abortFile_))
{
// cleanup ABORT file (on master only)
rm(abortFile_);
}
}
@ -97,9 +92,14 @@ Foam::abortCalculation::~abortCalculation()
void Foam::abortCalculation::read(const dictionary& dict)
{
word actionName;
if (dict.found("action"))
{
action_ = actionTypeNames_.read(dict.lookup("action"));
action_ = actionTypeNames_.read
(
dict.lookup("action")
);
}
else
{
@ -115,41 +115,26 @@ void Foam::abortCalculation::read(const dictionary& dict)
void Foam::abortCalculation::execute()
{
bool hasAbort = isFile(abortFile_);
reduce(hasAbort, orOp<bool>());
if (hasAbort)
if (isFile(abortFile_))
{
switch (action_)
{
case noWriteNow :
if (obr_.time().stopAt(Time::saNoWriteNow))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< obr_.time().timeIndex()
<< "): stop without writing data"
<< endl;
}
obr_.time().stopAt(Time::saNoWriteNow);
Info<< "user requested abort - "
"stop immediately without writing data" << endl;
break;
case writeNow :
if (obr_.time().stopAt(Time::saWriteNow))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< obr_.time().timeIndex()
<< "): stop+write data"
<< endl;
}
obr_.time().stopAt(Time::saWriteNow);
Info<< "user requested abort - "
"stop immediately with writing data" << endl;
break;
case nextWrite :
if (obr_.time().stopAt(Time::saNextWrite))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< obr_.time().timeIndex()
<< "): stop after next data write"
<< endl;
}
obr_.time().stopAt(Time::saNextWrite);
Info<< "user requested abort - "
"stop after next data write" << endl;
break;
}
}
@ -164,7 +149,7 @@ void Foam::abortCalculation::end()
void Foam::abortCalculation::write()
{
// Do nothing - only valid on execute
execute();
}