From 1937f7bca28c428c943733e1a7bb530bab839b37 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 21 Jul 2017 09:25:52 +0100 Subject: [PATCH] Radiation: Renamed Qin -> qin, Qem -> qem for consistency with qr See also commit 8aac0a1808b4d0bd87f3d52a7196bcbc9276f63d --- .../primaryRadiation/primaryRadiation.C | 12 +++---- .../primaryRadiation/primaryRadiation.H | 2 +- .../standardRadiation/standardRadiation.C | 12 +++---- .../standardRadiation/standardRadiation.H | 2 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 14 ++++---- ...iffusiveRadiationMixedFvPatchScalarField.C | 14 ++++---- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 32 +++++++++---------- .../radiationModels/fvDOM/fvDOM/fvDOM.H | 8 ++--- .../radiationModels/fvDOM/fvDOM/fvDOMI.H | 8 ++--- .../radiativeIntensityRay.C | 12 +++---- .../radiativeIntensityRay.H | 12 +++---- .../radiativeIntensityRayI.H | 16 +++++----- 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index ec9236d80..d8d91f045 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C @@ -56,11 +56,11 @@ primaryRadiation::primaryRadiation ) : filmRadiationModel(typeName, film, dict), - QinPrimary_ + qinPrimary_ ( IOobject ( - "Qin", // same name as Qin on primary region to enable mapping + "qin", // same name as qin on primary region to enable mapping film.time().timeName(), film.regionMesh(), IOobject::NO_READ, @@ -83,8 +83,8 @@ primaryRadiation::~primaryRadiation() void primaryRadiation::correct() { - // Transfer Qin from primary region - QinPrimary_.correctBoundaryConditions(); + // Transfer qin from primary region + qinPrimary_.correctBoundaryConditions(); } @@ -108,10 +108,10 @@ tmp primaryRadiation::Shs() ); scalarField& Shs = tShs.ref(); - const scalarField& QinP = QinPrimary_; + const scalarField& qinP = qinPrimary_; const scalarField& alpha = filmModel_.alpha(); - Shs = QinP*alpha; + Shs = qinP*alpha; return tShs; } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H index d2b9da585..d7c201742 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H @@ -61,7 +61,7 @@ private: // Private data //- Incident radiative flux mapped from the primary region / [kg/s3] - volScalarField QinPrimary_; + volScalarField qinPrimary_; // Private member functions diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index f33375284..d210d5e7b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C @@ -57,11 +57,11 @@ standardRadiation::standardRadiation ) : filmRadiationModel(typeName, film, dict), - QinPrimary_ + qinPrimary_ ( IOobject ( - "Qin", // same name as Qin on primary region to enable mapping + "qin", // same name as qin on primary region to enable mapping film.time().timeName(), film.regionMesh(), IOobject::NO_READ, @@ -101,7 +101,7 @@ standardRadiation::~standardRadiation() void standardRadiation::correct() { // Transfer qr from primary region - QinPrimary_.correctBoundaryConditions(); + qinPrimary_.correctBoundaryConditions(); } @@ -125,14 +125,14 @@ tmp standardRadiation::Shs() ); scalarField& Shs = tShs.ref(); - const scalarField& QinP = QinPrimary_; + const scalarField& qinP = qinPrimary_; const scalarField& delta = filmModel_.delta(); const scalarField& alpha = filmModel_.alpha(); - Shs = beta_*QinP*alpha*(1.0 - exp(-kappaBar_*delta)); + Shs = beta_*qinP*alpha*(1.0 - exp(-kappaBar_*delta)); // Update net qr on local region - qrNet_.primitiveFieldRef() = QinP - Shs; + qrNet_.primitiveFieldRef() = qinP - Shs; qrNet_.correctBoundaryConditions(); return tShs; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H index 191f1dab9..a4dec4bb3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H @@ -60,7 +60,7 @@ private: // Private data //- Radiative incident flux mapped from the primary region / [kg/s3] - volScalarField QinPrimary_; + volScalarField qinPrimary_; //- Remaining radiative flux after removing local contribution volScalarField qrNet_; diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index f5723b6e2..4eabcb20c 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -189,18 +189,18 @@ updateCoeffs() const scalarField temissivity = emissivity(); - scalarField& Qem = ray.Qem().boundaryFieldRef()[patchi]; - scalarField& Qin = ray.Qin().boundaryFieldRef()[patchi]; + scalarField& qem = ray.qem().boundaryFieldRef()[patchi]; + scalarField& qin = ray.qin().boundaryFieldRef()[patchi]; const vector& myRayId = dom.IRay(rayId).d(); // Use updated Ir while iterating over rays - // avoids to used lagged Qin - scalarField Ir = dom.IRay(0).Qin().boundaryField()[patchi]; + // avoids to used lagged qin + scalarField Ir = dom.IRay(0).qin().boundaryField()[patchi]; for (label rayI=1; rayI < dom.nRay(); rayI++) { - Ir += dom.IRay(rayI).Qin().boundaryField()[patchi]; + Ir += dom.IRay(rayI).qin().boundaryField()[patchi]; } forAll(Iw, facei) @@ -218,7 +218,7 @@ updateCoeffs() )/pi; // Emmited heat flux from this ray direction - Qem[facei] = refValue()[facei]*nAve[facei]; + qem[facei] = refValue()[facei]*nAve[facei]; } else { @@ -228,7 +228,7 @@ updateCoeffs() refValue()[facei] = 0.0; //not used // Incident heat flux on this ray direction - Qin[facei] = Iw[facei]*nAve[facei]; + qin[facei] = Iw[facei]*nAve[facei]; } } diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 21654e154..d22614925 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -195,16 +195,16 @@ updateCoeffs() scalarField temissivity = emissivity(); - scalarField& Qem = ray.Qem().boundaryFieldRef()[patchi]; - scalarField& Qin = ray.Qin().boundaryFieldRef()[patchi]; + scalarField& qem = ray.qem().boundaryFieldRef()[patchi]; + scalarField& qin = ray.qin().boundaryFieldRef()[patchi]; // Use updated Ir while iterating over rays - // avoids to used lagged Qin - scalarField Ir = dom.IRay(0).Qin().boundaryField()[patchi]; + // avoids to used lagged qin + scalarField Ir = dom.IRay(0).qin().boundaryField()[patchi]; for (label rayI=1; rayI < dom.nRay(); rayI++) { - Ir += dom.IRay(rayI).Qin().boundaryField()[patchi]; + Ir += dom.IRay(rayI).qin().boundaryField()[patchi]; } forAll(Iw, facei) @@ -223,7 +223,7 @@ updateCoeffs() )/pi; // Emmited heat flux from this ray direction - Qem[facei] = refValue()[facei]*nAve[facei]; + qem[facei] = refValue()[facei]*nAve[facei]; } else { @@ -233,7 +233,7 @@ updateCoeffs() refValue()[facei] = 0.0; //not used // Incident heat flux on this ray direction - Qin[facei] = Iw[facei]*nAve[facei]; + qin[facei] = Iw[facei]*nAve[facei]; } } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C index 7b922f3af..94d365081 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C @@ -235,31 +235,31 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T) mesh_, dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - Qem_ + qem_ ( IOobject ( - "Qem", + "qem", mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), mesh_, - dimensionedScalar("Qem", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qem", dimMass/pow3(dimTime), 0.0) ), - Qin_ + qin_ ( IOobject ( - "Qin", + "qin", mesh_.time().timeName(), mesh_, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("Qin", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qin", dimMass/pow3(dimTime), 0.0) ), a_ ( @@ -327,31 +327,31 @@ Foam::radiation::fvDOM::fvDOM mesh_, dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - Qem_ + qem_ ( IOobject ( - "Qem", + "qem", mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), mesh_, - dimensionedScalar("Qem", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qem", dimMass/pow3(dimTime), 0.0) ), - Qin_ + qin_ ( IOobject ( - "Qin", + "qin", mesh_.time().timeName(), mesh_, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("Qin", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qin", dimMass/pow3(dimTime), 0.0) ), a_ ( @@ -506,16 +506,16 @@ void Foam::radiation::fvDOM::updateG() { G_ = dimensionedScalar("zero",dimMass/pow3(dimTime), 0.0); qr_ = dimensionedScalar("zero",dimMass/pow3(dimTime), 0.0); - Qem_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); - Qin_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); + qem_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); + qin_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); forAll(IRay_, rayI) { IRay_[rayI].addIntensity(); G_ += IRay_[rayI].I()*IRay_[rayI].omega(); qr_.boundaryFieldRef() += IRay_[rayI].qr().boundaryField(); - Qem_.boundaryFieldRef() += IRay_[rayI].Qem().boundaryField(); - Qin_.boundaryFieldRef() += IRay_[rayI].Qin().boundaryField(); + qem_.boundaryFieldRef() += IRay_[rayI].qem().boundaryField(); + qin_.boundaryFieldRef() += IRay_[rayI].qin().boundaryField(); } } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H index 4b187ab40..cbcbf4d64 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H @@ -92,10 +92,10 @@ class fvDOM volScalarField qr_; //- Emmited radiative heat flux [W/m2] - volScalarField Qem_; + volScalarField qem_; //- Incidet radiative heat flux [W/m2] - volScalarField Qin_; + volScalarField qin_; //- Total absorption coefficient [1/m] volScalarField a_; @@ -231,10 +231,10 @@ public: inline const volScalarField& qr() const; //- Const access to incident radiative heat flux field - inline const volScalarField& Qin() const; + inline const volScalarField& qin() const; //- Const access to emitted radiative heat flux field - inline const volScalarField& Qem() const; + inline const volScalarField& qem() const; //- Const access to black body inline const blackBodyEmission& blackBody() const; diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOMI.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOMI.H index 6197b88e1..7e17aac09 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOMI.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOMI.H @@ -91,15 +91,15 @@ inline const Foam::volScalarField& Foam::radiation::fvDOM::qr() const return qr_; } -inline const Foam::volScalarField& Foam::radiation::fvDOM::Qin() const +inline const Foam::volScalarField& Foam::radiation::fvDOM::qin() const { - return Qin_; + return qin_; } -inline const Foam::volScalarField& Foam::radiation::fvDOM::Qem() const +inline const Foam::volScalarField& Foam::radiation::fvDOM::qem() const { - return Qem_; + return qem_; } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 76835c76c..60ac75c60 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -82,31 +82,31 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay mesh_, dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - Qin_ + qin_ ( IOobject ( - "Qin" + name(rayId), + "qin" + name(rayId), mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), mesh_, - dimensionedScalar("Qin", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qin", dimMass/pow3(dimTime), 0.0) ), - Qem_ + qem_ ( IOobject ( - "Qem" + name(rayId), + "qem" + name(rayId), mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), mesh_, - dimensionedScalar("Qem", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qem", dimMass/pow3(dimTime), 0.0) ), d_(Zero), dAve_(Zero), diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index 2dc4eb411..7cd2713b6 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H @@ -83,10 +83,10 @@ private: volScalarField qr_; //- Incident radiative heat flux on boundary - volScalarField Qin_; + volScalarField qin_; //- Emitted radiative heat flux on boundary - volScalarField Qem_; + volScalarField qem_; //- Direction vector d_; @@ -182,16 +182,16 @@ public: inline volScalarField& qr(); //- Return non-const access to the boundary incident heat flux - inline volScalarField& Qin(); + inline volScalarField& qin(); //- Return non-const access to the boundary emmited heat flux - inline volScalarField& Qem(); + inline volScalarField& qem(); //- Return const access to the boundary incident heat flux - inline const volScalarField& Qin() const; + inline const volScalarField& qin() const; //- Return const access to the boundary emmited heat flux - inline const volScalarField& Qem() const; + inline const volScalarField& qem() const; //- Return direction inline const vector& d() const; diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H index d307d890b..0356aa782 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H @@ -43,28 +43,28 @@ inline Foam::volScalarField& Foam::radiation::radiativeIntensityRay::qr() } inline const Foam::volScalarField& Foam::radiation:: -radiativeIntensityRay::Qin() const +radiativeIntensityRay::qin() const { - return Qin_; + return qin_; } -inline Foam::volScalarField& Foam::radiation::radiativeIntensityRay::Qin() +inline Foam::volScalarField& Foam::radiation::radiativeIntensityRay::qin() { - return Qin_; + return qin_; } inline const Foam::volScalarField& Foam::radiation:: -radiativeIntensityRay::Qem() const +radiativeIntensityRay::qem() const { - return Qem_; + return qem_; } -inline Foam::volScalarField& Foam::radiation::radiativeIntensityRay::Qem() +inline Foam::volScalarField& Foam::radiation::radiativeIntensityRay::qem() { - return Qem_; + return qem_; }