diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C index 5aee70ba33eb27e57bbce9b2625aa9bc88ca9e8c..ccd9cc3b5efa7b487f3d89fd0b7ff22099a8ff19 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C @@ -45,7 +45,7 @@ fixedIncidentRadiationFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), temperatureCoupledBase(patch(), "undefined", "undefined", "undefined-K"), - QrIncident_(p.size(), 0.0) + qrIncident_(p.size(), 0.0) {} @@ -60,7 +60,7 @@ fixedIncidentRadiationFvPatchScalarField : fixedGradientFvPatchScalarField(psf, p, iF, mapper), temperatureCoupledBase(patch(), psf), - QrIncident_(psf.QrIncident_) + qrIncident_(psf.qrIncident_) {} @@ -74,7 +74,7 @@ fixedIncidentRadiationFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), temperatureCoupledBase(patch(), dict), - QrIncident_("QrIncident", dict, p.size()) + qrIncident_("qrIncident", dict, p.size()) { if (dict.found("value") && dict.found("gradient")) { @@ -99,7 +99,7 @@ fixedIncidentRadiationFvPatchScalarField : fixedGradientFvPatchScalarField(psf, iF), temperatureCoupledBase(patch(), psf), - QrIncident_(psf.QrIncident_) + qrIncident_(psf.qrIncident_) {} @@ -111,7 +111,7 @@ fixedIncidentRadiationFvPatchScalarField : fixedGradientFvPatchScalarField(ptf), temperatureCoupledBase(patch(), ptf), - QrIncident_(ptf.QrIncident_) + qrIncident_(ptf.qrIncident_) {} @@ -123,7 +123,7 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::autoMap ) { fixedGradientFvPatchScalarField::autoMap(m); - QrIncident_.autoMap(m); + qrIncident_.autoMap(m); } @@ -141,7 +141,7 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::rmap psf ); - QrIncident_.rmap(thftpsf.QrIncident_, addr); + qrIncident_.rmap(thftpsf.qrIncident_, addr); } @@ -165,7 +165,7 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::updateCoeffs() gradient() = emissivity *( - QrIncident_ + qrIncident_ - physicoChemical::sigma.value()*pow4(*this) )/kappa(*this); @@ -173,11 +173,11 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::updateCoeffs() if (debug) { - scalar Qr = gSum(kappa(*this)*gradient()*patch().magSf()); + scalar qr = gSum(kappa(*this)*gradient()*patch().magSf()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' << this->internalField().name() << " -> " - << " radiativeFlux:" << Qr + << " radiativeFlux:" << qr << " walltemperature " << " min:" << gMin(*this) << " max:" << gMax(*this) @@ -194,7 +194,7 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::write { fixedGradientFvPatchScalarField::write(os); temperatureCoupledBase::write(os); - QrIncident_.writeEntry("QrIncident", os); + qrIncident_.writeEntry("qrIncident", os); writeEntry("value", os); } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H index 79b48191fe3d97b582b2e303b4dd278884a65d4a..987adcb89caa359cc1b10afb038c1882e29b010a 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H @@ -34,19 +34,19 @@ Description the gradient heat flux is calculated as : - Qr = emissivity*(QrIncident - sigma_*T^4) + qr = emissivity*(qrIncident - sigma_*T^4) where: emissivity is the emissivity of the solid. - QrIncident is the specified fixed incident radiation. + qrIncident is the specified fixed incident radiation. Example usage: wall { type fixedIncidentRadiation; - QrIncident uniform 500; + qrIncident uniform 500; kappa solidThermo; KappaName none; } @@ -89,7 +89,7 @@ class fixedIncidentRadiationFvPatchScalarField // Private data //- Incident radiative heat flux - scalarField QrIncident_; + scalarField qrIncident_; public: diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C index 6d9d8b171b1dbf6b04accf31b59abb0baca1d447..52de5b816bb2cb3258c9f67745f149714459033e 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C @@ -150,18 +150,18 @@ void Foam::lumpedMassWallTemperatureFvPatchScalarField::updateCoeffs() if (debug) { - scalar qin(0); - scalar qout(0); + scalar Qin(0); + scalar Qout(0); forAll(q, facei) { - if (q[facei] > 0.0) //out the wall + if (q[facei] > 0.0) // out the wall { - qout += q[facei]*magSf[facei]; + Qout += q[facei]*magSf[facei]; } - else if (q[facei] < 0.0) //into the wall + else if (q[facei] < 0.0) // into the wall { - qin += q[facei]*magSf[facei]; + Qin += q[facei]*magSf[facei]; } } @@ -173,8 +173,8 @@ void Foam::lumpedMassWallTemperatureFvPatchScalarField::updateCoeffs() << " min:" << gMin(*this) << " max:" << gMax(*this) << " avg:" << gAverage(*this) - << " Qin [W]:" << qin - << " Qout [W]:" << qout + << " Qin [W]:" << Qin + << " Qout [W]:" << Qout << endl; } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index 6ed6e4f72afb060258182e8c36403d934863d02a..4221ad93de1d4b126d77672c84ba5fc0439b860f 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -50,7 +50,7 @@ thermalBaffle1DFvPatchScalarField TName_("T"), baffleActivated_(true), thickness_(p.size()), - Qs_(p.size()), + qs_(p.size()), solidDict_(), solidPtr_(nullptr), qrPrevious_(p.size()), @@ -74,7 +74,7 @@ thermalBaffle1DFvPatchScalarField TName_(ptf.TName_), baffleActivated_(ptf.baffleActivated_), thickness_(ptf.thickness_, mapper), - Qs_(ptf.Qs_, mapper), + qs_(ptf.qs_, mapper), solidDict_(ptf.solidDict_), solidPtr_(ptf.solidPtr_), qrPrevious_(ptf.qrPrevious_, mapper), @@ -97,7 +97,7 @@ thermalBaffle1DFvPatchScalarField TName_("T"), baffleActivated_(dict.lookupOrDefault<bool>("baffleActivated", true)), thickness_(), - Qs_(p.size(), 0), + qs_(p.size(), 0), solidDict_(dict), solidPtr_(), qrPrevious_(p.size(), 0.0), @@ -111,9 +111,9 @@ thermalBaffle1DFvPatchScalarField thickness_ = scalarField("thickness", dict, p.size()); } - if (dict.found("Qs")) + if (dict.found("qs")) { - Qs_ = scalarField("Qs", dict, p.size()); + qs_ = scalarField("qs", dict, p.size()); } if (dict.found("qrPrevious")) @@ -151,7 +151,7 @@ thermalBaffle1DFvPatchScalarField TName_(ptf.TName_), baffleActivated_(ptf.baffleActivated_), thickness_(ptf.thickness_), - Qs_(ptf.Qs_), + qs_(ptf.qs_), solidDict_(ptf.solidDict_), solidPtr_(ptf.solidPtr_), qrPrevious_(ptf.qrPrevious_), @@ -173,7 +173,7 @@ thermalBaffle1DFvPatchScalarField TName_(ptf.TName_), baffleActivated_(ptf.baffleActivated_), thickness_(ptf.thickness_), - Qs_(ptf.Qs_), + qs_(ptf.qs_), solidDict_(ptf.solidDict_), solidPtr_(ptf.solidPtr_), qrPrevious_(ptf.qrPrevious_), @@ -264,11 +264,11 @@ baffleThickness() const template<class solidType> -tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::Qs() const +tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::qs() const { if (this->owner()) { - return Qs_; + return qs_; } else { @@ -283,10 +283,10 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::Qs() const nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_) ); - tmp<scalarField> tQs(new scalarField(nbrField.Qs())); - scalarField& Qs = tQs.ref(); - mapDist.distribute(Qs); - return tQs; + tmp<scalarField> tqs(new scalarField(nbrField.qs())); + scalarField& qs = tqs.ref(); + mapDist.distribute(qs); + return tqs; } } @@ -304,7 +304,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::autoMap if (this->owner()) { thickness_.autoMap(m); - Qs_.autoMap(m); + qs_.autoMap(m); } } @@ -324,7 +324,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::rmap if (this->owner()) { thickness_.rmap(tiptf.thickness_, addr); - Qs_.rmap(tiptf.Qs_, addr); + qs_.rmap(tiptf.qs_, addr); } } @@ -397,7 +397,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs() valueFraction() = alpha/(alpha + myKDelta); - refValue() = (KDeltaSolid*nbrTp + Qs()/2.0)/alpha; + refValue() = (KDeltaSolid*nbrTp + qs()/2.0)/alpha; if (debug) { @@ -431,7 +431,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::write(Ostream& os) const if (this->owner()) { baffleThickness()().writeEntry("thickness", os); - Qs()().writeEntry("Qs", os); + qs()().writeEntry("qs", os); solid().write(os); } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H index f9491806fecfdde79494d021c10b96b524745e30..d93092d699fbbf3d8eed03d45c465e037b89887f 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H @@ -46,7 +46,7 @@ Usage samplePatch <slavePatchName>; thickness uniform 0.005; // thickness [m] - Qs uniform 100; // heat flux [W/m2] + qs uniform 100; // heat flux [W/m2] qr none; relaxation 1; @@ -124,7 +124,7 @@ class thermalBaffle1DFvPatchScalarField mutable scalarField thickness_; //- Superficial heat source [W/m2] - mutable scalarField Qs_; + mutable scalarField qs_; //- Solid dictionary dictionary solidDict_; @@ -147,8 +147,8 @@ class thermalBaffle1DFvPatchScalarField //- Return const solid thermo const solidType& solid() const; - //- Return Qs from master - tmp<scalarField> Qs() const; + //- Return qs from master + tmp<scalarField> qs() const; //- Return thickness from master tmp<scalarField> baffleThickness() const; diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C index a672011e28aa1e884baf658a997d95608b2ae917..7a0cfe1a08814054a4c6ba1544e3d6220496ac8c 100644 --- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C +++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C @@ -219,7 +219,7 @@ bool Foam::slidingInterface::projectPoints() const projectionAlgo_ ); -// Pout<< "USING N-SQAURED!!!" << endl; +// Pout<< "USING N-SQUARED!!!" << endl; // List<objectHit> slavePointFaceHits = // projectPointsNSquared<face, List, const pointField&> // ( diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index 8893abb3e57c15324de1d6abae9f8bfb72ac9396..9e276fa01e4c70b04873a7b222307a93f6b7d02c 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -48,7 +48,7 @@ Description \endvartable - The distribution inside the hear exchanger is given by: + The distribution inside the heat exchanger is given by: \f[ Q_c = \frac{V_c |U_c| (T_c - T_{ref})}{\sum(V_c |U_c| (T_c - T_{ref}))} \f] diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index ec9236d802e5487659a49a08ca0a2691954cf500..d8d91f045a9954db6a10861fe8d47ad8938d73c3 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<volScalarField> 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 b93561d49e83bc8249c7d847a3701ceae9005727..0334c8de1a6ed0f052e75daa08395b3c7ecfcc2f 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 f333752847f435abf238e5af01eea0e2c0c97156..d210d5e7b0d5f5f2a839b94a9d2a0302c99e704a 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<volScalarField> 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 7375ef79ec9e3e75bfd8b01ae807f27565c3d97f..3562166202eecb5769889b20c586139d087802ee 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/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H index e770d8b56cb93d8c76dacc73cec9f9a0ab65ece7..3bb38b436779066bd7f26d6524b3fac550124b67 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H @@ -367,10 +367,10 @@ public: // Derived fields (calculated on-the-fly) //- Return the convective heat energy from film to wall - inline tmp<scalarField> Qconvw(const label patchi) const; + inline tmp<scalarField> qconvw(const label patchi) const; //- Return the convective heat energy from primary region to film - inline tmp<scalarField> Qconvp(const label patchi) const; + inline tmp<scalarField> qconvp(const label patchi) const; // Evolution diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H index bf9f8e60c76354990b6254da648fefda51be5a1d..38fdd485400b2194299f691f17ac67e07ea09ca5 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H @@ -155,7 +155,7 @@ inline const filmRadiationModel& thermoSingleLayer::radiation() const } -inline tmp<scalarField> thermoSingleLayer::Qconvw(const label patchi) const +inline tmp<scalarField> thermoSingleLayer::qconvw(const label patchi) const { const scalarField htc(htcw_->h()().boundaryField()[patchi]); const scalarField& Tp = T_.boundaryField()[patchi]; @@ -165,7 +165,7 @@ inline tmp<scalarField> thermoSingleLayer::Qconvw(const label patchi) const } -inline tmp<scalarField> thermoSingleLayer::Qconvp(const label patchi) const +inline tmp<scalarField> thermoSingleLayer::qconvp(const label patchi) const { const scalarField htc(htcs_->h()().boundaryField()[patchi]); const scalarField& Tp = T_.boundaryField()[patchi]; diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C index 5ebe085f2d15247122b043b780267235c619a842..61475876004f4e38a642830b52d16a1cf10b335f 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C +++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C @@ -97,7 +97,7 @@ void thermalBaffle::solveEnergy() volScalarField alpha("alpha", thermo_->alpha()); - //If region is one-dimension variable thickness + // If region is one-dimension variable thickness if (oneD_ && !constantThickness_) { // Scale K and rhoCp and fill Q in the internal baffle region. @@ -112,7 +112,7 @@ void thermalBaffle::solveEnergy() const label cellId = cells[i]; Q[cellId] = - Qs_.boundaryField()[patchi][localFacei] + qs_.boundaryField()[patchi][localFacei] /thickness_[localFacei]; rho[cellId] *= delta_.value()/thickness_[localFacei]; @@ -167,11 +167,11 @@ thermalBaffle::thermalBaffle nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))), thermo_(solidThermo::New(regionMesh(), dict)), h_(thermo_->he()), - Qs_ + qs_ ( IOobject ( - "Qs", + "qs", regionMesh().time().timeName(), regionMesh(), IOobject::READ_IF_PRESENT, @@ -227,11 +227,11 @@ thermalBaffle::thermalBaffle nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))), thermo_(solidThermo::New(regionMesh())), h_(thermo_->he()), - Qs_ + qs_ ( IOobject ( - "Qs", + "qs", regionMesh().time().timeName(), regionMesh(), IOobject::READ_IF_PRESENT, @@ -289,13 +289,13 @@ void thermalBaffle::init() if (oneD_ && !constantThickness_) { label patchi = intCoupledPatchIDs_[0]; - const label Qsb = Qs_.boundaryField()[patchi].size(); + const label qsb = qs_.boundaryField()[patchi].size(); - if (Qsb!= thickness_.size()) + if (qsb!= thickness_.size()) { FatalErrorInFunction - << "the boundary field of Qs is " - << Qsb << " and " << nl + << "the boundary field of qs is " + << qsb << " and " << nl << "the field 'thickness' is " << thickness_.size() << nl << exit(FatalError); } diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H index 48768dca9313a2398e233f98091df79f04823eaa..9016284b6052a49e8b25bf5ab7d5ddddc504e3de 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H +++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H @@ -94,7 +94,7 @@ protected: // Source term fields //- Surface energy source / [J/m2/s] - volScalarField Qs_; + volScalarField qs_; //- Volumetric energy source / [J/m3/s] volScalarField Q_; diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 72b0803f1c281b6d37ce50e869daf5647fde1ccd..70423f1a722fc6adcb5d02356a1aa19f45c26ba8 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -184,18 +184,18 @@ updateCoeffs() const scalarField& emissivity = temissivity(); - 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]; } if (solarLoad_) @@ -221,7 +221,7 @@ updateCoeffs() )/pi; // Emmited heat flux from this ray direction - Qem[faceI] = refValue()[faceI]*nAve[faceI]; + qem[faceI] = refValue()[faceI]*nAve[faceI]; } else { @@ -231,7 +231,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 102a8f87c5a9218fc625ea4a9805c5fdb4167166..8bf1e455f669ee8ea2b869102cdcfad8286acbb6 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -177,17 +177,17 @@ updateCoeffs() const scalarField& emissivity = temissivity(); - 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 + // avoids to used lagged qin /* - scalarField Ir = dom.IRay(0).Qin().boundaryField()[patchi]; + 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]; } */ @@ -227,7 +227,7 @@ updateCoeffs() )/pi; // Emmited heat flux from this ray direction (sum over lambdaId) - Qem[facei] += refValue()[facei]*nAve[facei]; + qem[facei] += refValue()[facei]*nAve[facei]; } else { @@ -237,7 +237,7 @@ updateCoeffs() refValue()[facei] = 0.0; //not used // Incident heat flux on this ray direction (sum over lambdaId) - 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 71cca246dc21c930b51910215ef50ecb413bce79..23fd128691b6e4ea775302e4619f269dfe2adaf1 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C @@ -243,31 +243,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_ ( @@ -336,31 +336,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_ ( @@ -509,16 +509,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 84d12a057e8a587cfc441be7f4eb738109f71fbf..3c00d3b2872808eb14e16c46ebc35d2ae2b26863 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H @@ -107,10 +107,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_; @@ -255,10 +255,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 dc64c7b76c218cf53883dff3d9910f3fc7eeafb0..64e3aa7027b3241fbb468438bcf235f388543341 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 adf5f54912b675c5c089e340c038562a3fd118bb..84a70d45e897da379063d732efd99ac2e868d488 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -80,31 +80,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 2dc4eb411346fb521432c4941994f196f2cffa9f..7cd2713b662f165db53979b6ac9b72c0042a5c04 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 d307d890bc0233154148a7c670fc60a4921dffc9..0356aa782ec331e2b9773590235d4b03118aa4c4 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_; } diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C index 1f097e7855781935ba2c9a305b5fd9f64ec5304b..b8de0f96bcd4219702abd3fcf0043ccbaf7d881b 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C @@ -43,7 +43,7 @@ namespace Foam } const Foam::word Foam::radiation::radiationModel::externalRadHeatFieldName_ = - "QrExt"; + "qrExt"; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C index 866865fbcb2ffe263beb1806f05c6388c815141c..97069ab988c1a9fc628cff168783a4559205e129 100644 --- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C +++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C @@ -119,7 +119,7 @@ void Foam::radiation::solarLoad::updateDirectHitRadiation { const polyBoundaryMesh& patches = mesh_.boundaryMesh(); const scalarField& V = mesh_.V(); - volScalarField::Boundary& QrBf = Qr_.boundaryFieldRef(); + volScalarField::Boundary& qrBf = qr_.boundaryFieldRef(); forAll(hitFacesId, i) { @@ -135,7 +135,7 @@ void Foam::radiation::solarLoad::updateDirectHitRadiation for (label bandI = 0; bandI < nBands_; bandI++) { - QrBf[patchID][localFaceI] += + qrBf[patchID][localFaceI] += (qPrim & n[localFaceI]) * spectralDistribution_[bandI] * absorptivity_[patchID][bandI]()[localFaceI]; @@ -167,7 +167,7 @@ void Foam::radiation::solarLoad::updateSkyDiffusiveRadiation { const polyBoundaryMesh& patches = mesh_.boundaryMesh(); const scalarField& V = mesh_.V(); - volScalarField::Boundary& QrBf = Qr_.boundaryFieldRef(); + volScalarField::Boundary& qrBf = qr_.boundaryFieldRef(); switch(solarCalc_.sunLoadModel()) { @@ -231,7 +231,7 @@ void Foam::radiation::solarLoad::updateSkyDiffusiveRadiation { for (label bandI = 0; bandI < nBands_; bandI++) { - QrBf[patchID][faceI] += + qrBf[patchID][faceI] += (Ed + Er) * spectralDistribution_[bandI] * absorptivity_[patchID][bandI]()[faceI]; @@ -269,7 +269,7 @@ void Foam::radiation::solarLoad::updateSkyDiffusiveRadiation { for (label bandI = 0; bandI < nBands_; bandI++) { - QrBf[patchID][faceI] += + qrBf[patchID][faceI] += solarCalc_.diffuseSolarRad() * spectralDistribution_[bandI] * absorptivity_[patchID][bandI]()[faceI]; @@ -555,9 +555,9 @@ void Foam::radiation::solarLoad::calculateQdiff } } - volScalarField::Boundary& QsBf = QsecondRad_.boundaryFieldRef(); + volScalarField::Boundary& qsBf = qsecondRad_.boundaryFieldRef(); - // Fill QsecondRad_ + // Fill qsecondRad_ label compactId = 0; forAll(includePatches_, i) { @@ -566,7 +566,7 @@ void Foam::radiation::solarLoad::calculateQdiff if (pp.size() > 0) { - scalarField& Qrp = QsBf[patchID]; + scalarField& qrp = qsBf[patchID]; const labelList& coarsePatchFace = coarseMesh_->patchFaceMap()[patchID]; @@ -578,7 +578,7 @@ void Foam::radiation::solarLoad::calculateQdiff forAll(fineFaces, k) { label faceI = fineFaces[k]; - Qrp[faceI] = localqDiffusive[compactId]; + qrp[faceI] = localqDiffusive[compactId]; } compactId ++; } @@ -587,15 +587,15 @@ void Foam::radiation::solarLoad::calculateQdiff const scalarField& V = mesh_.V(); const polyBoundaryMesh& patches = mesh_.boundaryMesh(); - volScalarField::Boundary& QrBf = Qr_.boundaryFieldRef(); + volScalarField::Boundary& qrBf = qr_.boundaryFieldRef(); forAllConstIter(labelHashSet, includePatches, iter) { const label patchID = iter.key(); - const scalarField& qSecond = QsecondRad_.boundaryField()[patchID]; + const scalarField& qSecond = qsecondRad_.boundaryField()[patchID]; if (includeMappedPatchBasePatches[patchID]) { - QrBf[patchID] += qSecond; + qrBf[patchID] += qSecond; } else { @@ -630,31 +630,31 @@ Foam::radiation::solarLoad::solarLoad(const volScalarField& T) ) ), coarseMesh_(), - Qr_ + qr_ ( IOobject ( - "Qr", + "qr", mesh_.time().timeName(), mesh_, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("Qr", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - QsecondRad_ + qsecondRad_ ( IOobject ( - "QsecondRad", + "qsecondRad", mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("QsecondRad", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qsecondRad", dimMass/pow3(dimTime), 0.0) ), hitFaces_(), Ru_ @@ -720,31 +720,31 @@ Foam::radiation::solarLoad::solarLoad ) ), coarseMesh_(), - Qr_ + qr_ ( IOobject ( - "Qr", + "qr", mesh_.time().timeName(), mesh_, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("Qr", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - QsecondRad_ + qsecondRad_ ( IOobject ( - "QsecondRad", + "qsecondRad", mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("QsecondRad", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qsecondRad", dimMass/pow3(dimTime), 0.0) ), hitFaces_(), Ru_ @@ -812,7 +812,7 @@ Foam::radiation::solarLoad::solarLoad ) ), coarseMesh_(), - Qr_ + qr_ ( IOobject ( @@ -823,20 +823,20 @@ Foam::radiation::solarLoad::solarLoad IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("Qr", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qr", dimMass/pow3(dimTime), 0.0) ), - QsecondRad_ + qsecondRad_ ( IOobject ( - "QsecondRad", + "qsecondRad", mesh_.time().timeName(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("QsecondRad", dimMass/pow3(dimTime), 0.0) + dimensionedScalar("qsecondRad", dimMass/pow3(dimTime), 0.0) ), hitFaces_(), Ru_ @@ -942,13 +942,13 @@ void Foam::radiation::solarLoad::calculate() } bool facesChanged = updateHitFaces(); - volScalarField::Boundary& QrBf = Qr_.boundaryFieldRef(); + volScalarField::Boundary& qrBf = qr_.boundaryFieldRef(); if (facesChanged) { - // Reset Ru and Qr + // Reset Ru and qr Ru_ = dimensionedScalar("Ru", dimMass/dimLength/pow3(dimTime), 0.0); - QrBf = 0.0; + qrBf = 0.0; // Add direct hit radation const labelList& hitFacesId = hitFaces_->rayStartFaces(); diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H index 824f97e23242d6bce8f66955af15a83f2d25a5da..52e2e9a36e2b6ab6f44f77b38cd0f17d6758d3da 100644 --- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H +++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H @@ -105,10 +105,10 @@ private: autoPtr<singleCellFvMesh> coarseMesh_; //- Net radiative heat flux [W/m2] - volScalarField Qr_; + volScalarField qr_; //- Secondary solar radiative heat flux [W/m2] - volScalarField QsecondRad_; + volScalarField qsecondRad_; //- Direct hit faces Ids autoPtr<faceShading> hitFaces_; @@ -143,10 +143,10 @@ private: //- Face-compact map labelListIOList visibleFaceFaces_; - //- Couple solids through mapped boundary patch using Qr (default:true) + //- Couple solids through mapped boundary patch using qr (default:true) bool solidCoupled_; - //- Couple wall patches using Qr (default:false) + //- Couple wall patches using qr (default:false) bool wallCoupled_; //- Absorptivity list diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C index f0f9d054700fb335a7ba3fb5840c2d32204bb58e..ca59d0e9c57bf333f7d3ead5729f0103bd4f7352 100644 --- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C @@ -149,8 +149,8 @@ humidityTemperatureCoupledMixedFvPatchScalarField rhoName_("rho"), muName_("thermo:mu"), TnbrName_("T"), - QrNbrName_("none"), - QrName_("none"), + qrNbrName_("none"), + qrName_("none"), specieName_("none"), liquid_(nullptr), liquidDict_(nullptr), @@ -189,8 +189,8 @@ humidityTemperatureCoupledMixedFvPatchScalarField rhoName_(psf.rhoName_), muName_(psf.muName_), TnbrName_(psf.TnbrName_), - QrNbrName_(psf.QrNbrName_), - QrName_(psf.QrName_), + qrNbrName_(psf.qrNbrName_), + qrName_(psf.qrName_), specieName_(psf.specieName_), liquid_(psf.liquid_, false), liquidDict_(psf.liquidDict_), @@ -224,8 +224,8 @@ humidityTemperatureCoupledMixedFvPatchScalarField rhoName_(dict.lookupOrDefault<word>("rho", "rho")), muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")), TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")), - QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")), - QrName_(dict.lookupOrDefault<word>("Qr", "none")), + qrNbrName_(dict.lookupOrDefault<word>("qrNbr", "none")), + qrName_(dict.lookupOrDefault<word>("qr", "none")), specieName_(dict.lookupOrDefault<word>("specie", "none")), liquid_(nullptr), liquidDict_(), @@ -348,8 +348,8 @@ humidityTemperatureCoupledMixedFvPatchScalarField rhoName_(psf.rhoName_), muName_(psf.muName_), TnbrName_(psf.TnbrName_), - QrNbrName_(psf.QrNbrName_), - QrName_(psf.QrName_), + qrNbrName_(psf.qrNbrName_), + qrName_(psf.qrName_), specieName_(psf.specieName_), liquid_(psf.liquid_, false), liquidDict_(psf.liquidDict_), @@ -675,26 +675,26 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs() mpp.distribute(dmHfgNbr); } - // Obtain Rad heat (Qr) - scalarField Qr(Tp.size(), 0.0); - if (QrName_ != "none") + // Obtain Rad heat (qr) + scalarField qr(Tp.size(), 0.0); + if (qrName_ != "none") { - Qr = patch().lookupPatchField<volScalarField, scalar>(QrName_); + qr = patch().lookupPatchField<volScalarField, scalar>(qrName_); } - scalarField QrNbr(Tp.size(), 0.0); - if (QrNbrName_ != "none") + scalarField qrNbr(Tp.size(), 0.0); + if (qrNbrName_ != "none") { - QrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(QrNbrName_); - mpp.distribute(QrNbr); + qrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(qrNbrName_); + mpp.distribute(qrNbr); } const scalarField dmHfg(dmHfgNbr + dmHfg_); const scalarField mpCpdt(mpCpTpNbr + mpCpTp_); - // Qr > 0 (heat up the wall) - scalarField alpha(KDeltaNbr + mpCpdt - (Qr + QrNbr)/Tp); + // qr > 0 (heat up the wall) + scalarField alpha(KDeltaNbr + mpCpdt - (qr + qrNbr)/Tp); valueFraction() = alpha/(alpha + myKDelta_); @@ -742,8 +742,8 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_); writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_); writeEntryIfDifferent<word>(os, "Tnbr", "T", TnbrName_); - writeEntryIfDifferent<word>(os, "QrNbr", "none", QrNbrName_); - writeEntryIfDifferent<word>(os, "Qr", "none", QrName_); + writeEntryIfDifferent<word>(os, "qrNbr", "none", qrNbrName_); + writeEntryIfDifferent<word>(os, "qr", "none", qrName_); if (fluid_) { diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H index 9eea39ef7783c8c78f79f5c6a437433d2d127543..3f5b1c0eead451bad20441aae85071336c87b63e 100644 --- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H @@ -212,10 +212,10 @@ private: const word TnbrName_; //- Name of the radiative heat flux in the neighbout region - const word QrNbrName_; + const word qrNbrName_; //- Name of the radiative heat flux field - const word QrName_; + const word qrName_; //- Name of the species on which the mass transfered (default H2O) const word specieName_; diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/T index 3242ebc6bdad37284b61480540151cf1f8f18f61..090543962072f5932bc88774b8589eca0c2739c3 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/T +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/T @@ -43,8 +43,8 @@ boundaryField type compressible::turbulentTemperatureRadCoupledMixed; value uniform 294.75; Tnbr T; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappaMethod fluidThermo; } region0_to_panelRegion_internalWallPanel_top @@ -52,8 +52,8 @@ boundaryField type compressible::turbulentTemperatureRadCoupledMixed; value uniform 294.75; Tnbr T; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappaMethod fluidThermo; } region0_to_panelRegion_internalWallPanel_bottom @@ -61,8 +61,8 @@ boundaryField type compressible::turbulentTemperatureRadCoupledMixed; value uniform 294.75; Tnbr T; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappaMethod fluidThermo; } } diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T index 8c508d723893c3be092e84476f73be34043518cf..e787443c2000ef4940d228d2bf34e00a256b367c 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T @@ -47,8 +47,8 @@ boundaryField type compressible::turbulentTemperatureRadCoupledMixed; neighbourField T; kappaMethod solidThermo; - QrNbr Qr; - Qr none; + qrNbr qr; + qr none; value $internalField; } } diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict index a3010f4c5504e25bc2e317cc1eabd7eff2b74d60..0c0df8816b6ddffd133d6954b0aba4f4686d8088 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict @@ -70,7 +70,7 @@ functions fields (phi); } - wallPanel_Qin + wallPanel_qin { type patchProbes; libs ("libsampling.so"); @@ -84,10 +84,10 @@ functions (0.2 0.2 0.01) // HF3 (0.0 0.4 0.01) // HF4 ); - fields (Qin); + fields (qin); } - inletQr_Qin + inletqr_qin { type patchProbes; libs ("libsampling.so"); @@ -103,7 +103,7 @@ functions (-0.02 0.0 0.02) // HF4 (-0.02 0.0 -0.02) // HF5 ); - fields (Qr Qin); + fields (qr qin); } thermoCouple diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T index 86c1260be083230c14b4050f88ffb8f3a6fc90d6..07e537337fe1a5b7935059f690c9499d3f143228 100644 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T @@ -38,7 +38,7 @@ boundaryField type fixedIncidentRadiation; kappaMethod solidThermo; kappa none; - QrIncident uniform 60000.0; //W + qrIncident uniform 60000.0; //W value uniform 298.15; } diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones index f5fd1efacc503a9dee9d6980ecc49005c85c105d..64b0ab71653bbc6a6cada3d248d3f6af3d1fb66d 100644 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones @@ -25,7 +25,7 @@ FoamFile reactingOneDimCoeffs { - QrHSource no; //Energy source term due in depht radiation + qrHSource no; //Energy source term due in depht radiation filmCoupled false; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches index 88eac454cadf670ed9c1eaa981473d4f7a20c92a..d2bc0fbe59817a0559c8b810435ad39ba816c3c3 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches @@ -11,7 +11,7 @@ T type compressible::thermalBaffle1D<hConstSolidThermoPhysics>; thickness uniform 0.005; // thickness [m] - Qs uniform 100; // heat flux [W/m2] + qs uniform 100; // heat flux [W/m2] # include "1DbaffleSolidThermo" diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T index a7d921215a3c3703368d3346e3d966429a973fb2..97e9af0ab3fa4140c71163a52aeb515d956da1ee 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T @@ -58,8 +58,8 @@ boundaryField inletValue uniform 300; Tnbr T; kappaMethod fluidThermo; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappa none; } air_to_solid @@ -69,8 +69,8 @@ boundaryField inletValue uniform 300; Tnbr T; kappaMethod fluidThermo; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappa none; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/Qr b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/qr similarity index 98% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/Qr rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/qr index e86e40d3851468980199638c28c4fbd6c5a405dc..dd7559ff857282d4ff4f26c10c52b2f53baa4276 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/Qr +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/qr @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0/air"; - object Qr; + object qr; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T index 35ceb480f022b89ccaebd32024835753920bb2c7..209671145c8790aec4daebde7da9dbc1f56bad2a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T @@ -64,8 +64,8 @@ boundaryField value uniform 300; Tnbr T; kappaMethod solidThermo; - QrNbr Qr; - Qr none; + qrNbr qr; + qr none; kappa none; } floor_to_solid @@ -74,8 +74,8 @@ boundaryField value uniform 300; Tnbr T; kappaMethod solidThermo; - QrNbr none; - Qr none; + qrNbr none; + qr none; kappa none; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T index 4e1f26a8c48a2fe050afe249eb90e5f745e78282..196552bde6470c131271205930b6ef4bd8c58a48 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T @@ -32,8 +32,8 @@ boundaryField value uniform 300; Tnbr T; kappaMethod solidThermo; - QrNbr Qr; - Qr none; + qrNbr qr; + qr none; kappa none; } solid_to_floor @@ -42,8 +42,8 @@ boundaryField value uniform 300; Tnbr T; kappaMethod solidThermo; - QrNbr none; - Qr none; + qrNbr none; + qr none; kappa none; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre index 37a630197599f4e696c7b42ec2acf6e8625d9ead..78752106d3d6bd53217090e120b38a004a5bbb6d 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre @@ -16,7 +16,7 @@ rm -r system/domain3 # remove fluid fields from solid regions (important for post-processing) for i in solid floor do - rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,Qr,G,IDefault} + rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault} done for i in air solid floor diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties index dd4e6f8da4a19a7c08072d511acac88629670bc1..fe50c86eeacdd19c3f8e816f1001eb9a6fce7ee5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties @@ -72,8 +72,8 @@ solarLoadCoeffs C 0.058; // Model constant // Radiative flux coupling flags - solidCoupled true; //Couple through Qr the solid regions (default true) - wallCoupled false; //Couple through Qr wall patches (default false) + solidCoupled true; //Couple through qr the solid regions (default true) + wallCoupled false; //Couple through qr wall patches (default false) } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict index 33ce84e5598af295e95415c33fab6d2a861601b9..46208629875248ea9a0723a09c2d3026cd632907 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict @@ -69,8 +69,8 @@ dictionaryReplacement type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; kappaMethod fluidThermo; - QrNbr none; - Qr Qr; + qrNbr none; + qr qr; kappa none; value uniform 300; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict index 6ae161489a78d4bb9c31f0a2871d7720ce3ca02b..3860f7dc3fcc24b619a2f3a19ac13d94d2d8e0ef 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict @@ -40,8 +40,8 @@ dictionaryReplacement type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; kappaMethod solidThermo; - QrNbr none; - Qr none; + qrNbr none; + qr none; kappa none; value uniform 300; } @@ -51,8 +51,8 @@ dictionaryReplacement type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; kappaMethod solidThermo; - QrNbr Qr; - Qr none; + qrNbr qr; + qr none; kappa none; value uniform 300; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict index 1a3e5fe65c845c29b3d24f04f445a2eadb64a591..080b5fba86def0d2b8101ace168d0f0e7217dfbb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict @@ -34,8 +34,8 @@ dictionaryReplacement type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; kappaMethod solidThermo; - QrNbr Qr; - Qr none; + qrNbr qr; + qr none; kappa none; value uniform 300; } @@ -45,8 +45,8 @@ dictionaryReplacement type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; kappaMethod solidThermo; - QrNbr none; - Qr none; + qrNbr none; + qr none; kappa none; value uniform 300; }