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

This commit is contained in:
mattijs
2012-04-24 15:28:34 +01:00
30 changed files with 72 additions and 156 deletions

View File

@ -37,15 +37,24 @@ using namespace Foam;
int main(int argc, char *argv[])
{
# include "addOverwriteOption.H"
# include "setRootCase.H"
# include "createTime.H"
const bool overwrite = args.optionFound("overwrite");
if (!overwrite)
{
runTime++;
}
mirrorFvMesh mesh
(
IOobject
(
mirrorFvMesh::defaultRegion,
runTime.timeName(),
runTime.constant(),
runTime
)
);

View File

@ -115,9 +115,8 @@ public:
//- Initialise neighbour matrix update
virtual void initInterfaceMatrixUpdate
(
const scalarField&,
scalarField&,
const lduMatrix&,
const scalarField&,
const scalarField&,
const direction,
const Pstream::commsTypes commsType
@ -145,9 +144,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField&,
scalarField&,
const lduMatrix&,
const scalarField&,
const scalarField&,
const direction,
const Pstream::commsTypes commsType

View File

@ -48,9 +48,8 @@ void Foam::lduMatrix::initMatrixInterfaces
{
interfaces[interfaceI].initInterfaceMatrixUpdate
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::defaultCommsType
@ -75,9 +74,8 @@ void Foam::lduMatrix::initMatrixInterfaces
{
interfaces[interfaceI].initInterfaceMatrixUpdate
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::blocking
@ -112,9 +110,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].updateInterfaceMatrix
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::defaultCommsType
@ -141,9 +138,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].updateInterfaceMatrix
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::defaultCommsType
@ -193,9 +189,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].updateInterfaceMatrix
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::defaultCommsType
@ -218,9 +213,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].initInterfaceMatrixUpdate
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::scheduled
@ -230,9 +224,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].updateInterfaceMatrix
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::scheduled
@ -254,9 +247,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
{
interfaces[interfaceI].updateInterfaceMatrix
(
psiif,
result,
*this,
psiif,
coupleCoeffs[interfaceI],
cmpt,
Pstream::blocking

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
@ -72,9 +72,8 @@ Foam::cyclicGAMGInterfaceField::~cyclicGAMGInterfaceField()
void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes

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
@ -110,9 +110,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

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
@ -63,9 +63,8 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
//void Foam::processorCyclicGAMGInterfaceField::initInterfaceMatrixUpdate
//(
// const scalarField& psiInternal,
// scalarField&,
// const lduMatrix&,
// const scalarField&,
// const scalarField&,
// const direction,
// const Pstream::commsTypes commsType
@ -81,9 +80,8 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
//
//void Foam::processorCyclicGAMGInterfaceField::updateInterfaceMatrix
//(
// const scalarField&,
// scalarField& result,
// const lduMatrix&,
// const scalarField&,
// const scalarField& coeffs,
// const direction cmpt,
// const Pstream::commsTypes commsType

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
@ -111,9 +111,8 @@ public:
// //- Initialise neighbour matrix update
// virtual void initInterfaceMatrixUpdate
// (
// const scalarField& psiInternal,
// scalarField& result,
// const lduMatrix& m,
// const scalarField& psiInternal,
// const scalarField& coeffs,
// const direction cmpt,
// const Pstream::commsTypes commsType
@ -122,9 +121,8 @@ public:
// //- Update result field based on interface functionality
// virtual void updateInterfaceMatrix
// (
// const scalarField& psiInternal,
// scalarField& result,
// const lduMatrix&,
// const scalarField& psiInternal,
// const scalarField& coeffs,
// const direction cmpt,
// const Pstream::commsTypes commsType

View File

@ -72,9 +72,8 @@ Foam::processorGAMGInterfaceField::~processorGAMGInterfaceField()
void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
(
const scalarField& psiInternal,
scalarField&,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField&,
const direction,
const Pstream::commsTypes commsType
@ -117,9 +116,8 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
(
const scalarField&,
scalarField& result,
const lduMatrix&,
const scalarField&,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

View File

@ -126,9 +126,8 @@ public:
//- Initialise neighbour matrix update
virtual void initInterfaceMatrixUpdate
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix& m,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType
@ -137,9 +136,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

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
@ -178,9 +178,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction,
const Pstream::commsTypes commsType

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
@ -191,9 +191,8 @@ const
template<class Type>
void cyclicFvPatchField<Type>::updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes

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
@ -159,9 +159,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

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
@ -202,9 +202,8 @@ Foam::cyclicAMIFvPatchField<Type>::neighbourPatchField() const
template<class Type>
void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes

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
@ -160,9 +160,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

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
@ -137,9 +137,8 @@ tmp<Field<Type> > jumpCyclicFvPatchField<Type>::patchNeighbourField() const
template<class Type>
void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes

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
@ -120,9 +120,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

View File

@ -311,9 +311,8 @@ tmp<Field<Type> > processorFvPatchField<Type>::snGrad() const
template<class Type>
void processorFvPatchField<Type>::initInterfaceMatrixUpdate
(
const scalarField& psiInternal,
scalarField&,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField&,
const direction,
const Pstream::commsTypes commsType
@ -368,9 +367,8 @@ void processorFvPatchField<Type>::initInterfaceMatrixUpdate
template<class Type>
void processorFvPatchField<Type>::updateInterfaceMatrix
(
const scalarField&,
scalarField& result,
const lduMatrix&,
const scalarField&,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

View File

@ -187,9 +187,8 @@ public:
//- Initialise neighbour matrix update
virtual void initInterfaceMatrixUpdate
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix& m,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType
@ -201,9 +200,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix& m,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

View File

@ -35,9 +35,8 @@ namespace Foam
template<>
void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
(
const scalarField& psiInternal,
scalarField&,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField&,
const direction,
const Pstream::commsTypes commsType
@ -92,9 +91,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
template<>
void processorFvPatchField<scalar>::updateInterfaceMatrix
(
const scalarField&,
scalarField& result,
const lduMatrix&,
const scalarField&,
const scalarField& coeffs,
const direction,
const Pstream::commsTypes commsType

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
@ -38,9 +38,8 @@ namespace Foam
template<>
void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
(
const scalarField&,
scalarField&,
const lduMatrix&,
const scalarField&,
const scalarField&,
const direction,
const Pstream::commsTypes commsType
@ -50,9 +49,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
template<>
void processorFvPatchField<scalar>::updateInterfaceMatrix
(
const scalarField&,
scalarField& result,
const lduMatrix&,
const scalarField&,
const scalarField& coeffs,
const direction,
const Pstream::commsTypes commsType

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,9 +227,8 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
//template<class Type>
//void processorCyclicFvPatchField<Type>::initInterfaceMatrixUpdate
//(
// const scalarField& psiInternal,
// scalarField&,
// const lduMatrix&,
// const scalarField& psiInternal,
// const scalarField&,
// const direction,
// const Pstream::commsTypes commsType
@ -246,9 +245,8 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
//template<class Type>
//void processorCyclicFvPatchField<Type>::updateInterfaceMatrix
//(
// const scalarField&,
// scalarField& result,
// const lduMatrix&,
// const scalarField&,
// const scalarField& coeffs,
// const direction cmpt,
// const Pstream::commsTypes commsType

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
@ -38,9 +38,8 @@ namespace Foam
//template<>
//void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
//(
// const scalarField&,
// scalarField&,
// const lduMatrix&,
// const scalarField&,
// const scalarField&,
// const direction,
// const Pstream::commsTypes commsType
@ -50,9 +49,8 @@ namespace Foam
//template<>
//void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
//(
// const scalarField&,
// scalarField& result,
// const lduMatrix&,
// const scalarField&,
// const scalarField& coeffs,
// const direction,
// const Pstream::commsTypes commsType

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
@ -72,9 +72,8 @@ Foam::cyclicAMIGAMGInterfaceField::~cyclicAMIGAMGInterfaceField()
void Foam::cyclicAMIGAMGInterfaceField::updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes

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
@ -110,9 +110,8 @@ public:
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
const scalarField& psiInternal,
scalarField& result,
const lduMatrix&,
const scalarField& psiInternal,
const scalarField& coeffs,
const direction cmpt,
const Pstream::commsTypes commsType

View File

@ -102,8 +102,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField
const scalarField& Tp =
patch().lookupPatchField<volScalarField, scalar>(TName_);
//NOTE: Assumes emissivity = 1 as the solidThermo might
// not be constructed yet
refValue() =
4.0*physicoChemical::sigma.value()*pow4(Tp)*emissivity()/pi;
4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
refGrad() = 0.0;
valueFraction() = 1.0;

View File

@ -174,7 +174,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode lookup;
Qro uniform 0;
emissivity uniform 1.0;
value uniform 0;
}
@ -184,7 +183,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode solidThermo;
Qro uniform 0;
value uniform 0;
}
}

View File

@ -221,7 +221,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode lookup;
Qro uniform 0;
emissivity uniform 1.0;
value uniform 0;
}
@ -231,7 +230,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode solidThermo;
Qro uniform 0;
value uniform 0;
}
}

View File

@ -5,6 +5,5 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0/polyMesh
# ----------------------------------------------------------------- end-of-file

View File

@ -10,17 +10,14 @@ application=`getApplication`
runApplication blockMesh
transformPoints -scale '(1.6666 1 1)'
#cp system/changeDictionaryDict.X system/changeDictionaryDict
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
runApplication mirrorMesh
runApplication mirrorMesh -overwrite
rm log.mirrorMesh
rm log.changeDictionary
#cp system/changeDictionaryDict.Y system/changeDictionaryDict
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.Y
runApplication mirrorMesh
cp -rf 0/polyMesh constant/
runApplication mirrorMesh -overwrite
runApplication topoSet
runApplication createPatch -overwrite

View File

@ -1,46 +0,0 @@
/*--------------------------------*- 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 polyBoundaryMesh;
location "0/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
outlet
{
type patch;
nFaces 320;
startFace 99370;
}
up
{
type symmetryPlane;
nFaces 380;
startFace 99690;
}
hole
{
type wall;
nFaces 560;
startFace 100070;
}
frontAndBack
{
type empty;
nFaces 100000;
startFace 100630;
}
)
// ************************************************************************* //