diff --git a/src/thermophysicalModels/radiationModels/Make/files b/src/thermophysicalModels/radiationModels/Make/files index c86d8aa8d3..9822712105 100644 --- a/src/thermophysicalModels/radiationModels/Make/files +++ b/src/thermophysicalModels/radiationModels/Make/files @@ -26,8 +26,8 @@ submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionE /* Boundary conditions */ -derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C -derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C +derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C +derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C similarity index 97% rename from src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C index 9068904d50..9bd7d0f827 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.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 @@ -23,12 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "MarshakRadiationMixedFvPatchScalarField.H" +#include "MarshakRadiationFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" - -#include "fvc.H" #include "radiationModel.H" #include "physicoChemicalConstants.H" diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C similarity index 75% rename from src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C index 711ac43bd9..d98d0c56f5 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.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 @@ -23,19 +23,17 @@ License \*---------------------------------------------------------------------------*/ -#include "MarshakRadiationFixedTMixedFvPatchScalarField.H" +#include "MarshakRadiationFixedTemperatureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" - -#include "fvc.H" #include "radiationModel.H" #include "physicoChemicalConstants.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::MarshakRadiationFixedTMixedFvPatchScalarField:: -MarshakRadiationFixedTMixedFvPatchScalarField +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -51,10 +49,10 @@ MarshakRadiationFixedTMixedFvPatchScalarField } -Foam::MarshakRadiationFixedTMixedFvPatchScalarField:: -MarshakRadiationFixedTMixedFvPatchScalarField +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField& ptf, + const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -71,8 +69,8 @@ MarshakRadiationFixedTMixedFvPatchScalarField {} -Foam::MarshakRadiationFixedTMixedFvPatchScalarField:: -MarshakRadiationFixedTMixedFvPatchScalarField +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -95,10 +93,10 @@ MarshakRadiationFixedTMixedFvPatchScalarField } -Foam::MarshakRadiationFixedTMixedFvPatchScalarField:: -MarshakRadiationFixedTMixedFvPatchScalarField +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField& ptf + const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf ) : mixedFvPatchScalarField(ptf), @@ -112,10 +110,10 @@ MarshakRadiationFixedTMixedFvPatchScalarField {} -Foam::MarshakRadiationFixedTMixedFvPatchScalarField:: -MarshakRadiationFixedTMixedFvPatchScalarField +Foam::MarshakRadiationFixedTemperatureFvPatchScalarField:: +MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField& ptf, + const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf, const DimensionedField& iF ) : @@ -132,7 +130,7 @@ MarshakRadiationFixedTMixedFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::autoMap +void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::autoMap ( const fvPatchFieldMapper& m ) @@ -142,7 +140,7 @@ void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::autoMap } -void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::rmap +void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::rmap ( const fvPatchScalarField& ptf, const labelList& addr @@ -150,14 +148,14 @@ void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::rmap { mixedFvPatchScalarField::rmap(ptf, addr); - const MarshakRadiationFixedTMixedFvPatchScalarField& mrptf = - refCast(ptf); + const MarshakRadiationFixedTemperatureFvPatchScalarField& mrptf = + refCast(ptf); Trad_.rmap(mrptf.Trad_, addr); } -void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::updateCoeffs() +void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::updateCoeffs() { if (this->updated()) { @@ -190,7 +188,7 @@ void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::updateCoeffs() } -void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::write +void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::write ( Ostream& os ) const @@ -208,7 +206,7 @@ namespace Foam makePatchTypeField ( fvPatchScalarField, - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ); } diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.H similarity index 80% rename from src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.H index eca5babefa..2dea136f86 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::MarshakRadiationFixedTMixedFvPatchScalarField + Foam::MarshakRadiationFixedTemperatureFvPatchScalarField Description A 'mixed' boundary condition that implements a Marshak condition for the @@ -42,12 +42,12 @@ Description \endverbatim SourceFiles - MarshakRadiationFixedTMixedFvPatchScalarField.C + MarshakRadiationFixedTemperatureFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef MarshakRadiationFixedTMixedFvPatchField_H -#define MarshakRadiationFixedTMixedFvPatchField_H +#ifndef MarshakRadiationFixedTemperatureFvPatchScalarField_H +#define MarshakRadiationFixedTemperatureFvPatchScalarField_H #include "mixedFvPatchFields.H" #include "radiationCoupledBase.H" @@ -58,10 +58,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class MarshakRadiationFixedTMixedFvPatchScalarField Declaration + Class MarshakRadiationFixedTemperatureFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class MarshakRadiationFixedTMixedFvPatchScalarField +class MarshakRadiationFixedTemperatureFvPatchScalarField : public mixedFvPatchScalarField, public radiationCoupledBase @@ -76,20 +76,20 @@ class MarshakRadiationFixedTMixedFvPatchScalarField public: //- Runtime type information - TypeName("MarshakRadiationFixedT"); + TypeName("MarshakRadiationFixedTemperature"); // Constructors //- Construct from patch and internal field - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -98,18 +98,18 @@ public: //- Construct by mapping given MarshakRadiationFvPatchField onto a new // patch - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField&, + const MarshakRadiationFixedTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField& + const MarshakRadiationFixedTemperatureFvPatchScalarField& ); //- Construct and return a clone @@ -117,14 +117,14 @@ public: { return tmp ( - new MarshakRadiationFixedTMixedFvPatchScalarField(*this) + new MarshakRadiationFixedTemperatureFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - MarshakRadiationFixedTMixedFvPatchScalarField + MarshakRadiationFixedTemperatureFvPatchScalarField ( - const MarshakRadiationFixedTMixedFvPatchScalarField&, + const MarshakRadiationFixedTemperatureFvPatchScalarField&, const DimensionedField& ); @@ -136,7 +136,11 @@ public: { return tmp ( - new MarshakRadiationFixedTMixedFvPatchScalarField(*this, iF) + new MarshakRadiationFixedTemperatureFvPatchScalarField + ( + *this, + iF + ) ); }