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

Merge branch 'master' of ssh://sgidm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry 2012-03-15 20:01:52 +00:00
commit 438dd02098
17 changed files with 620 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/combustionModels/psiCombustionModel/psiCombustionModels.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,9 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "makeCombustionTypes.H"
#include "psiCombustionModel.H"
#include "PaSR.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

42
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
View File

@ -45,7 +45,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
phiName_("phi"),
rhoName_("rho"),
fieldInf_(pTraits<Type>::zero),
lInf_(0.0)
lInf_(-GREAT)
{
this->refValue() = pTraits<Type>::zero;
this->refGrad() = pTraits<Type>::zero;
@ -82,7 +82,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
fieldInf_(pTraits<Type>::zero),
lInf_(0.0)
lInf_(-GREAT)
{
if (dict.found("value"))
{
@ -110,9 +110,13 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
(
"advectiveFvPatchField<Type>::"
"advectiveFvPatchField"
"(const fvPatch&, const Field<Type>&, const dictionary&)",
"("
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&"
")",
dict
) << "unphysical lInf specified (lInf < 0)\n"
) << "unphysical lInf specified (lInf < 0)" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
@ -217,7 +221,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
// Non-reflecting outflow boundary
// If lInf_ defined setup relaxation to the value fieldInf_.
if (lInf_ > SMALL)
if (lInf_ > 0)
{
// Calculate the field relaxation coefficient k (See notes)
const scalarField k(w*deltaT/lInf_);
@ -248,12 +252,10 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
}
else
{
FatalErrorIn
(
"advectiveFvPatchField<Type>::updateCoeffs()"
) << " Unsupported temporal differencing scheme : "
<< ddtScheme
<< "\n on patch " << this->patch().name()
FatalErrorIn("advectiveFvPatchField<Type>::updateCoeffs()")
<< " Unsupported temporal differencing scheme : "
<< ddtScheme << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalError);
@ -304,21 +306,13 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
if (phiName_ != "phi")
{
os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
}
if (rhoName_ != "rho")
{
os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
}
this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
if (lInf_ > SMALL)
if (lInf_ > 0)
{
os.writeKeyword("fieldInf") << fieldInf_
<< token::END_STATEMENT << nl;
os.writeKeyword("lInf") << lInf_
<< token::END_STATEMENT << nl;
os.writeKeyword("fieldInf") << fieldInf_ << token::END_STATEMENT << nl;
os.writeKeyword("lInf") << lInf_ << token::END_STATEMENT << nl;
}
this->writeEntry("value", os);

5
src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -424,9 +424,6 @@ public:
// Check
//- Total mass injected
inline scalar massInjected() const;
//- Total mass in system
inline scalar massInSystem() const;

6
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -456,8 +456,8 @@ public:
// Check
//- Total mass injected
inline scalar massInjected() const;
//- Total number of parcels
inline label nParcels() const;
//- Total mass in system
inline scalar massInSystem() const;

9
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -227,6 +227,13 @@ Foam::KinematicCloud<CloudType>::UIntegrator() const
}
template<class CloudType>
inline Foam::label Foam::KinematicCloud<CloudType>::nParcels() const
{
return this->size();
}
template<class CloudType>
inline Foam::scalar Foam::KinematicCloud<CloudType>::massInSystem() const
{

47
src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,6 +36,7 @@ SourceFiles
#define kinematicCloud_H
#include "typeInfo.H"
#include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -68,6 +69,50 @@ public:
kinematicCloud();
// Member functions
// Check
//- Number of parcels
virtual label nParcels() const = 0;
//- Total mass in system
virtual scalar massInSystem() const = 0;
//- Total linear momentum of the system
virtual vector linearMomentumOfSystem() const = 0;
//- Total linear kinetic energy in the system
virtual scalar linearKineticEnergyOfSystem() const = 0;
//- Total rotational kinetic energy in the system
virtual scalar rotationalKineticEnergyOfSystem() const = 0;
//- Penetration for percentage of the current total mass
// virtual scalar penetration(const scalar& prc) const = 0;
//- Mean diameter Dij
virtual scalar Dij(const label i, const label j) const = 0;
//- Max diameter
virtual scalar Dmax() const = 0;
// Fields
//- Return the particle volume fraction field
// Note: for particles belonging to this cloud only
virtual const tmp<volScalarField> theta() const = 0;
//- Return the particle mass fraction field
// Note: for particles belonging to this cloud only
virtual const tmp<volScalarField> alpha() const = 0;
//- Return the particle effective density field
// Note: for particles belonging to this cloud only
virtual const tmp<volScalarField> rhoEff() const = 0;
//- Destructor
virtual ~kinematicCloud();
};

8
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
View File

@ -46,7 +46,13 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
const dictionary& decompositionDict
)
{
const word methodType(decompositionDict.lookup("method"));
word methodType(decompositionDict.lookup("method"));
if (methodType == "scotch" && Pstream::parRun())
{
methodType = "ptscotch";
}
Info<< "Selecting decompositionMethod " << methodType << endl;

3
src/postProcessing/functionObjects/Allwmake
View File

@ -3,11 +3,12 @@ cd ${0%/*} || exit 1 # run from this directory
makeType=${1:-libso}
set -x
wmake $makeType cloud
wmake $makeType field
wmake $makeType forces
wmake $makeType IO
wmake $makeType utilities
wmake $makeType jobControl
wmake $makeType systemCall
wmake $makeType utilities
# ----------------------------------------------------------------- end-of-file

4
src/postProcessing/functionObjects/cloud/Make/files Normal file
View File

@ -0,0 +1,4 @@
cloudInfo/cloudInfo.C
cloudInfo/cloudInfoFunctionObject.C
LIB = $(FOAM_LIBBIN)/libcloudFunctionObjects

9
src/postProcessing/functionObjects/cloud/Make/options Normal file
View File

@ -0,0 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude
LIB_LIBS = \
-lfiniteVolume \
-llagrangian \
-llagrangianIntermediate

49
src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H Normal file
View File

@ -0,0 +1,49 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::IOcloudInfo
Description
Instance of the generic IOOutputFilter for cloudInfo.
\*---------------------------------------------------------------------------*/
#ifndef IOcloudInfo_H
#define IOcloudInfo_H
#include "cloudInfo.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
typedef IOOutputFilter<cloudInfo> IOcloudInfo;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

183
src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C Normal file
View File

@ -0,0 +1,183 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "cloudInfo.H"
#include "dictionary.H"
#include "kinematicCloud.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(Foam::cloudInfo, 0);
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::cloudInfo::makeFiles()
{
if (debug)
{
Info<< "Creating cloudInfo output files." << endl;
}
outputFilePtr_.clear();
outputFilePtr_.setSize(cloudSet_.size());
if (Pstream::master())
{
label i = 0;
forAllConstIter(wordHashSet, cloudSet_, iter)
{
const word& cloudName = iter.key();
fileName cloudInfoDir(obr_.time().path());
word timeName = Foam::name(obr_.time().startTime().value());
if (Pstream::parRun())
{
// Put in undecomposed case (Note: gives problems for
// distributed data running)
cloudInfoDir = cloudInfoDir/".."/name_/timeName;
}
else
{
cloudInfoDir = cloudInfoDir/name_/timeName;
}
// Create directory if does not exist
mkDir(cloudInfoDir);
// Open new files at start up
outputFilePtr_.set
(
i,
new OFstream(cloudInfoDir/(cloudName + ".dat"))
);
// Add headers
outputFilePtr_[i]
<< "# Time" << tab << "nParcels" << tab << "mass" << endl;
i++;
}
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::cloudInfo::cloudInfo
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
:
name_(name),
obr_(obr),
active_(true),
cloudSet_(),
outputFilePtr_()
{
read(dict);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::cloudInfo::~cloudInfo()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::cloudInfo::read(const dictionary& dict)
{
if (active_)
{
cloudSet_.insert(wordList(dict.lookup("clouds")));
Info<< type() << ": ";
if (cloudSet_.size())
{
Info<< "applying to clouds:" << nl;
forAllConstIter(wordHashSet, cloudSet_, iter)
{
Info<< " " << iter.key() << nl;
}
Info<< endl;
makeFiles();
}
else
{
Info<< "no clouds to be processed" << nl << endl;
}
}
}
void Foam::cloudInfo::execute()
{
// Do nothing
}
void Foam::cloudInfo::end()
{
// Do nothing
}
void Foam::cloudInfo::write()
{
if (active_)
{
label i = 0;
forAllConstIter(wordHashSet, cloudSet_, iter)
{
const word& cloudName = iter.key();
const kinematicCloud& cloud =
obr_.lookupObject<kinematicCloud>(cloudName);
label nParcels = returnReduce(cloud.nParcels(), sumOp<label>());
scalar massInSystem =
returnReduce(cloud.massInSystem(), sumOp<scalar>());
if (Pstream::master())
{
outputFilePtr_[i]
<< obr_.time().value() << token::TAB
<< nParcels << token::TAB
<< massInSystem << endl;
}
i++;
}
}
}
// ************************************************************************* //

157
src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H Normal file
View File

@ -0,0 +1,157 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::cloudInfo
Description
Outputs cloud information to file
Currently outputs:
- total current number of parcels
- total current mass of parcels
SourceFiles
cloudInfo.C
IOcloudInfo.H
\*---------------------------------------------------------------------------*/
#ifndef cloudInfo_H
#define cloudInfo_H
#include "OFstream.H"
#include "PtrList.H"
#include "pointFieldFwd.H"
#include "volFields.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward declaration of classes
class objectRegistry;
class dictionary;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
Class cloudInfo Declaration
\*---------------------------------------------------------------------------*/
class cloudInfo
{
protected:
// Protected data
//- Name of this set of cloudInfo object
word name_;
const objectRegistry& obr_;
//- on/off switch
bool active_;
//- Clouds to process
wordHashSet cloudSet_;
//- Output file pointers
PtrList<OFstream> outputFilePtr_;
// Protected Member Functions
//- If the output file has not been created create it
void makeFiles();
//- Disallow default bitwise copy construct
cloudInfo(const cloudInfo&);
//- Disallow default bitwise assignment
void operator=(const cloudInfo&);
public:
//- Runtime type information
TypeName("cloudInfo");
// Constructors
//- Construct for given objectRegistry and dictionary.
// Allow the possibility to load fields from files
cloudInfo
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~cloudInfo();
// Member Functions
//- Return name of the cloudInfo object
virtual const word& name() const
{
return name_;
}
//- Read the field min/max data
virtual void read(const dictionary&);
//- Execute, currently does nothing
virtual void execute();
//- Execute at the final time-loop, currently does nothing
virtual void end();
//- Write
virtual void write();
//- Update for changes of mesh
virtual void updateMesh(const mapPolyMesh&)
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
{}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

42
src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C Normal file
View File

@ -0,0 +1,42 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "cloudInfoFunctionObject.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineNamedTemplateTypeNameAndDebug(cloudInfoFunctionObject, 0);
addToRunTimeSelectionTable
(
functionObject,
cloudInfoFunctionObject,
dictionary
);
}
// ************************************************************************* //

54
src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H Normal file
View File

@ -0,0 +1,54 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::cloudInfoFunctionObject
Description
FunctionObject wrapper around cloudInfo to allow them to be created via
the functions entry within controlDict.
SourceFiles
cloudInfoFunctionObject.C
\*---------------------------------------------------------------------------*/
#ifndef cloudInfoFunctionObject_H
#define cloudInfoFunctionObject_H
#include "cloudInfo.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
typedef OutputFilterFunctionObject<cloudInfo>
cloudInfoFunctionObject;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

31
src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict Normal file
View File

@ -0,0 +1,31 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object postProcessingDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
functions
{
cloudInfo1
{
type cloudInfo;
functionObjectLibs ("libcloudFunctionObjects.so");
enabled true;
outputControl timeStep;
outputInterval 1;
clouds (myCloud1);
}
}
// ************************************************************************* //

8
src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -137,9 +137,11 @@ void Foam::forceCoeffs::write()
if (log_)
{
Info<< "forceCoeffs output:" << nl
<< " Cd = " << Cd << nl
<< " Cl = " << Cl << nl
<< " Cm = " << Cm << nl
<< " Cm = " << Cm << nl
<< " Cd = " << Cd << nl
<< " Cl = " << Cl << nl
<< " Cl(f) = " << Cl/2.0 - Cm << nl
<< " Cl(r) = " << Cl/2.0 + Cm << nl
<< endl;
}
}