diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C index 5c08b7ccaf..87677ceaf8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C @@ -71,46 +71,6 @@ Foam::mappedFieldFvPatchField::mappedFieldFvPatchField {} -template -Foam::mappedFieldFvPatchField::mappedFieldFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - - // mappedPatchBase - const word& sampleRegion, - const sampleMode sampleMode, - const word& samplePatch, - const scalar distance, - - // My settings - const word& fieldName, - const bool setAverage, - const Type average, - const word& interpolationScheme -) -: - fixedValueFvPatchField(p, iF), - mappedPatchBase - ( - p.patch(), - sampleRegion, - sampleMode, - samplePatch, - distance - ), - mappedPatchFieldBase - ( - *this, - *this, - fieldName, - setAverage, - average, - interpolationScheme - ) -{} - - template Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H index c4964b45c6..9dc43daf3f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H @@ -115,29 +115,7 @@ public: const dictionary& ); - //- Construct from patch, internal field and distance for normal type - // sampling - mappedFieldFvPatchField - ( - const fvPatch&, - const DimensionedField&, - - // mappedPatchBase - const word& sampleRegion, - const sampleMode sampleMode, - const word& samplePatch, - const scalar distance, - - // My settings - const word& fieldName, - const bool setAverage, - const Type average, - const word& interpolationScheme - ); - - //- Construct by mapping given - // mappedFieldFvPatchField - // onto a new patch + //- Construct by mapping given mappedFieldFvPatchField onto a new patch mappedFieldFvPatchField ( const mappedFieldFvPatchField&, diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C index 599b66e404..e6cce3b586 100644 --- a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C @@ -170,9 +170,9 @@ void Foam::MarshakRadiationFvPatchScalarField::updateCoeffs() const scalarField& gamma = patch().lookupPatchField("gammaRad"); - const scalarField temissivity = emissivity(); + const scalarField emissivity(this->emissivity()); - const scalarField Ep(temissivity/(2.0*(2.0 - temissivity))); + const scalarField Ep(emissivity/(2.0*(2.0 - emissivity))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C index 691cff174c..06edc643cd 100644 --- a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C @@ -173,9 +173,9 @@ void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::updateCoeffs() const scalarField& gamma = patch().lookupPatchField("gammaRad"); - const scalarField temissivity = emissivity(); + const scalarField emissivity(this->emissivity()); - const scalarField Ep(temissivity/(2*(2 - temissivity))); + const scalarField Ep(emissivity/(2*(2 - emissivity))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); diff --git a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 2e8d197c1c..62a6b95735 100644 --- a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -199,7 +199,7 @@ void Foam::greyDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs() ray.qr().boundaryFieldRef()[patchi] += Iw*nAve; - const scalarField temissivity = emissivity(); + const scalarField emissivity(this->emissivity()); scalarField& qem = ray.qem().boundaryFieldRef()[patchi]; scalarField& qin = ray.qin().boundaryFieldRef()[patchi]; @@ -224,8 +224,8 @@ void Foam::greyDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs() valueFraction()[facei] = 1.0; refValue()[facei] = ( - Ir[facei]*(scalar(1) - temissivity[facei]) - + temissivity[facei]*physicoChemical::sigma.value() + Ir[facei]*(scalar(1) - emissivity[facei]) + + emissivity[facei]*physicoChemical::sigma.value() * pow4(Tp[facei]) )/pi; diff --git a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index fe68ad4b80..f68cc9693a 100644 --- a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -205,7 +205,7 @@ void Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs() dom.blackBody().bLambda(lambdaId).boundaryField()[patchi] ); - scalarField temissivity = emissivity(); + scalarField emissivity(this->emissivity()); scalarField& qem = ray.qem().boundaryFieldRef()[patchi]; scalarField& qin = ray.qin().boundaryFieldRef()[patchi]; @@ -230,8 +230,8 @@ void Foam::wideBandDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs() valueFraction()[facei] = 1.0; refValue()[facei] = ( - Ir[facei]*(1.0 - temissivity[facei]) - + temissivity[facei]*Eb[facei] + Ir[facei]*(1.0 - emissivity[facei]) + + emissivity[facei]*Eb[facei] )/pi; // Emitted heat flux from this ray direction