Use basicThermo::dictName rather than hard-coding "thermophysicalProperties"

2025-11-28 03:28:01 +00:00 · 2015-06-24 10:44:57 +01:00
parent b73fe0d4c3
commit 5e05479e2a
22 changed files with 34 additions and 33 deletions
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@ -181,7 +181,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()

    // Prandtl number reading consistent with rhoCentralFoam
    const dictionary& thermophysicalProperties =
-        db().lookupObject<IOdictionary>("thermophysicalProperties");
+        db().lookupObject<IOdictionary>(basicThermo::dictName);

    dimensionedScalar Pr
    (
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@ -68,7 +68,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
        (
            IOobject
            (
-                "thermophysicalProperties",
+                basicThermo::dictName,
                runTime.constant(),
                mesh
            ).headerOk()
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@ -137,7 +137,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
        )
    );

-    static word thermoName("thermophysicalProperties");
+    static word thermoName(basicThermo::dictName);

    if (db().foundObject<cmpTurbModelType>(turbName))
    {
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@ -123,10 +123,10 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa

                return turbModel.kappaEff(patchI);
            }
-            else if (mesh.foundObject<fluidThermo>("thermophysicalProperties"))
+            else if (mesh.foundObject<fluidThermo>(basicThermo::dictName))
            {
                const fluidThermo& thermo =
-                    mesh.lookupObject<fluidThermo>("thermophysicalProperties");
+                    mesh.lookupObject<fluidThermo>(basicThermo::dictName);

                return thermo.kappa(patchI);
            }
