diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index d8ac16387b..5b82c80476 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -14,11 +14,6 @@ derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C -derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.C -derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.C -derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.C -derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.C - derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libfluidThermophysicalModels diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C index 5f46273991..62ac6516ef 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "addToRunTimeSelectionTable.H" #include "energyJumpFvPatchScalarField.H" -#include "temperatureJumpBase.H" +#include "fixedJumpFvPatchFields.H" #include "basicThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -107,8 +107,8 @@ void Foam::energyJumpFvPatchScalarField::updateCoeffs() label patchID = patch().index(); const scalarField& pp = thermo.p().boundaryField()[patchID]; - const temperatureJumpBase& TbPatch = - refCast + const fixedJumpFvPatchScalarField& TbPatch = + refCast ( thermo.T().boundaryField()[patchID] ); diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C index 01cbc40488..9f596c3cde 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "addToRunTimeSelectionTable.H" #include "energyJumpAMIFvPatchScalarField.H" -#include "temperatureJumpBase.H" +#include "fixedJumpAMIFvPatchFields.H" #include "basicThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -107,8 +107,8 @@ void Foam::energyJumpAMIFvPatchScalarField::updateCoeffs() label patchID = patch().index(); const scalarField& pp = thermo.p().boundaryField()[patchID]; - const temperatureJumpBase& TbPatch = - refCast + const fixedJumpAMIFvPatchScalarField& TbPatch = + refCast ( thermo.T().boundaryField()[patchID] ); diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.C b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.C deleted file mode 100644 index 5368a17bf2..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.C +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - - -\*---------------------------------------------------------------------------*/ - -#include "temperatureJumpAMIBase.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(temperatureJumpAMIBase, 0); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::temperatureJumpAMIBase::temperatureJumpAMIBase() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::temperatureJumpAMIBase::~temperatureJumpAMIBase() -{} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.H b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.H deleted file mode 100644 index 79246c7080..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpAMIBase.H +++ /dev/null @@ -1,79 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -Description - Base class for temperature jump boundary conditions that provides access - to the jump field - -SourceFiles - temperatureJumpBase.C - -\*---------------------------------------------------------------------------*/ - -#ifndef temperatureJumpAMIBase_H -#define temperatureJumpAMIBase_H - -#include "typeInfo.H" -#include "scalarField.H" -#include "tmp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class temperatureJumpAMIBase Declaration -\*---------------------------------------------------------------------------*/ - -class temperatureJumpAMIBase -{ - -public: - - //- Runtime type information - TypeName("temperatureJumpAMIBase"); - - //- Construct null - temperatureJumpAMIBase(); - - - //- Destructor - virtual ~temperatureJumpAMIBase(); - - - // Member functions - - //- Return a field of the temperature jump - virtual tmp jump() const = 0; -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.C b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.C deleted file mode 100644 index afd18c0924..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.C +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - - -\*---------------------------------------------------------------------------*/ - -#include "temperatureJumpBase.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(temperatureJumpBase, 0); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::temperatureJumpBase::temperatureJumpBase() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::temperatureJumpBase::~temperatureJumpBase() -{} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.H b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.H deleted file mode 100644 index 32744fd47a..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/temperatureJumpBase/temperatureJumpBase.H +++ /dev/null @@ -1,79 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -Description - Base class for temperature jump boundary conditions that provides access - to the jump field - -SourceFiles - temperatureJumpBase.C - -\*---------------------------------------------------------------------------*/ - -#ifndef temperatureJumpBase_H -#define temperatureJumpBase_H - -#include "typeInfo.H" -#include "scalarField.H" -#include "tmp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class temperatureJumpBase Declaration -\*---------------------------------------------------------------------------*/ - -class temperatureJumpBase -{ - -public: - - //- Runtime type information - TypeName("temperatureJumpBase"); - - //- Construct null - temperatureJumpBase(); - - - //-Destructor - virtual ~temperatureJumpBase(); - - - // Member functions - - //- Return a field of the temperature jump - virtual tmp jump() const = 0; -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.C deleted file mode 100644 index 5e9a302c47..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.C +++ /dev/null @@ -1,100 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -\*---------------------------------------------------------------------------*/ - -#include "addToRunTimeSelectionTable.H" -#include "uniformTemperatureJumpFvPatchScalarField.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::uniformTemperatureJumpFvPatchScalarField:: -uniformTemperatureJumpFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF -) -: - uniformJumpFvPatchField(p, iF) -{} - - -Foam::uniformTemperatureJumpFvPatchScalarField:: -uniformTemperatureJumpFvPatchScalarField -( - const uniformTemperatureJumpFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - uniformJumpFvPatchField(ptf, p, iF, mapper) -{} - - -Foam::uniformTemperatureJumpFvPatchScalarField:: -uniformTemperatureJumpFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - uniformJumpFvPatchField(p, iF) -{} - - -Foam::uniformTemperatureJumpFvPatchScalarField:: -uniformTemperatureJumpFvPatchScalarField -( - const uniformTemperatureJumpFvPatchScalarField& ptf -) -: - uniformJumpFvPatchField(ptf) -{} - - -Foam::uniformTemperatureJumpFvPatchScalarField:: -uniformTemperatureJumpFvPatchScalarField -( - const uniformTemperatureJumpFvPatchScalarField& ptf, - const DimensionedField& iF -) -: - uniformJumpFvPatchField(ptf, iF) -{} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makePatchTypeField - ( - fvPatchScalarField, - uniformTemperatureJumpFvPatchScalarField - ); -} - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.H deleted file mode 100644 index 6dbae8d707..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJump/uniformTemperatureJumpFvPatchScalarField.H +++ /dev/null @@ -1,174 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -Class - Foam::uniformTemperatureJumpFvPatchScalarField - -Group - grpCoupledBoundaryConditions - -Description - This boundary condition provides a temperature jump condition across a - coupled pair of cyclic patches, when solving for energy. - - The jump is specified as a \c DataEntry type, to enable the use of, e.g. - contant, polynomial, table values. - - \heading Patch usage - - \table - Property | Description | Required | Default value - patchType | underlying patch type should be \c cyclic| yes | - jumpTable | jump data, e.g. \c csvFile | yes | - \endtable - - Example of the boundary condition specification: - \verbatim - myPatch - { - type uniformTemperatureJump; - patchType cyclic; - jumpTable constant 100; - value uniform 300; - } - \endverbatim - - The above example shows the use of a constant jump condition of 300 K. - -Note - The underlying \c patchType should be set to \c cyclic - -SeeAlso - Foam::uniformJumpFvPatchField - Foam::energyJumpFvPatchScalarField - -SourceFiles - uniformTemperatureJumpFvPatchScalarField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef uniformTemperatureJumpFvPatchScalarField_H -#define uniformTemperatureJumpFvPatchScalarField_H - -#include "temperatureJumpBase.H" -#include "uniformJumpFvPatchField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class uniformTemperatureJumpFvPatchScalarField Declaration -\*---------------------------------------------------------------------------*/ - -class uniformTemperatureJumpFvPatchScalarField -: - public temperatureJumpBase, - public uniformJumpFvPatchField -{ - -public: - - //- Runtime type information - TypeName("uniformTemperatureJump"); - - // Constructors - - //- Construct from patch and internal field - uniformTemperatureJumpFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - uniformTemperatureJumpFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // uniformTemperatureJumpFvPatchScalarField onto a new patch - uniformTemperatureJumpFvPatchScalarField - ( - const uniformTemperatureJumpFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - uniformTemperatureJumpFvPatchScalarField - ( - const uniformTemperatureJumpFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp > clone() const - { - return tmp > - ( - new uniformTemperatureJumpFvPatchScalarField(*this) - ); - } - - //- Construct as copy setting internal field reference - uniformTemperatureJumpFvPatchScalarField - ( - const uniformTemperatureJumpFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp > clone - ( - const DimensionedField& iF - ) const - { - return tmp > - ( - new uniformTemperatureJumpFvPatchScalarField(*this, iF) - ); - } - - - // Member Functions - - virtual tmp > jump() const - { - return uniformJumpFvPatchField::jump(); - } -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.C deleted file mode 100644 index 379fffb7e3..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.C +++ /dev/null @@ -1,100 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -\*---------------------------------------------------------------------------*/ - -#include "addToRunTimeSelectionTable.H" -#include "uniformTemperatureJumpAMIFvPatchScalarField.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::uniformTemperatureJumpAMIFvPatchScalarField:: -uniformTemperatureJumpAMIFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF -) -: - uniformJumpAMIFvPatchField(p, iF) -{} - - -Foam::uniformTemperatureJumpAMIFvPatchScalarField:: -uniformTemperatureJumpAMIFvPatchScalarField -( - const uniformTemperatureJumpAMIFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - uniformJumpAMIFvPatchField(ptf, p, iF, mapper) -{} - - -Foam::uniformTemperatureJumpAMIFvPatchScalarField:: -uniformTemperatureJumpAMIFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - uniformJumpAMIFvPatchField(p, iF) -{} - - -Foam::uniformTemperatureJumpAMIFvPatchScalarField:: -uniformTemperatureJumpAMIFvPatchScalarField -( - const uniformTemperatureJumpAMIFvPatchScalarField& ptf -) -: - uniformJumpAMIFvPatchField(ptf) -{} - - -Foam::uniformTemperatureJumpAMIFvPatchScalarField:: -uniformTemperatureJumpAMIFvPatchScalarField -( - const uniformTemperatureJumpAMIFvPatchScalarField& ptf, - const DimensionedField& iF -) -: - uniformJumpAMIFvPatchField(ptf, iF) -{} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makePatchTypeField - ( - fvPatchScalarField, - uniformTemperatureJumpAMIFvPatchScalarField - ); -} - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.H deleted file mode 100644 index 9fd8c23ae4..0000000000 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/temperatureJump/uniformTemperatureJumpAMI/uniformTemperatureJumpAMIFvPatchScalarField.H +++ /dev/null @@ -1,175 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 . - -Class - Foam::uniformTemperatureJumpAMIFvPatchScalarField - -Group - grpCoupledBoundaryConditions - -Description - This boundary condition provides a temperature jump condition across a - coupled pair of non-conformal cyclic patches using an arbitrary mesh - interface (AMI), when solving for energy. - - The jump is specified as a \c DataEntry type, to enable the use of, e.g. - contant, polynomial, table values. - - \heading Patch usage - - \table - Property | Description | Required | Default value - patchType | underlying patch type should be \c cyclicAMI| yes | - jumpTable | jump data, e.g. \c csvFile | yes | - \endtable - - Example of the boundary condition specification: - \verbatim - myPatch - { - type uniformTemperatureJumpAMI; - patchType cyclic; - jumpTable constant 100; - value uniform 300; - } - \endverbatim - - The above example shows the use of a constant jump condition of 300 K. - -Note - The underlying \c patchType should be set to \c cyclicAMI - -SeeAlso - Foam::uniformJumpAMIFvPatchField - Foam::energyJumpAMIFvPatchScalarField - -SourceFiles - uniformTemperatureJumpAMIFvPatchScalarField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef uniformTemperatureJumpAMIFvPatchScalarField_H -#define uniformTemperatureJumpAMIFvPatchScalarField_H - -#include "temperatureJumpAMIBase.H" -#include "uniformJumpAMIFvPatchField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class uniformTemperatureJumpAMIFvPatchScalarField Declaration -\*---------------------------------------------------------------------------*/ - -class uniformTemperatureJumpAMIFvPatchScalarField -: - public temperatureJumpAMIBase, - public uniformJumpAMIFvPatchField -{ - -public: - - //- Runtime type information - TypeName("uniformTemperatureJumpAMI"); - - // Constructors - - //- Construct from patch and internal field - uniformTemperatureJumpAMIFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - uniformTemperatureJumpAMIFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // uniformTemperatureJumpAMIFvPatchScalarField onto a new patch - uniformTemperatureJumpAMIFvPatchScalarField - ( - const uniformTemperatureJumpAMIFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - uniformTemperatureJumpAMIFvPatchScalarField - ( - const uniformTemperatureJumpAMIFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp > clone() const - { - return tmp > - ( - new uniformTemperatureJumpAMIFvPatchScalarField(*this) - ); - } - - //- Construct as copy setting internal field reference - uniformTemperatureJumpAMIFvPatchScalarField - ( - const uniformTemperatureJumpAMIFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp > clone - ( - const DimensionedField& iF - ) const - { - return tmp > - ( - new uniformTemperatureJumpAMIFvPatchScalarField(*this, iF) - ); - } - - - // Member Functions - - virtual tmp > jump() const - { - return uniformJumpAMIFvPatchField::jump(); - } -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C index d0b455b7aa..f3902a033d 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/heThermo/heThermo.C @@ -28,8 +28,8 @@ License #include "fixedEnergyFvPatchScalarField.H" #include "gradientEnergyFvPatchScalarField.H" #include "mixedEnergyFvPatchScalarField.H" -#include "temperatureJumpBase.H" -#include "temperatureJumpAMIBase.H" +#include "fixedJumpFvPatchFields.H" +#include "fixedJumpAMIFvPatchFields.H" #include "energyJumpFvPatchScalarField.H" #include "energyJumpAMIFvPatchScalarField.H" @@ -61,11 +61,11 @@ Foam::wordList Foam::heThermo::heBoundaryTypes() { hbt[patchi] = mixedEnergyFvPatchScalarField::typeName; } - else if (isA(tbf[patchi])) + else if (isA(tbf[patchi])) { hbt[patchi] = energyJumpFvPatchScalarField::typeName; } - else if (isA(tbf[patchi])) + else if (isA(tbf[patchi])) { hbt[patchi] = energyJumpAMIFvPatchScalarField::typeName; }