From 97c8e62fe46ec6864c3cd1fa4fbf7ff57ca4405c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 27 Jan 2025 09:01:30 +0100 Subject: [PATCH] COMP: disambiguate some reactingEuler/multiphaseSystem file names - poor naming (eg, 'exponential.[CH]') within the same set of library files means that the lnInclude/ contents are inconsistent or partly meaningless (related to #2520 and !542). Remedied by adding model-type qualifiers to the file names. --- .../{hyperbolic.C => hyperbolicBlendingMethod.C} | 2 +- .../{hyperbolic.H => hyperbolicBlendingMethod.H} | 6 +++--- .../reactingEuler/multiphaseSystem/Make/files | 8 ++++---- .../{exponential.C => exponentialNucleateFlux.C} | 2 +- .../{exponential.H => exponentialNucleateFlux.H} | 6 +++--- .../exponential/{exponential.C => exponentialBreakup.C} | 2 +- .../exponential/{exponential.H => exponentialBreakup.H} | 6 +++--- .../powerLaw/{powerLaw.C => powerLawBreakup.C} | 2 +- .../powerLaw/{powerLaw.H => powerLawBreakup.H} | 6 +++--- src/regionModels/pyrolysisModels/Make/files | 2 +- .../thermo/{thermo.C => thermoPyrolysis.C} | 2 +- .../thermo/{thermo.H => thermoPyrolysis.H} | 6 +++--- 12 files changed, 25 insertions(+), 25 deletions(-) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/{hyperbolic.C => hyperbolicBlendingMethod.C} (98%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/{hyperbolic.H => hyperbolicBlendingMethod.H} (96%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/{exponential.C => exponentialNucleateFlux.C} (98%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/{exponential.H => exponentialNucleateFlux.H} (97%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/{exponential.C => exponentialBreakup.C} (98%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/{exponential.H => exponentialBreakup.H} (95%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/{powerLaw.C => powerLawBreakup.C} (98%) rename src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/{powerLaw.H => powerLawBreakup.H} (95%) rename src/regionModels/pyrolysisModels/thermo/{thermo.C => thermoPyrolysis.C} (99%) rename src/regionModels/pyrolysisModels/thermo/{thermo.H => thermoPyrolysis.H} (97%) diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.C similarity index 98% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.C index a1c01f1106..3c38443943 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ -#include "hyperbolic.H" +#include "hyperbolicBlendingMethod.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.H similarity index 96% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.H index a78a2e18a0..b1a5cf10c0 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolicBlendingMethod.H @@ -29,12 +29,12 @@ Class Description SourceFiles - hyperbolic.C + hyperbolicBlendingMethod.C \*---------------------------------------------------------------------------*/ -#ifndef hyperbolic_H -#define hyperbolic_H +#ifndef Foam_blendingMethod_hyperbolic_H +#define Foam_blendingMethod_hyperbolic_H #include "blendingMethod.H" diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files index f7b6e41ee7..6021d90915 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files @@ -39,9 +39,9 @@ $(binaryBreakup)/powerLawUniformBinary/powerLawUniformBinary.C breakup = populationBalanceModel/breakupModels $(breakup)/breakupModel/breakupModel.C -$(breakup)/exponential/exponential.C +$(breakup)/exponential/exponentialBreakup.C $(breakup)/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C -$(breakup)/powerLaw/powerLaw.C +$(breakup)/powerLaw/powerLawBreakup.C daughterSize = populationBalanceModel/daughterSizeDistributionModels $(daughterSize)/daughterSizeDistributionModel/daughterSizeDistributionModel.C @@ -63,7 +63,7 @@ blending = BlendedInterfacialModel/blendingMethods $(blending)/blendingMethod/blendingMethod.C $(blending)/noBlending/noBlending.C $(blending)/linear/linearBlendingMethod.C -$(blending)/hyperbolic/hyperbolic.C +$(blending)/hyperbolic/hyperbolicBlendingMethod.C interfacialModels/wallDependentModel/wallDependentModel.C @@ -224,7 +224,7 @@ $(TDNBModels)/Shirai/Shirai.C nucleateFluxModels = $(wallBoilingSubModels)/nucleateFluxModels $(nucleateFluxModels)/nucleateFluxModel/nucleateFluxModel.C $(nucleateFluxModels)/Kutadeladze/Kutadeladze.C -$(nucleateFluxModels)/exponential/exponential.C +$(nucleateFluxModels)/exponential/exponentialNucleateFlux.C /* Turbulence */ turbulence/multiphaseCompressibleTurbulenceModels.C diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.C similarity index 98% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.C index 5ebf314228..d30cabbbe7 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ -#include "exponential.H" +#include "exponentialNucleateFlux.H" #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" #include "phasePairKey.H" diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.H similarity index 97% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.H index 18cec658b3..6ef425d2c3 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponentialNucleateFlux.H @@ -67,12 +67,12 @@ Usage \endtable SourceFiles - exponential.C + exponentialNucleateFlux.C \*---------------------------------------------------------------------------*/ -#ifndef exponential_H -#define exponential_H +#ifndef Foam_wallBoiling_nucleateFlux_exponential_H +#define Foam_wallBoiling_nucleateFlux_exponential_H #include "nucleateFluxModel.H" diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.C similarity index 98% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.C index 419c307a00..9726a895e1 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.C @@ -26,7 +26,7 @@ License \*---------------------------------------------------------------------------*/ -#include "exponential.H" +#include "exponentialBreakup.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.H similarity index 95% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.H index f7c8ddc72c..d726682f72 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponentialBreakup.H @@ -31,12 +31,12 @@ Description formulation implemented in the populationBalanceModel class. SourceFiles - exponential.C + exponentialBreakup.C \*---------------------------------------------------------------------------*/ -#ifndef exponential_H -#define exponential_H +#ifndef Foam_diameterModels_breakup_exponential_H +#define Foam_diameterModels_breakup_exponential_H #include "breakupModel.H" diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.C similarity index 98% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.C index 7d9f682d12..e629ca7a09 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.C @@ -26,7 +26,7 @@ License \*---------------------------------------------------------------------------*/ -#include "powerLaw.H" +#include "powerLawBreakup.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.H similarity index 95% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.H index 55e8b84977..248505520f 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLawBreakup.H @@ -31,12 +31,12 @@ Description formulation implemented in the populationBalanceModel class. SourceFiles - powerLaw.C + powerLawBreakup.C \*---------------------------------------------------------------------------*/ -#ifndef powerLaw_H -#define powerLaw_H +#ifndef Foam_diameterModels_breakup_powerLaw_H +#define Foam_diameterModels_breakup_powerLaw_H #include "breakupModel.H" diff --git a/src/regionModels/pyrolysisModels/Make/files b/src/regionModels/pyrolysisModels/Make/files index fcc3c42243..6624e61612 100644 --- a/src/regionModels/pyrolysisModels/Make/files +++ b/src/regionModels/pyrolysisModels/Make/files @@ -3,7 +3,7 @@ pyrolysisModel/pyrolysisModel.C pyrolysisModel/pyrolysisModelNew.C reactingOneDim/reactingOneDim.C noPyrolysis/noPyrolysis.C -thermo/thermo.C +thermo/thermoPyrolysis.C pyrolysisModel/pyrolysisModelCollection.C LIB = $(FOAM_LIBBIN)/libpyrolysisModels diff --git a/src/regionModels/pyrolysisModels/thermo/thermo.C b/src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.C similarity index 99% rename from src/regionModels/pyrolysisModels/thermo/thermo.C rename to src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.C index 9c3e235a87..a6f99a9982 100644 --- a/src/regionModels/pyrolysisModels/thermo/thermo.C +++ b/src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ -#include "thermo.H" +#include "thermoPyrolysis.H" #include "addToRunTimeSelectionTable.H" #include "volFields.H" #include "absorptionEmissionModel.H" diff --git a/src/regionModels/pyrolysisModels/thermo/thermo.H b/src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.H similarity index 97% rename from src/regionModels/pyrolysisModels/thermo/thermo.H rename to src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.H index 634064309d..802586050a 100644 --- a/src/regionModels/pyrolysisModels/thermo/thermo.H +++ b/src/regionModels/pyrolysisModels/thermo/thermoPyrolysis.H @@ -30,12 +30,12 @@ Description Pyrolysis model which solves only the energy equation in the region. SourceFiles - thermo.C + thermoPyrolysis.C \*---------------------------------------------------------------------------*/ -#ifndef regionModels_pyrolysisModels_thermo_H -#define regionModels_pyrolysisModels_thermo_H +#ifndef Foam_regionModels_pyrolysisModels_thermo_H +#define Foam_regionModels_pyrolysisModels_thermo_H #include "pyrolysisModel.H" #include "volFieldsFwd.H"