diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index f050d82a79..e607080a66 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -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 ) ); diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H index b8180a2b3e..e4aa7b1032 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C index 62d00b7626..bf48d3852b 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C index eb7e39b3d4..c3a44bf160 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H index 5edb1a58af..6224dc0ac6 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C index d5e7cab4e2..df3ae4b408 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H index a9c48b5b4b..3c842dac9c 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C index b8fa744ff6..184630bb49 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C @@ -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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H index 48d64baacf..c64f0738ee 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H index d5eb3baa2c..5a271a763e 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index 8dac56c64f..520d4b23db 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -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 void cyclicFvPatchField::updateInterfaceMatrix ( - const scalarField& psiInternal, scalarField& result, - const lduMatrix&, + const scalarField& psiInternal, const scalarField& coeffs, const direction cmpt, const Pstream::commsTypes diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H index b2e82a9d43..b08b0aa91a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index 0eeb351cd4..287d036f5e 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C @@ -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::neighbourPatchField() const template void Foam::cyclicAMIFvPatchField::updateInterfaceMatrix ( - const scalarField& psiInternal, scalarField& result, - const lduMatrix&, + const scalarField& psiInternal, const scalarField& coeffs, const direction cmpt, const Pstream::commsTypes diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H index 2e05111cb6..8814a7584a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C index fba9fb922d..669ea108b4 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C @@ -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 > jumpCyclicFvPatchField::patchNeighbourField() const template void jumpCyclicFvPatchField::updateInterfaceMatrix ( - const scalarField& psiInternal, scalarField& result, - const lduMatrix&, + const scalarField& psiInternal, const scalarField& coeffs, const direction cmpt, const Pstream::commsTypes diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H index 867e07bede..72113a5626 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C index a44ea4cc5c..d86c49e5c4 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C @@ -311,9 +311,8 @@ tmp > processorFvPatchField::snGrad() const template void processorFvPatchField::initInterfaceMatrixUpdate ( - const scalarField& psiInternal, scalarField&, - const lduMatrix&, + const scalarField& psiInternal, const scalarField&, const direction, const Pstream::commsTypes commsType @@ -368,9 +367,8 @@ void processorFvPatchField::initInterfaceMatrixUpdate template void processorFvPatchField::updateInterfaceMatrix ( - const scalarField&, scalarField& result, - const lduMatrix&, + const scalarField&, const scalarField& coeffs, const direction cmpt, const Pstream::commsTypes commsType diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H index 9541e80ea5..a085ae88e5 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H @@ -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 diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C index 6fbb215002..82dcf7ca36 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C @@ -35,9 +35,8 @@ namespace Foam template<> void processorFvPatchField::initInterfaceMatrixUpdate ( - const scalarField& psiInternal, scalarField&, - const lduMatrix&, + const scalarField& psiInternal, const scalarField&, const direction, const Pstream::commsTypes commsType @@ -92,9 +91,8 @@ void processorFvPatchField::initInterfaceMatrixUpdate template<> void processorFvPatchField::updateInterfaceMatrix ( - const scalarField&, scalarField& result, - const lduMatrix&, + const scalarField&, const scalarField& coeffs, const direction, const Pstream::commsTypes commsType diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H index 02443c511d..a8bbb24dcb 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H @@ -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::initInterfaceMatrixUpdate ( - const scalarField&, scalarField&, - const lduMatrix&, + const scalarField&, const scalarField&, const direction, const Pstream::commsTypes commsType @@ -50,9 +49,8 @@ void processorFvPatchField::initInterfaceMatrixUpdate template<> void processorFvPatchField::updateInterfaceMatrix ( - const scalarField&, scalarField& result, - const lduMatrix&, + const scalarField&, const scalarField& coeffs, const direction, const Pstream::commsTypes commsType diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index 7d049f6ad3..d36da92ef3 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C @@ -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::~processorCyclicFvPatchField() //template //void processorCyclicFvPatchField::initInterfaceMatrixUpdate //( -// const scalarField& psiInternal, // scalarField&, -// const lduMatrix&, +// const scalarField& psiInternal, // const scalarField&, // const direction, // const Pstream::commsTypes commsType @@ -246,9 +245,8 @@ processorCyclicFvPatchField::~processorCyclicFvPatchField() //template //void processorCyclicFvPatchField::updateInterfaceMatrix //( -// const scalarField&, // scalarField& result, -// const lduMatrix&, +// const scalarField&, // const scalarField& coeffs, // const direction cmpt, // const Pstream::commsTypes commsType diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H index 6dbbb04559..5a17b10fef 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H @@ -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::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::updateInterfaceMatrix //( -// const scalarField&, // scalarField& result, -// const lduMatrix&, +// const scalarField&, // const scalarField& coeffs, // const direction, // const Pstream::commsTypes commsType diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C index a5624af4be..abc7875db6 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C +++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C @@ -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 diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H index ae4ede91e1..cb22cd61b6 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H +++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H @@ -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 diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 57acb81533..02637c203a 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -102,8 +102,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField const scalarField& Tp = patch().lookupPatchField(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; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict index 7fc53289cc..f08a1ebff8 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict @@ -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; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict index 6647732e8f..4c78380972 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict @@ -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; } } diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean index 213da0de10..a25fd5e1c4 100755 --- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean +++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean @@ -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 diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun index 612446c68e..fd85f49a95 100755 --- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun +++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun @@ -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 diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary deleted file mode 100644 index ff3254a0cb..0000000000 --- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary +++ /dev/null @@ -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; - } -) - -// ************************************************************************* //