@ -147,7 +147,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
        case mtSolidThermo:
        {
            const solidThermo& thermo =
-                mesh.lookupObject<solidThermo>("thermophysicalProperties");
+                mesh.lookupObject<solidThermo>(basicThermo::dictName);

            return thermo.kappa(patchI);
            break;
@ -156,7 +156,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
        case mtDirectionalSolidThermo:
        {
            const solidThermo& thermo =
-                mesh.lookupObject<solidThermo>("thermophysicalProperties");
+                mesh.lookupObject<solidThermo>(basicThermo::dictName);

            const symmTensorField& alphaAni =
                patch_.lookupPatchField<volSymmTensorField, scalar>
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@ -98,7 +98,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
    // is obtained

    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    fieldNames_.setSize(1, thermo.he().name());

@ -115,7 +115,7 @@ void Foam::fv::fixedTemperatureConstraint::constrain
 )
 {
    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    switch (mode_)
    {
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.C
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.C
@ -63,7 +63,7 @@ Foam::fv::limitTemperature::limitTemperature
    // is obtained

    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    fieldNames_.setSize(1, thermo.he().name());

@ -76,7 +76,7 @@ Foam::fv::limitTemperature::limitTemperature
 void Foam::fv::limitTemperature::correct(volScalarField& he)
 {
    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    scalarField Tmin(cells_.size(), Tmin_);
    scalarField Tmax(cells_.size(), Tmax_);
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@ -188,7 +188,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
    // is obtained

    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    fieldNames_.setSize(1, thermo.he().name());

@ -210,7 +210,7 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
 )
 {
    const basicThermo& thermo =
-        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+        mesh_.lookupObject<basicThermo>(basicThermo::dictName);

    const surfaceScalarField Cpf(fvc::interpolate(thermo.Cp()));

--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@ -73,7 +73,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
        case mdThermo:
        {
            const basicThermo& thermo =
-                mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+                mesh_.lookupObject<basicThermo>(basicThermo::dictName);

            return thermo.Cp();
            break;
@ -228,7 +228,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
        case mdThermo:
        {
            const basicThermo& thermo =
-                mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+                mesh_.lookupObject<basicThermo>(basicThermo::dictName);

            fieldNames_[1] = thermo.he().name();
            break;
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@ -220,10 +220,10 @@ void Foam::fv::interRegionHeatTransferModel::addSup
    {
        if (he.dimensions() == dimEnergy/dimMass)
        {
-            if (mesh_.foundObject<basicThermo>("thermophysicalProperties"))
+            if (mesh_.foundObject<basicThermo>(basicThermo::dictName))
            {
                const basicThermo& thermo =
-                   mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+                   mesh_.lookupObject<basicThermo>(basicThermo::dictName);

                volScalarField htcByCpv(htc_/thermo.Cpv());

--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@ -109,7 +109,7 @@ void Foam::fv::variableHeatTransfer::calculateHtc()
        );

    const fluidThermo& nbrThermo =
-        nbrMesh.lookupObject<fluidThermo>("thermophysicalProperties");
+        nbrMesh.lookupObject<fluidThermo>(basicThermo::dictName);

    const volVectorField& UNbr =
        nbrMesh.lookupObject<volVectorField>(UNbrName_);
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@ -266,10 +266,10 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const

 Foam::tmp<Foam::volScalarField> Foam::forces::mu() const
 {
-    if (obr_.foundObject<fluidThermo>("thermophysicalProperties"))
+    if (obr_.foundObject<fluidThermo>(basicThermo::dictName))
    {
        const fluidThermo& thermo =
-             obr_.lookupObject<fluidThermo>("thermophysicalProperties");
+             obr_.lookupObject<fluidThermo>(basicThermo::dictName);

        return thermo.mu();
    }
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@ -81,7 +81,7 @@ void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
        (
            &regionCoupledPatch_.nbrMesh().lookupObject<basicThermo>
            (
-                "thermophysicalProperties"
+                basicThermo::dictName
            )
        );
    }
@ -92,7 +92,7 @@ void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
        (
            &this->db().lookupObject<basicThermo>
            (
-                "thermophysicalProperties"
+                basicThermo::dictName
            )
        );
    }
@ -121,7 +121,7 @@ kappa() const
            const basicThermo& thermo =
                this->db().lookupObject<basicThermo>
                (
-                    "thermophysicalProperties"
+                    basicThermo::dictName
                );

            return thermo.kappa(patch().index());
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@ -75,7 +75,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
        (
            IOobject
            (
-                IOobject::groupName("thermophysicalProperties", phaseName),
+                IOobject::groupName(basicThermo::dictName, phaseName),
                mesh.time().constant(),
                mesh,
                IOobject::MUST_READ_IF_MODIFIED,
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@ -60,7 +60,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
    speciesNames_(0),
    specieIndex_(label(0)),
    lookUpTablePtr_(),
-    thermo_(mesh.lookupObject<fluidThermo>("thermophysicalProperties")),
+    thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
    EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),
    Yj_(nSpecies_)
 {
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@ -91,7 +91,7 @@ greyMeanSolidAbsorptionEmission
 :
    absorptionEmissionModel(dict, mesh),
    coeffsDict_((dict.subDict(typeName + "Coeffs"))),
-    thermo_(mesh.lookupObject<solidThermo>("thermophysicalProperties")),
+    thermo_(mesh.lookupObject<solidThermo>(basicThermo::dictName)),
    speciesNames_(0),
    mixture_(dynamic_cast<const basicSpecieMixture&>(thermo_)),
    solidData_(mixture_.Y().size())
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@ -62,7 +62,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
        mesh.time().constant(),
        mesh
    ),
-    thermo_(mesh.lookupObject<fluidThermo>("thermophysicalProperties")),
+    thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
    Yj_(nSpecies_),
    totalWaveLength_(0)
 {
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@ -99,7 +99,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::mixtureFractionSoot
        coeffsDict_.lookupOrDefault<word>("mappingFieldName", "none")
    ),
    mapFieldMax_(1),
-    thermo_(mesh.lookupObject<fluidThermo>("thermophysicalProperties")),
+    thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
    mixture_(checkThermo(thermo_))
 {
    const Reaction<ThermoType>& reaction = mixture_.operator[](0);
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
@ -100,7 +100,7 @@ void Foam::fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs()

    const psiuReactionThermo& thermo = db().lookupObject<psiuReactionThermo>
    (
-        "thermophysicalProperties"
+        basicThermo::dictName
    );

    const label patchi = patch().index();
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
@ -99,7 +99,7 @@ void Foam::gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs()

    const psiuReactionThermo& thermo = db().lookupObject<psiuReactionThermo>
    (
-        "thermophysicalProperties"
+        basicThermo::dictName
    );

    const label patchi = patch().index();
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
@ -103,7 +103,7 @@ void Foam::mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs()

    const psiuReactionThermo& thermo = db().lookupObject<psiuReactionThermo>
    (
-        "thermophysicalProperties"
+        basicThermo::dictName
    );

    const label patchi = patch().index();
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
@ -76,7 +76,7 @@ New
    (
        IOobject
        (
-            "thermophysicalProperties",
+            basicThermo::dictName,
            mesh.time().constant(),
            mesh,
            IOobject::MUST_READ_IF_MODIFIED,
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@ -25,6 +25,7 @@ License

 #include "pyrolysisChemistryModel.H"
 #include "solidReaction.H"
+#include "basicThermo.H"

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

@ -141,7 +142,7 @@ pyrolysisChemistryModel
        dictionary thermoDict =
            mesh.lookupObject<dictionary>
            (
-                "thermophysicalProperties"
+                basicThermo::dictName
            ).subDict(pyrolisisGases_[gasI]);

        gasThermo_.set