From 5196e09fe21f1085b981e1ce160f815fd8ffad30 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 29 Jul 2022 14:38:05 +0100 Subject: [PATCH] Rationalised reactionThermo -> multicomponentThermo Now that the reaction system, chemistry and combustion models are completely separate from the multicomponent mixture thermophysical properties package that supports them it is inconsistent that thermo is named reactionThermo and the name multicomponentThermo better describes the purpose and functionality. --- .../solvers/combustion/XiFoam/Make/options | 4 +- .../combustion/XiFoam/PDRFoam/Make/options | 4 +- .../combustion/XiFoam/PDRFoam/PDRFoam.C | 4 +- .../XiFoam/PDRFoam/PDRFoamAutoRefine.C | 4 +- .../basicXiSubXiEq/basicXiSubXiEq.C | 4 +- .../basicXiSubXiEq/basicXiSubXiEq.H | 4 +- .../XiGModels/basicXiSubG/basicXiSubG.C | 4 +- .../XiGModels/basicXiSubG/basicXiSubG.H | 4 +- .../dragModels/PDRDragModel/PDRDragModel.H | 4 +- .../XiModels/XiEqModels/Gulder/Gulder.C | 4 +- .../XiModels/XiEqModels/Gulder/Gulder.H | 4 +- .../SCOPEBlendXiEq/SCOPEBlendXiEq.C | 4 +- .../SCOPEBlendXiEq/SCOPEBlendXiEq.H | 4 +- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 4 +- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H | 4 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.C | 4 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 12 +- .../XiEqModels/XiEqModel/XiEqModelNew.C | 4 +- .../instabilityXiEq/instabilityXiEq.C | 4 +- .../instabilityXiEq/instabilityXiEq.H | 4 +- .../PDRFoam/XiModels/XiGModels/KTS/KTS.C | 4 +- .../PDRFoam/XiModels/XiGModels/KTS/KTS.H | 4 +- .../XiModels/XiGModels/XiGModel/XiGModel.C | 4 +- .../XiModels/XiGModels/XiGModel/XiGModel.H | 12 +- .../XiModels/XiGModels/XiGModel/XiGModelNew.C | 4 +- .../XiGModels/instabilityG/instabilityG.C | 4 +- .../XiGModels/instabilityG/instabilityG.H | 4 +- .../XiFoam/PDRFoam/XiModels/XiModel/XiModel.C | 4 +- .../XiFoam/PDRFoam/XiModels/XiModel/XiModel.H | 12 +- .../PDRFoam/XiModels/XiModel/XiModelNew.C | 4 +- .../PDRFoam/XiModels/algebraic/algebraic.C | 4 +- .../PDRFoam/XiModels/algebraic/algebraic.H | 4 +- .../XiFoam/PDRFoam/XiModels/fixed/fixed.C | 4 +- .../XiFoam/PDRFoam/XiModels/fixed/fixed.H | 4 +- .../PDRFoam/XiModels/transport/transport.C | 4 +- .../PDRFoam/XiModels/transport/transport.H | 4 +- .../combustion/XiFoam/PDRFoam/createFields.H | 6 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 28 ++--- .../SCOPE/SCOPELaminarFlameSpeed.H | 6 +- .../solvers/combustion/XiFoam/XiFoam.C | 2 +- .../solvers/combustion/XiFoam/createFields.H | 6 +- .../solvers/combustion/chemFoam/Make/options | 2 +- .../solvers/combustion/chemFoam/chemFoam.C | 2 +- .../combustion/chemFoam/createFields.H | 7 +- .../combustion/chemFoam/thermoTypeFunctions.H | 6 +- .../combustion/reactingFoam/Make/options | 8 +- .../buoyantReactingFoam/Make/options | 8 +- .../buoyantReactingFoam/buoyantReactingFoam.C | 4 +- .../buoyantReactingFoam/createFields.H | 11 +- .../combustion/reactingFoam/createFields.H | 11 +- .../combustion/reactingFoam/reactingFoam.C | 4 +- .../chtMultiRegionFoam/Make/options | 8 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 4 +- .../fluid/createFluidFields.H | 8 +- .../fluid/setRegionFluidFields.H | 4 +- .../lagrangian/denseParticleFoam/Make/options | 2 +- .../lagrangian/rhoParticleFoam/Make/options | 2 +- .../compressibleInterFoam/Make/options | 2 +- .../interfacialCompositionModels/Make/options | 4 +- .../interfaceCompositionModel.C | 7 +- .../interfaceCompositionModel.H | 6 +- .../interfaceCompositionModelI.H | 6 +- .../Make/options | 2 +- ...allBoilingWallFunctionFvPatchScalarField.C | 2 +- .../multiphaseEulerFoam/Make/options | 2 +- .../multiphaseSystems/Make/options | 2 +- .../multiphaseReactions/Make/options | 4 +- .../phaseSystems/Make/options | 2 +- .../HeatTransferPhaseSystem.C | 34 +++--- .../ThermalPhaseChangePhaseSystem.C | 2 +- .../TwoResistanceHeatTransferPhaseSystem.C | 2 +- .../MovingPhaseModel/MovingPhaseModel.H | 6 +- .../phaseModel/phaseModel/phaseModels.C | 10 +- .../thermophysical/chemkinToFoam/Make/options | 2 +- .../dynamicCode/basicChemistryModel | 2 +- ...actionThermo => fluidMulticomponentThermo} | 6 +- ....C => fluidMulticomponentThermoTemplate.C} | 4 +- ...eactionThermo => psiuMulticomponentThermo} | 4 +- ...e.C => psiuMulticomponentThermoTemplate.C} | 4 +- ...ReactionThermo => rhoMulticomponentThermo} | 0 ...te.C => rhoMulticomponentThermoTemplate.C} | 0 .../runTimeSelectionToC/runTimeSelectionToC.C | 3 +- .../runTimeSelectionToC/runTimeSelectionToC.H | 4 +- src/ThermophysicalTransportModels/Allwmake | 4 +- .../fluidMulticomponentThermo/Make/files | 3 + .../Make/options | 4 +- ...ticomponentThermophysicalTransportModel.H} | 26 ++--- ...icomponentThermophysicalTransportModels.C} | 6 +- ...icomponentThermophysicalTransportModels.H} | 14 +-- .../fluidReactionThermo/Make/files | 3 - .../phaseFluidMulticomponentThermo/Make/files | 3 + .../Make/options | 4 +- ...ticomponentThermophysicalTransportModel.H} | 26 ++--- ...icomponentThermophysicalTransportModels.C} | 6 +- ...icomponentThermophysicalTransportModels.H} | 14 +-- .../phaseFluidReactionThermo/Make/files | 3 - src/combustionModels/EDC/EDC.C | 4 +- src/combustionModels/EDC/EDC.H | 4 +- src/combustionModels/FSD/FSD.C | 4 +- src/combustionModels/FSD/FSD.H | 4 +- src/combustionModels/Make/options | 2 +- src/combustionModels/PaSR/PaSR.C | 4 +- src/combustionModels/PaSR/PaSR.H | 4 +- .../combustionModel/combustionModel.C | 6 +- .../combustionModel/combustionModel.H | 16 +-- .../combustionModel/combustionModelI.H | 5 +- .../combustionModel/combustionModelNew.C | 4 +- src/combustionModels/diffusion/diffusion.C | 4 +- src/combustionModels/diffusion/diffusion.H | 4 +- .../infinitelyFastChemistry.C | 4 +- .../infinitelyFastChemistry.H | 4 +- src/combustionModels/laminar/laminar.C | 4 +- src/combustionModels/laminar/laminar.H | 4 +- .../noCombustion/noCombustion.C | 4 +- .../noCombustion/noCombustion.H | 4 +- .../singleStepCombustion.C | 4 +- .../singleStepCombustion.H | 4 +- .../zoneCombustion/zoneCombustion.C | 4 +- .../zoneCombustion/zoneCombustion.H | 4 +- src/lagrangian/parcel/Make/options | 4 +- src/lagrangian/parcelTurbulence/Make/options | 4 +- src/radiationModels/Make/options | 2 +- .../surfaceFilmModels/Make/options | 4 +- src/specieTransfer/Make/options | 4 +- ...ieTransferMassFractionFvPatchScalarField.C | 4 +- src/thermophysicalModels/Allwmake | 2 +- .../chemistryModel/Make/options | 4 +- .../basicChemistryModel/basicChemistryModel.C | 4 +- .../basicChemistryModel/basicChemistryModel.H | 14 +-- .../basicChemistryModelI.H | 4 +- .../basicChemistryModelNew.C | 4 +- .../chemistryModel/chemistryModel.C | 2 +- .../chemistryModel/chemistryModel.H | 2 +- .../EulerImplicit/EulerImplicit.C | 4 +- .../EulerImplicit/EulerImplicit.H | 4 +- .../chemistrySolver/chemistrySolver.C | 4 +- .../chemistrySolver/chemistrySolver.H | 6 +- .../noChemistrySolver/noChemistrySolver.C | 4 +- .../noChemistrySolver/noChemistrySolver.H | 4 +- .../chemistryModel/chemistrySolver/ode/ode.C | 4 +- .../chemistryModel/chemistrySolver/ode/ode.H | 4 +- .../odeChemistryModel/odeChemistryModel.C | 2 +- .../odeChemistryModel/odeChemistryModel.H | 2 +- .../laminarFlameSpeed/Gulders/Gulders.C | 19 ++-- .../laminarFlameSpeed/Gulders/Gulders.H | 6 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 22 ++-- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.H | 6 +- .../laminarFlameSpeed/Make/options | 2 +- .../RaviPetersen/RaviPetersen.C | 15 +-- .../RaviPetersen/RaviPetersen.H | 6 +- .../laminarFlameSpeed/constant/constant.C | 6 +- .../laminarFlameSpeed/constant/constant.H | 6 +- .../laminarFlameSpeed/laminarFlameSpeed.C | 8 +- .../laminarFlameSpeed/laminarFlameSpeed.H | 14 +-- .../laminarFlameSpeed/laminarFlameSpeedNew.C | 4 +- .../Make/files | 16 +-- .../Make/options | 0 .../fixedUnburntEnthalpyFvPatchScalarField.C | 13 ++- .../fixedUnburntEnthalpyFvPatchScalarField.H | 2 +- ...radientUnburntEnthalpyFvPatchScalarField.C | 13 ++- ...radientUnburntEnthalpyFvPatchScalarField.H | 2 +- .../mixedUnburntEnthalpyFvPatchScalarField.C | 13 ++- .../mixedUnburntEnthalpyFvPatchScalarField.H | 2 +- .../fluidMulticomponentThermo.C} | 19 ++-- .../fluidMulticomponentThermo.H} | 28 ++--- .../moleFractions/moleFractions.C | 2 +- .../moleFractions/moleFractions.H | 10 +- .../moleFractionsFunctionObjects.C | 14 +-- .../moleFractionsFunctionObjects.H | 22 ++-- .../makeMulticomponentThermo.H} | 66 ++++++----- .../mixtures/SpecieMixture/SpecieMixture.C | 2 +- .../mixtures/SpecieMixture/SpecieMixture.H | 0 .../basicCombustionMixture.C | 2 +- .../basicCombustionMixture.H | 2 +- .../basicCombustionMixtureI.H | 2 +- .../basicSpecieMixture/basicSpecieMixture.C | 0 .../basicSpecieMixture/basicSpecieMixture.H | 2 +- .../basicSpecieMixture/basicSpecieMixtureI.H | 2 +- .../coefficientMultiComponentMixture.C | 2 +- .../coefficientMultiComponentMixture.H | 2 +- .../coefficientWilkeMultiComponentMixture.C | 2 +- .../coefficientWilkeMultiComponentMixture.H | 2 +- .../mixtures/egrMixture/egrMixture.C | 2 +- .../mixtures/egrMixture/egrMixture.H | 2 +- .../homogeneousMixture/homogeneousMixture.C | 2 +- .../homogeneousMixture/homogeneousMixture.H | 2 +- .../inhomogeneousMixture.C | 2 +- .../inhomogeneousMixture.H | 2 +- .../multiComponentMixture.C | 2 +- .../multiComponentMixture.H | 2 +- .../singleComponentMixture.C | 2 +- .../singleComponentMixture.H | 2 +- .../valueMultiComponentMixture.C | 2 +- .../valueMultiComponentMixture.H | 2 +- .../veryInhomogeneousMixture.C | 2 +- .../veryInhomogeneousMixture.H | 2 +- .../psiMulticomponentThermo.C} | 18 +-- .../psiMulticomponentThermo.H} | 44 ++++---- .../psiMulticomponentThermos.C} | 28 +++-- .../heheuPsiThermo.C | 0 .../heheuPsiThermo.H | 8 +- .../psiuMulticomponentThermo.C} | 23 ++-- .../psiuMulticomponentThermo.H} | 36 +++--- .../psiuMulticomponentThermos.C} | 14 +-- .../rhoMulticomponentThermo.C} | 18 +-- .../rhoMulticomponentThermo.H} | 44 ++++---- .../rhoMulticomponentThermos.C} | 42 ++++--- .../solidThermo/Make/options | 4 +- .../IrreversibleReaction.C | 87 ++++++++------- .../IrreversibleReaction.H | 31 +++--- .../NonEquilibriumReversibleReaction.C | 91 +++++++++------- .../NonEquilibriumReversibleReaction.H | 28 ++--- .../reaction/Reactions/Reaction/Reaction.C | 103 +++++++++--------- .../reaction/Reactions/Reaction/Reaction.H | 57 +++++----- .../reaction/Reactions/Reaction/ReactionI.H | 14 +-- .../Reactions/ReactionProxy/ReactionProxy.C | 82 +++++++------- .../Reactions/ReactionProxy/ReactionProxy.H | 16 +-- .../ReversibleReaction/ReversibleReaction.C | 83 +++++++------- .../ReversibleReaction/ReversibleReaction.H | 31 +++--- 219 files changed, 1055 insertions(+), 977 deletions(-) rename etc/codeTemplates/dynamicCode/{fluidReactionThermo => fluidMulticomponentThermo} (93%) rename etc/codeTemplates/dynamicCode/{fluidReactionThermoTemplate.C => fluidMulticomponentThermoTemplate.C} (97%) rename etc/codeTemplates/dynamicCode/{psiuReactionThermo => psiuMulticomponentThermo} (94%) rename etc/codeTemplates/dynamicCode/{psiuReactionThermoTemplate.C => psiuMulticomponentThermoTemplate.C} (96%) rename etc/codeTemplates/dynamicCode/{rhoReactionThermo => rhoMulticomponentThermo} (100%) rename etc/codeTemplates/dynamicCode/{rhoReactionThermoTemplate.C => rhoMulticomponentThermoTemplate.C} (100%) create mode 100644 src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/files rename src/ThermophysicalTransportModels/{fluidReactionThermo => fluidMulticomponentThermo}/Make/options (83%) rename src/ThermophysicalTransportModels/{fluidReactionThermo/fluidReactionThermophysicalTransportModel.H => fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModel.H} (75%) rename src/ThermophysicalTransportModels/{fluidReactionThermo/fluidReactionThermophysicalTransportModels.C => fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.C} (95%) rename src/ThermophysicalTransportModels/{fluidReactionThermo/fluidReactionThermophysicalTransportModels.H => fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.H} (90%) delete mode 100644 src/ThermophysicalTransportModels/fluidReactionThermo/Make/files create mode 100644 src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/files rename src/ThermophysicalTransportModels/{phaseFluidReactionThermo => phaseFluidMulticomponentThermo}/Make/options (85%) rename src/ThermophysicalTransportModels/{phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H => phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModel.H} (75%) rename src/ThermophysicalTransportModels/{phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C => phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.C} (94%) rename src/ThermophysicalTransportModels/{phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H => phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.H} (90%) delete mode 100644 src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/Make/files (50%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/Make/options (100%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C (92%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C (92%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C (92%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H (98%) rename src/thermophysicalModels/{reactionThermo/fluidReactionThermo/fluidReactionThermo.C => multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.C} (73%) rename src/thermophysicalModels/{reactionThermo/fluidReactionThermo/fluidReactionThermo.H => multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H} (82%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/functionObjects/moleFractions/moleFractions.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/functionObjects/moleFractions/moleFractions.H (93%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/functionObjects/moleFractions/moleFractionsFunctionObjects.C (80%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/functionObjects/moleFractions/moleFractionsFunctionObjects.H (71%) rename src/thermophysicalModels/{reactionThermo/makeReactionThermo.H => multicomponentThermo/makeMulticomponentThermo.H} (63%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/SpecieMixture/SpecieMixture.C (99%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/SpecieMixture/SpecieMixture.H (100%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicCombustionMixture/basicCombustionMixture.C (97%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicCombustionMixture/basicCombustionMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicCombustionMixture/basicCombustionMixtureI.H (96%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicSpecieMixture/basicSpecieMixture.C (100%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicSpecieMixture/basicSpecieMixture.H (99%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/basicSpecieMixture/basicSpecieMixtureI.H (97%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C (97%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/egrMixture/egrMixture.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/egrMixture/egrMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/homogeneousMixture/homogeneousMixture.C (97%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/homogeneousMixture/homogeneousMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/inhomogeneousMixture/inhomogeneousMixture.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/inhomogeneousMixture/inhomogeneousMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/multiComponentMixture/multiComponentMixture.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/multiComponentMixture/multiComponentMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/singleComponentMixture/singleComponentMixture.C (96%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/singleComponentMixture/singleComponentMixture.H (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C (99%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H (99%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C (98%) rename src/thermophysicalModels/{reactionThermo => multicomponentThermo}/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H (99%) rename src/thermophysicalModels/{reactionThermo/psiReactionThermo/psiReactionThermo.C => multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.C} (75%) rename src/thermophysicalModels/{reactionThermo/psiReactionThermo/psiReactionThermo.H => multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H} (76%) rename src/thermophysicalModels/{reactionThermo/psiReactionThermo/psiReactionThermos.C => multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C} (77%) rename src/thermophysicalModels/{reactionThermo/psiuReactionThermo => multicomponentThermo/psiuMulticomponentThermo}/heheuPsiThermo.C (100%) rename src/thermophysicalModels/{reactionThermo/psiuReactionThermo => multicomponentThermo/psiuMulticomponentThermo}/heheuPsiThermo.H (96%) rename src/thermophysicalModels/{reactionThermo/psiuReactionThermo/psiuReactionThermo.C => multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C} (82%) rename src/thermophysicalModels/{reactionThermo/psiuReactionThermo/psiuReactionThermo.H => multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H} (87%) rename src/thermophysicalModels/{reactionThermo/psiuReactionThermo/psiuReactionThermos.C => multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C} (78%) rename src/thermophysicalModels/{reactionThermo/rhoReactionThermo/rhoReactionThermo.C => multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.C} (75%) rename src/thermophysicalModels/{reactionThermo/rhoReactionThermo/rhoReactionThermo.H => multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H} (76%) rename src/thermophysicalModels/{reactionThermo/rhoReactionThermo/rhoReactionThermos.C => multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C} (69%) diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index f83a0700a6..62f86b7118 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ @@ -18,7 +18,7 @@ EXE_LIBS = \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/Make/options b/applications/solvers/combustion/XiFoam/PDRFoam/Make/options index c73c92009b..8c9188d3cd 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/PDRFoam/Make/options @@ -24,7 +24,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -37,7 +37,7 @@ EXE_LIBS = \ -lXiIgnition \ -lmeshTools \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C index 130ff2facf..8eea5e0639 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C index 64f6716cc8..ba7c9af658 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 6d71702c92..033d182f01 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiEqModels Foam::XiEqModels::basicSubGrid::basicSubGrid ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H index 7acf07b484..763a6adca5 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ public: basicSubGrid ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C index 4ed94e6a7c..f1559f0a37 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiGModels Foam::XiGModels::basicSubGrid::basicSubGrid ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H index 60eae8d8d4..7626cd634d 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: basicSubGrid ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index e8d88100e1..bc9b2f8352 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ SourceFiles #define PDRDragModel_H #include "IOdictionary.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "multivariateSurfaceInterpolationScheme.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 82e5c41c65..acc8ecdd8e 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiEqModels Foam::XiEqModels::Gulder::Gulder ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H index bbdb1db8ac..4b516f03e9 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,7 +80,7 @@ public: Gulder ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C index 1883ad5ea3..ffbb89de44 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiEqModels Foam::XiEqModels::SCOPEBlend::SCOPEBlend ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H index e255fd0073..bcfe44d9ef 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ public: SCOPEBlend ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 3628011a64..1b2e413c80 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiEqModels Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H index 5e4e325561..5eb075127b 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ public: SCOPEXiEq ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index b30a409c6e..bfe08c94f7 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ namespace Foam Foam::XiEqModel::XiEqModel ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 2a855f81b2..c42b22965e 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,7 +42,7 @@ SourceFiles #define XiEqModel_H #include "IOdictionary.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "runTimeSelectionTables.H" @@ -66,7 +66,7 @@ protected: dictionary XiEqModelCoeffs_; //- Thermo - const psiuReactionThermo& thermo_; + const psiuMulticomponentThermo& thermo_; //- Turbulence const compressible::RASModel& turbulence_; @@ -90,7 +90,7 @@ public: dictionary, ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ), @@ -109,7 +109,7 @@ public: XiEqModel ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); @@ -124,7 +124,7 @@ public: static autoPtr New ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C index 7cc33b4c4d..5fa9d6ab5a 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License Foam::autoPtr Foam::XiEqModel::New ( const dictionary& propDict, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C index 626ae8bdb0..8f65297a3c 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiEqModels Foam::XiEqModels::instability::instability ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H index a547c90f7c..289a9eb05b 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ public: instability ( const dictionary& XiEqProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.C index c100ffbdf7..a94739255e 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiGModels Foam::XiGModels::KTS::KTS ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.H index b1bec94c7c..21f5afd386 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/KTS/KTS.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ public: KTS ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C index 7eb38bbb4e..d6b06a0fea 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ namespace Foam Foam::XiGModel::XiGModel ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index bb928e5a19..174be204c4 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #define XiGModel_H #include "IOdictionary.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "runTimeSelectionTables.H" @@ -61,7 +61,7 @@ protected: dictionary XiGModelCoeffs_; - const psiuReactionThermo& thermo_; + const psiuMulticomponentThermo& thermo_; const compressible::RASModel& turbulence_; const volScalarField& Su_; @@ -81,7 +81,7 @@ public: dictionary, ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ), @@ -100,7 +100,7 @@ public: XiGModel ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); @@ -115,7 +115,7 @@ public: static autoPtr New ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C index 179f56d762..92e297f242 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License Foam::autoPtr Foam::XiGModel::New ( const dictionary& propDict, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C index 2f784b9a05..7b0fca60ae 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiGModels Foam::XiGModels::instabilityG::instabilityG ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ) diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H index 38f7f6bb52..c35dd1b528 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ public: instabilityG ( const dictionary& XiGProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su ); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C index 26554da6a0..8729f7ca93 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ namespace Foam Foam::XiModel::XiModel ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.H index 3b53a27583..7bf007a54f 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,7 +91,7 @@ SourceFiles #define XiModel_H #include "IOdictionary.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "multivariateSurfaceInterpolationScheme.H" #include "fvcDiv.H" @@ -115,7 +115,7 @@ protected: dictionary XiModelCoeffs_; - const psiuReactionThermo& thermo_; + const psiuMulticomponentThermo& thermo_; const compressible::RASModel& turbulence_; const volScalarField& Su_; const volScalarField& rho_; @@ -141,7 +141,7 @@ public: dictionary, ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, @@ -166,7 +166,7 @@ public: XiModel ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, @@ -184,7 +184,7 @@ public: static autoPtr New ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModelNew.C index f6bb8297e0..367aeb07a9 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModelNew.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License Foam::autoPtr Foam::XiModel::New ( const dictionary& propDict, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.C index 9355721f6d..0b0f1dea27 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiModels Foam::XiModels::algebraic::algebraic ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.H index 704cbc3a03..e4efb978a0 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/algebraic/algebraic.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ public: algebraic ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.C index 4252895884..db91fdbf61 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace XiModels Foam::XiModels::fixed::fixed ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.H index e33087bf61..4639fd3be5 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/fixed/fixed.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ public: fixed ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.C index 23a13491e9..1721bd6ef9 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ namespace XiModels Foam::XiModels::transport::transport ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.H index 46ef1d578b..a1465b0832 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/transport/transport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ public: transport ( const dictionary& XiProperties, - const psiuReactionThermo& thermo, + const psiuMulticomponentThermo& thermo, const compressible::RASModel& turbulence, const volScalarField& Su, const volScalarField& rho, diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H index 4b40b201dd..b4b886be76 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H @@ -1,10 +1,10 @@ Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo +autoPtr pThermo ( - psiuReactionThermo::New(mesh) + psiuMulticomponentThermo::New(mesh) ); -psiuReactionThermo& thermo = pThermo(); +psiuMulticomponentThermo& thermo = pThermo(); thermo.validate(args.executable(), "ha", "ea"); basicCombustionMixture& composition = thermo.composition(); diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 0d14951d6d..f1bec668a0 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial Foam::laminarFlameSpeedModels::SCOPE::SCOPE ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : laminarFlameSpeed(dict, ct), @@ -368,9 +368,10 @@ Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::Ma Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::Ma() const { - if (psiuReactionThermo_.composition().contains("ft")) + if (psiuMulticomponentThermo_.composition().contains("ft")) { - const volScalarField& ft = psiuReactionThermo_.composition().Y("ft"); + const volScalarField& ft = + psiuMulticomponentThermo_.composition().Y("ft"); return Ma ( @@ -378,13 +379,13 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const ( "stoichiometricAirFuelMassRatio", dimless, - psiuReactionThermo_.properties() + psiuMulticomponentThermo_.properties() )*ft/(scalar(1) - ft) ); } else { - const fvMesh& mesh = psiuReactionThermo_.p().mesh(); + const fvMesh& mesh = psiuMulticomponentThermo_.p().mesh(); return tmp ( @@ -402,19 +403,20 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::operator()() const { - if (psiuReactionThermo_.composition().contains("ft")) + if (psiuMulticomponentThermo_.composition().contains("ft")) { - const volScalarField& ft = psiuReactionThermo_.composition().Y("ft"); + const volScalarField& ft = + psiuMulticomponentThermo_.composition().Y("ft"); return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), dimensionedScalar ( "stoichiometricAirFuelMassRatio", dimless, - psiuReactionThermo_.properties() + psiuMulticomponentThermo_.properties() )*ft/(scalar(1) - ft) ); } @@ -422,8 +424,8 @@ Foam::laminarFlameSpeedModels::SCOPE::operator()() const { return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), equivalenceRatio_ ); } diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H index 37f022ca60..a25ac04fd7 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,11 +181,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo SCOPE ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index d1c0d46e5e..fa2e3fbb6c 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -50,7 +50,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 05799e004d..b2c42b26b5 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -1,10 +1,10 @@ Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo +autoPtr pThermo ( - psiuReactionThermo::New(mesh) + psiuMulticomponentThermo::New(mesh) ); -psiuReactionThermo& thermo = pThermo(); +psiuMulticomponentThermo& thermo = pThermo(); thermo.validate(args.executable(), "ha", "ea"); basicCombustionMixture& composition = thermo.composition(); diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index 48bf7190c3..0d449d26a7 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude\ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C index 1a7107f19d..5633875c91 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "zeroDimensionalFvMesh.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" #include "basicChemistryModel.H" #include "multiComponentMixture.H" #include "chemistrySolver.H" diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index 437c66fed6..0acb35c0c4 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -24,8 +24,11 @@ #include "createBaseFields.H" Info<< "Reading thermophysical properties\n" << endl; - autoPtr pThermo(fluidReactionThermo::New(mesh)); - fluidReactionThermo& thermo = pThermo(); + autoPtr pThermo + ( + fluidMulticomponentThermo::New(mesh) + ); + fluidMulticomponentThermo& thermo = pThermo(); thermo.validate(args.executable(), "h"); autoPtr pChemistry(basicChemistryModel::New(thermo)); diff --git a/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H b/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H index b4a01da6cb..16865bd3bb 100644 --- a/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H +++ b/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -scalarList W(const fluidReactionThermo& thermo) +scalarList W(const fluidMulticomponentThermo& thermo) { const basicSpecieMixture& composition = thermo.composition(); @@ -40,7 +40,7 @@ scalarList W(const fluidReactionThermo& thermo) scalar h0 ( - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const scalarList& Y, const scalar p, const scalar T diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index ab9720a89f..6d9c65469a 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -2,10 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -21,11 +21,11 @@ EXE_LIBS = \ -lchemistryModel \ -lODE \ -lcombustionModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ + -lfluidMulticomponentThermophysicalTransportModels \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options index c54cfc8294..8cda90cc2b 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options @@ -4,10 +4,10 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -21,8 +21,8 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ - -lreactionThermophysicalModels \ + -lfluidMulticomponentThermophysicalTransportModels \ + -lmulticomponentThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ -lchemistryModel \ diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C index 703a62df96..9ee4fcbee0 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C @@ -35,10 +35,10 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" #include "combustionModel.H" #include "compressibleMomentumTransportModels.H" -#include "fluidReactionThermophysicalTransportModel.H" +#include "fluidMulticomponentThermophysicalTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" #include "pressureReference.H" diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H index 03d1242559..30557a8307 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H @@ -1,8 +1,11 @@ #include "createRDeltaT.H" Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(fluidReactionThermo::New(mesh)); -fluidReactionThermo& thermo = pThermo(); +autoPtr pThermo +( + fluidMulticomponentThermo::New(mesh) +); +fluidMulticomponentThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); @@ -54,10 +57,10 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr +autoPtr thermophysicalTransport ( - fluidReactionThermophysicalTransportModel::New + fluidMulticomponentThermophysicalTransportModel::New ( turbulence(), thermo diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index 550218921d..a9650eb2e7 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -1,8 +1,11 @@ #include "createRDeltaT.H" Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(fluidReactionThermo::New(mesh)); -fluidReactionThermo& thermo = pThermo(); +autoPtr pThermo +( + fluidMulticomponentThermo::New(mesh) +); +fluidMulticomponentThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); @@ -56,10 +59,10 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr +autoPtr thermophysicalTransport ( - fluidReactionThermophysicalTransportModel::New + fluidMulticomponentThermophysicalTransportModel::New ( turbulence(), thermo diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index e3276e0c17..55e5560a77 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -34,10 +34,10 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" #include "combustionModel.H" #include "compressibleMomentumTransportModels.H" -#include "fluidReactionThermophysicalTransportModel.H" +#include "fluidMulticomponentThermophysicalTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" #include "pressureReference.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index a42d3e7cd1..00c9e2a879 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -12,7 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -20,14 +20,14 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lsolidThermo \ -lchemistryModel \ -lODE \ @@ -35,7 +35,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ + -lfluidMulticomponentThermophysicalTransportModels \ -lmeshTools \ -lfiniteVolume \ -lfvModels \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 1077cfb383..0bc2102d4c 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -33,8 +33,8 @@ Description #include "fvCFD.H" #include "compressibleMomentumTransportModels.H" -#include "fluidReactionThermophysicalTransportModel.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermophysicalTransportModel.H" +#include "fluidMulticomponentThermo.H" #include "combustionModel.H" #include "fixedGradientFvPatchFields.H" #include "regionProperties.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index a81580cee8..f4377038e9 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -1,5 +1,5 @@ // Initialise fluid field pointer lists -PtrList thermoFluid(fluidRegions.size()); +PtrList thermoFluid(fluidRegions.size()); PtrList rhoFluid(fluidRegions.size()); PtrList UFluid(fluidRegions.size()); PtrList phiFluid(fluidRegions.size()); @@ -10,7 +10,7 @@ PtrList ghFluid(fluidRegions.size()); PtrList ghfFluid(fluidRegions.size()); PtrList turbulenceFluid(fluidRegions.size()); -PtrList +PtrList thermophysicalTransportFluid(fluidRegions.size()); PtrList reactionFluid(fluidRegions.size()); PtrList p_rghFluid(fluidRegions.size()); @@ -32,7 +32,7 @@ forAll(fluidRegions, i) << fluidRegions[i].name() << nl << endl; Info<< " Adding to thermoFluid\n" << endl; - thermoFluid.set(i, fluidReactionThermo::New(fluidRegions[i]).ptr()); + thermoFluid.set(i, fluidMulticomponentThermo::New(fluidRegions[i]).ptr()); Info<< " Adding to rhoFluid\n" << endl; rhoFluid.set @@ -183,7 +183,7 @@ forAll(fluidRegions, i) thermophysicalTransportFluid.set ( i, - fluidReactionThermophysicalTransportModel::New + fluidMulticomponentThermophysicalTransportModel::New ( turbulenceFluid[i], thermoFluid[i] diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 7a2d5ff48c..61ea776a91 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -2,7 +2,7 @@ combustionModel& reaction = reactionFluid[i]; - fluidReactionThermo& thermo = thermoFluid[i]; + fluidMulticomponentThermo& thermo = thermoFluid[i]; thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); @@ -13,7 +13,7 @@ surfaceScalarField& phi = phiFluid[i]; compressible::momentumTransportModel& turbulence = turbulenceFluid[i]; - fluidReactionThermophysicalTransportModel& thermophysicalTransport = + fluidMulticomponentThermophysicalTransportModel& thermophysicalTransport = thermophysicalTransportFluid[i]; volScalarField& K = KFluid[i]; diff --git a/applications/solvers/lagrangian/denseParticleFoam/Make/options b/applications/solvers/lagrangian/denseParticleFoam/Make/options index 32056a1595..41dc1c5010 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/Make/options +++ b/applications/solvers/lagrangian/denseParticleFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options index 6a2b3cdd27..66818faab7 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/Make/options +++ b/applications/solvers/lagrangian/rhoParticleFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 255b9612ed..795c199081 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options index 8c7038fa12..c9e25ee486 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ @@ -14,5 +14,5 @@ EXE_INC = \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lspecie diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C index 175f4b2154..3b2ce82ef2 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C @@ -26,7 +26,7 @@ License #include "interfaceCompositionModel.H" #include "phaseModel.H" #include "phaseSystem.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -52,7 +52,10 @@ Foam::interfaceCompositionModel::interfaceCompositionModel ), species_(dict.lookup("species")), Le_("Le", dimless, dict), - thermo_(refCast(interface_.phase().thermo())), + thermo_ + ( + refCast(interface_.phase().thermo()) + ), otherThermo_(interface_.otherPhase().thermo()) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H index bea7dd412e..36be57c8bb 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H @@ -42,7 +42,7 @@ SourceFiles #include "volFields.H" #include "dictionary.H" #include "hashedWordList.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" #include "runTimeSelectionTables.H" #include "sidedPhaseInterface.H" #include "SidedInterfacialModel.H" @@ -68,7 +68,7 @@ class interfaceCompositionModel const dimensionedScalar Le_; //- Multi-component thermo model for this side of the interface - const rhoReactionThermo& thermo_; + const rhoMulticomponentThermo& thermo_; //- General thermo model for the other side of the interface const rhoThermo& otherThermo_; @@ -130,7 +130,7 @@ public: inline const hashedWordList& species() const; //- Return the thermo - inline const rhoReactionThermo& thermo() const; + inline const rhoMulticomponentThermo& thermo() const; //- Return the composition inline const basicSpecieMixture& composition() const; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H index c5a9e7902f..a3a1d2382d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H @@ -40,7 +40,7 @@ const Foam::hashedWordList& Foam::interfaceCompositionModel::species() const } -const Foam::rhoReactionThermo& +const Foam::rhoMulticomponentThermo& Foam::interfaceCompositionModel::thermo() const { return thermo_; @@ -62,14 +62,14 @@ const Foam::rhoThermo& Foam::interfaceCompositionModel::otherThermo() const bool Foam::interfaceCompositionModel::otherHasComposition() const { - return isA(otherThermo_); + return isA(otherThermo_); } const Foam::basicSpecieMixture& Foam::interfaceCompositionModel::otherComposition() const { - return refCast(otherThermo_).composition(); + return refCast(otherThermo_).composition(); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options index a62b845c2e..f2bccf176f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 86324df617..a322f66efb 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -29,7 +29,7 @@ License #include "compressibleMomentumTransportModels.H" #include "phaseCompressibleMomentumTransportModel.H" #include "saturationModel.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" #include "addToRunTimeSelectionTable.H" using namespace Foam::constant::mathematical; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options index 3daee21182..a1962c3743 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options @@ -21,7 +21,7 @@ EXE_LIBS = \ -lmultiphaseReactions \ -lmultiphaseProperties \ -lphaseFluidThermophysicalTransportModels \ - -lphaseFluidReactionThermophysicalTransportModels \ + -lphaseFluidMulticomponentThermophysicalTransportModels \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options index 7dd13b149e..653bd83701 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options index 0e45b89ad9..c1e55fdf2c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -11,7 +11,7 @@ EXE_INC = \ LIB_LIBS = \ -lspecie \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lchemistryModel \ -lfiniteVolume \ -lphaseSystem diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options index 7f9c1221b2..0dcc4d799c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/multiphaseModels/multiphaseProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C index 8186e5a303..f9fe20d8b5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C @@ -25,7 +25,7 @@ License #include "HeatTransferPhaseSystem.H" #include "fvmSup.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -92,12 +92,12 @@ void Foam::HeatTransferPhaseSystem::addDmidtHefs const rhoThermo& thermo1 = phase1.thermo(); const rhoThermo& thermo2 = phase2.thermo(); const basicSpecieMixture* compositionPtr1 = - isA(thermo1) - ? &refCast(thermo1).composition() + isA(thermo1) + ? &refCast(thermo1).composition() : static_cast(nullptr); const basicSpecieMixture* compositionPtr2 = - isA(thermo2) - ? &refCast(thermo2).composition() + isA(thermo2) + ? &refCast(thermo2).composition() : static_cast(nullptr); const volScalarField& he1 = thermo1.he(); const volScalarField& he2 = thermo2.he(); @@ -308,12 +308,12 @@ void Foam::HeatTransferPhaseSystem::addDmidtHefsWithoutL const rhoThermo& thermo1 = phase1.thermo(); const rhoThermo& thermo2 = phase2.thermo(); const basicSpecieMixture* compositionPtr1 = - isA(thermo1) - ? &refCast(thermo1).composition() + isA(thermo1) + ? &refCast(thermo1).composition() : static_cast(nullptr); const basicSpecieMixture* compositionPtr2 = - isA(thermo2) - ? &refCast(thermo2).composition() + isA(thermo2) + ? &refCast(thermo2).composition() : static_cast(nullptr); const volScalarField& he1 = thermo1.he(); const volScalarField& he2 = thermo2.he(); @@ -598,12 +598,12 @@ Foam::HeatTransferPhaseSystem::Li const rhoThermo& thermo1 = interface.phase1().thermo(); const rhoThermo& thermo2 = interface.phase2().thermo(); const basicSpecieMixture* compositionPtr1 = - isA(thermo1) - ? &refCast(thermo1).composition() + isA(thermo1) + ? &refCast(thermo1).composition() : static_cast(nullptr); const basicSpecieMixture* compositionPtr2 = - isA(thermo2) - ? &refCast(thermo2).composition() + isA(thermo2) + ? &refCast(thermo2).composition() : static_cast(nullptr); const label speciei1 = compositionPtr1 ? compositionPtr1->species()[specie] : -1; @@ -671,12 +671,12 @@ Foam::HeatTransferPhaseSystem::Li const rhoThermo& thermo1 = interface.phase1().thermo(); const rhoThermo& thermo2 = interface.phase2().thermo(); const basicSpecieMixture* compositionPtr1 = - isA(thermo1) - ? &refCast(thermo1).composition() + isA(thermo1) + ? &refCast(thermo1).composition() : static_cast(nullptr); const basicSpecieMixture* compositionPtr2 = - isA(thermo2) - ? &refCast(thermo2).composition() + isA(thermo2) + ? &refCast(thermo2).composition() : static_cast(nullptr); const label speciei1 = compositionPtr1 ? compositionPtr1->species()[specie] : -1; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C index 887cc5134b..2abcf2510e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C @@ -28,7 +28,7 @@ License #include "alphatPhaseChangeWallFunctionFvPatchScalarField.H" #include "fvcVolumeIntegrate.H" #include "fvmSup.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C index 4e537c3036..d4ff8e8df9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C @@ -26,7 +26,7 @@ License #include "TwoResistanceHeatTransferPhaseSystem.H" #include "heatTransferModel.H" #include "fvmSup.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index f91818bd9c..9551abfa08 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,9 +67,9 @@ struct MovingPhaseModelTransportThermoModel }; template<> -struct MovingPhaseModelTransportThermoModel +struct MovingPhaseModelTransportThermoModel { - typedef fluidReactionThermo type; + typedef fluidMulticomponentThermo type; }; /*---------------------------------------------------------------------------*\ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C index 2bfdc91703..58141b5b85 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "addToRunTimeSelectionTable.H" #include "rhoThermo.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" #include "combustionModel.H" @@ -150,7 +150,7 @@ namespace Foam < MovingPhaseModel < - ThermoPhaseModel + ThermoPhaseModel > > > @@ -174,7 +174,7 @@ namespace Foam < MovingPhaseModel < - ThermoPhaseModel + ThermoPhaseModel > > > @@ -198,7 +198,7 @@ namespace Foam < MovingPhaseModel < - ThermoPhaseModel + ThermoPhaseModel > > > diff --git a/applications/utilities/thermophysical/chemkinToFoam/Make/options b/applications/utilities/thermophysical/chemkinToFoam/Make/options index caa12b322a..8178fac902 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/Make/options +++ b/applications/utilities/thermophysical/chemkinToFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -IchemkinReader \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude EXE_LIBS = \ -lchemistryModel diff --git a/etc/codeTemplates/dynamicCode/basicChemistryModel b/etc/codeTemplates/dynamicCode/basicChemistryModel index 5ac1bd243d..573e4e9c18 100644 --- a/etc/codeTemplates/dynamicCode/basicChemistryModel +++ b/etc/codeTemplates/dynamicCode/basicChemistryModel @@ -36,7 +36,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/etc/codeTemplates/dynamicCode/fluidReactionThermo b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo similarity index 93% rename from etc/codeTemplates/dynamicCode/fluidReactionThermo rename to etc/codeTemplates/dynamicCode/fluidMulticomponentThermo index df12a45496..cc37d7f013 100644 --- a/etc/codeTemplates/dynamicCode/fluidReactionThermo +++ b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo @@ -9,7 +9,7 @@ FoamFile { format ascii; class dictionary; - object fluidReactionThermo; + object fluidMulticomponentThermo; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,8 +21,8 @@ type typeBase ( - hePsiThermo psiReactionThermo - heRhoThermo rhoReactionThermo + hePsiThermo psiMulticomponentThermo + heRhoThermo rhoMulticomponentThermo ); energy diff --git a/etc/codeTemplates/dynamicCode/fluidReactionThermoTemplate.C b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C similarity index 97% rename from etc/codeTemplates/dynamicCode/fluidReactionThermoTemplate.C rename to etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C index a3f5156f6d..dbdb739910 100644 --- a/etc/codeTemplates/dynamicCode/fluidReactionThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "forThermo.H" -#include "makeReactionThermo.H" +#include "makeMulticomponentThermo.H" #include "${specie}.H" @@ -82,7 +82,7 @@ namespace Foam ${thermo}Thermo, ${equationOfState}, ${specie}, - makeReactionThermo, + makeMulticomponentThermo, ${typeBase}, ${type}, ${mixture} diff --git a/etc/codeTemplates/dynamicCode/psiuReactionThermo b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo similarity index 94% rename from etc/codeTemplates/dynamicCode/psiuReactionThermo rename to etc/codeTemplates/dynamicCode/psiuMulticomponentThermo index 0319806631..7b11275f7a 100644 --- a/etc/codeTemplates/dynamicCode/psiuReactionThermo +++ b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo @@ -9,7 +9,7 @@ FoamFile { format ascii; class dictionary; - object psiuReactionThermo; + object psiuMulticomponentThermo; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,7 +20,7 @@ type typeBase ( - heheuPsiThermo psiuReactionThermo + heheuPsiThermo psiuMulticomponentThermo ); energy diff --git a/etc/codeTemplates/dynamicCode/psiuReactionThermoTemplate.C b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C similarity index 96% rename from etc/codeTemplates/dynamicCode/psiuReactionThermoTemplate.C rename to etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C index 7133ae4fec..054d000867 100644 --- a/etc/codeTemplates/dynamicCode/psiuReactionThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "forThermo.H" -#include "makeReactionThermo.H" +#include "makeMulticomponentThermo.H" #include "${specie}.H" @@ -82,7 +82,7 @@ namespace Foam ${thermo}Thermo, ${equationOfState}, ${specie}, - makePsiuReactionThermo, + makePsiuMulticomponentThermo, ${mixture} ); } diff --git a/etc/codeTemplates/dynamicCode/rhoReactionThermo b/etc/codeTemplates/dynamicCode/rhoMulticomponentThermo similarity index 100% rename from etc/codeTemplates/dynamicCode/rhoReactionThermo rename to etc/codeTemplates/dynamicCode/rhoMulticomponentThermo diff --git a/etc/codeTemplates/dynamicCode/rhoReactionThermoTemplate.C b/etc/codeTemplates/dynamicCode/rhoMulticomponentThermoTemplate.C similarity index 100% rename from etc/codeTemplates/dynamicCode/rhoReactionThermoTemplate.C rename to etc/codeTemplates/dynamicCode/rhoMulticomponentThermoTemplate.C diff --git a/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.C b/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.C index 48e61b48bd..9f7dad1e7f 100644 --- a/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.C +++ b/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.C @@ -33,8 +33,7 @@ Description bool Foam::debug::enableRunTimeSelectionToC = false; -Foam::HashTable> - Foam::debug::runTimeSelectionToC; +Foam::debug::runTimeSelectionToCType Foam::debug::runTimeSelectionToC; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.H b/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.H index 61aea4a347..d66839bff3 100644 --- a/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.H +++ b/src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.H @@ -47,8 +47,10 @@ namespace debug //- Switch to enable runTimeSelectionToC collection and caching extern bool enableRunTimeSelectionToC; + typedef HashTable> runTimeSelectionToCType; + //- Run-time selectable objects - extern HashTable> runTimeSelectionToC; + extern runTimeSelectionToCType runTimeSelectionToC; } // End namespace debug } // End namespace Foam diff --git a/src/ThermophysicalTransportModels/Allwmake b/src/ThermophysicalTransportModels/Allwmake index 897ba2040d..300b88abca 100755 --- a/src/ThermophysicalTransportModels/Allwmake +++ b/src/ThermophysicalTransportModels/Allwmake @@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments wmake $targetType -wmake $targetType fluidReactionThermo +wmake $targetType fluidMulticomponentThermo wmake $targetType phaseFluidThermo -wmake $targetType phaseFluidReactionThermo +wmake $targetType phaseFluidMulticomponentThermo #------------------------------------------------------------------------------ diff --git a/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/files b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/files new file mode 100644 index 0000000000..be2cc05998 --- /dev/null +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/files @@ -0,0 +1,3 @@ +fluidMulticomponentThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libfluidMulticomponentThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options similarity index 83% rename from src/ThermophysicalTransportModels/fluidReactionThermo/Make/options rename to src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options index 68a8e1b029..2352733da1 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options @@ -5,13 +5,13 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ -lspecie \ -lfiniteVolume \ diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModel.H similarity index 75% rename from src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModel.H index 0e5d2b66ce..3eaa756a9e 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,14 +35,14 @@ Typedef Description Typedefs for laminar, RAS and LES thermophysical transport models - for fluidReactionThermo flow. + for fluidMulticomponentThermo flow. \*---------------------------------------------------------------------------*/ -#ifndef fluidReactionThermophysicalTransportModel_H -#define fluidReactionThermophysicalTransportModel_H +#ifndef fluidMulticomponentThermophysicalTransportModel_H +#define fluidMulticomponentThermophysicalTransportModel_H -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" #include "laminarThermophysicalTransportModel.H" #include "RASThermophysicalTransportModel.H" #include "LESThermophysicalTransportModel.H" @@ -55,23 +55,23 @@ namespace Foam typedef ThermophysicalTransportModel < compressible::momentumTransportModel, - fluidReactionThermo - > fluidReactionThermophysicalTransportModel; + fluidMulticomponentThermo + > fluidMulticomponentThermophysicalTransportModel; typedef laminarThermophysicalTransportModel < - fluidReactionThermophysicalTransportModel - > laminarFluidReactionThermophysicalTransportModel; + fluidMulticomponentThermophysicalTransportModel + > laminarFluidMulticomponentThermophysicalTransportModel; typedef RASThermophysicalTransportModel < - fluidReactionThermophysicalTransportModel - > RASFluidReactionThermophysicalTransportModel; + fluidMulticomponentThermophysicalTransportModel + > RASFluidMulticomponentThermophysicalTransportModel; typedef LESThermophysicalTransportModel < - fluidReactionThermophysicalTransportModel - > LESFluidReactionThermophysicalTransportModel; + fluidMulticomponentThermophysicalTransportModel + > LESFluidMulticomponentThermophysicalTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.C similarity index 95% rename from src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C rename to src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.C index 1e467e8f5a..9c18904cf2 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidReactionThermophysicalTransportModels.H" +#include "fluidMulticomponentThermophysicalTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,7 +31,7 @@ makeThermophysicalTransportModels ( ThermophysicalTransportModel, compressibleMomentumTransportModel, - fluidReactionThermo + fluidMulticomponentThermo ); diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.H similarity index 90% rename from src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H rename to src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.H index 776067cd3a..c15f4edda5 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidReactionThermophysicalTransportModel.H" +#include "fluidMulticomponentThermophysicalTransportModel.H" #include "compressibleMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" @@ -33,7 +33,7 @@ makeThermophysicalTransportModelTypes ( ThermophysicalTransportModel, compressibleMomentumTransportModel, - fluidReactionThermo + fluidMulticomponentThermo ); @@ -42,7 +42,7 @@ makeThermophysicalTransportModelTypes ( \ ThermophysicalTransportModel, \ compressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ laminar, \ Type \ ) @@ -52,7 +52,7 @@ makeThermophysicalTransportModelTypes ( \ ThermophysicalTransportModel, \ compressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ SType, \ Type \ ) @@ -62,7 +62,7 @@ makeThermophysicalTransportModelTypes ( \ ThermophysicalTransportModel, \ compressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ RAS, \ Type \ ) @@ -72,7 +72,7 @@ makeThermophysicalTransportModelTypes ( \ ThermophysicalTransportModel, \ compressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ LES, \ Type \ ) diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/files b/src/ThermophysicalTransportModels/fluidReactionThermo/Make/files deleted file mode 100644 index 35e723777f..0000000000 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -fluidReactionThermophysicalTransportModels.C - -LIB = $(FOAM_LIBBIN)/libfluidReactionThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/files b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/files new file mode 100644 index 0000000000..240e3737aa --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/files @@ -0,0 +1,3 @@ +phaseFluidMulticomponentThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libphaseFluidMulticomponentThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options similarity index 85% rename from src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options rename to src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options index cd449dd9d0..e8d349e1ac 100644 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options @@ -6,13 +6,13 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ -lspecie \ -lfiniteVolume \ diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModel.H similarity index 75% rename from src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModel.H index d3773854aa..f11bba6475 100644 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,14 +35,14 @@ Typedef Description Typedefs for laminar, RAS and LES thermophysical transport models - for fluidReactionThermo flow. + for fluidMulticomponentThermo flow. \*---------------------------------------------------------------------------*/ -#ifndef phaseFluidReactionThermophysicalTransportModel_H -#define phaseFluidReactionThermophysicalTransportModel_H +#ifndef phaseFluidMulticomponentThermophysicalTransportModel_H +#define phaseFluidMulticomponentThermophysicalTransportModel_H -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" #include "PhaseThermophysicalTransportModel.H" #include "laminarThermophysicalTransportModel.H" #include "RASThermophysicalTransportModel.H" @@ -56,23 +56,23 @@ namespace Foam typedef PhaseThermophysicalTransportModel < phaseCompressible::momentumTransportModel, - fluidReactionThermo - > phaseFluidReactionThermophysicalTransportModel; + fluidMulticomponentThermo + > phaseFluidMulticomponentThermophysicalTransportModel; typedef laminarThermophysicalTransportModel < - phaseFluidReactionThermophysicalTransportModel - > laminarPhaseFluidReactionThermophysicalTransportModel; + phaseFluidMulticomponentThermophysicalTransportModel + > laminarPhaseFluidMulticomponentThermophysicalTransportModel; typedef RASThermophysicalTransportModel < - phaseFluidReactionThermophysicalTransportModel - > RASPhaseFluidReactionThermophysicalTransportModel; + phaseFluidMulticomponentThermophysicalTransportModel + > RASPhaseFluidMulticomponentThermophysicalTransportModel; typedef LESThermophysicalTransportModel < - phaseFluidReactionThermophysicalTransportModel - > LESPhaseFluidReactionThermophysicalTransportModel; + phaseFluidMulticomponentThermophysicalTransportModel + > LESPhaseFluidMulticomponentThermophysicalTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.C similarity index 94% rename from src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C rename to src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.C index 883390743d..6f89fa32a9 100644 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseFluidReactionThermophysicalTransportModels.H" +#include "phaseFluidMulticomponentThermophysicalTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,7 +31,7 @@ makeThermophysicalTransportModels ( PhaseThermophysicalTransportModel, phaseCompressibleMomentumTransportModel, - fluidReactionThermo + fluidMulticomponentThermo ); diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.H similarity index 90% rename from src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H rename to src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.H index 68e0f765ab..efd5d5c67d 100644 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseFluidReactionThermophysicalTransportModel.H" +#include "phaseFluidMulticomponentThermophysicalTransportModel.H" #include "phaseCompressibleMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" @@ -34,7 +34,7 @@ makeThermophysicalTransportModelTypes ( PhaseThermophysicalTransportModel, phaseCompressibleMomentumTransportModel, - fluidReactionThermo + fluidMulticomponentThermo ); @@ -43,7 +43,7 @@ makeThermophysicalTransportModelTypes ( \ PhaseThermophysicalTransportModel, \ phaseCompressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ laminar, \ Type \ ) @@ -53,7 +53,7 @@ makeThermophysicalTransportModelTypes ( \ PhaseThermophysicalTransportModel, \ phaseCompressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ SType, \ Type \ ) @@ -63,7 +63,7 @@ makeThermophysicalTransportModelTypes ( \ PhaseThermophysicalTransportModel, \ phaseCompressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ RAS, \ Type \ ) @@ -73,7 +73,7 @@ makeThermophysicalTransportModelTypes ( \ PhaseThermophysicalTransportModel, \ phaseCompressibleMomentumTransportModel, \ - fluidReactionThermo, \ + fluidMulticomponentThermo, \ LES, \ Type \ ) diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files deleted file mode 100644 index 075a08a919..0000000000 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -phaseFluidReactionThermophysicalTransportModels.C - -LIB = $(FOAM_LIBBIN)/libphaseFluidReactionThermophysicalTransportModels diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C index 2cda842feb..fcaa891398 100644 --- a/src/combustionModels/EDC/EDC.C +++ b/src/combustionModels/EDC/EDC.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ namespace combustionModels Foam::combustionModels::EDC::EDC ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H index 86a9efc723..63823aa1c1 100644 --- a/src/combustionModels/EDC/EDC.H +++ b/src/combustionModels/EDC/EDC.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -182,7 +182,7 @@ public: EDC ( const word& modelType, - const fluidReactionThermo& type, + const fluidMulticomponentThermo& type, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C index b92a9162dd..8c2fdd94db 100644 --- a/src/combustionModels/FSD/FSD.C +++ b/src/combustionModels/FSD/FSD.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ namespace combustionModels Foam::combustionModels::FSD::FSD ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H index 4f01fe6e91..d4ba2e08f9 100644 --- a/src/combustionModels/FSD/FSD.H +++ b/src/combustionModels/FSD/FSD.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,7 +132,7 @@ public: FSD ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index d468070afd..b0514ec4b1 100644 --- a/src/combustionModels/Make/options +++ b/src/combustionModels/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C index 425d2e3a03..d85db7e71a 100644 --- a/src/combustionModels/PaSR/PaSR.C +++ b/src/combustionModels/PaSR/PaSR.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ namespace combustionModels Foam::combustionModels::PaSR::PaSR ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H index 34d1fabf27..b8b06f3230 100644 --- a/src/combustionModels/PaSR/PaSR.H +++ b/src/combustionModels/PaSR/PaSR.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ public: PaSR ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/combustionModel/combustionModel.C b/src/combustionModels/combustionModel/combustionModel.C index 056ffe4f98..4af585daa4 100644 --- a/src/combustionModels/combustionModel/combustionModel.C +++ b/src/combustionModels/combustionModel/combustionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ const Foam::word Foam::combustionModel::combustionPropertiesName Foam::IOobject Foam::combustionModel::createIOobject ( - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const word& combustionProperties ) const { @@ -74,7 +74,7 @@ Foam::IOobject Foam::combustionModel::createIOobject Foam::combustionModel::combustionModel ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H index d6c1ac7a02..9d958db721 100644 --- a/src/combustionModels/combustionModel/combustionModel.H +++ b/src/combustionModels/combustionModel/combustionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ SourceFiles #include "IOdictionary.H" #include "compressibleMomentumTransportModels.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ class combustionModel //- Construct the base IO object IOobject createIOobject ( - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const word& combustionProperties ) const; @@ -70,7 +70,7 @@ protected: const fvMesh& mesh_; //- Reference to the thermo - const fluidReactionThermo& thermo_; + const fluidMulticomponentThermo& thermo_; //- Reference to the turbulence model const compressibleMomentumTransportModel& turb_; @@ -99,7 +99,7 @@ public: dictionary, ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ), @@ -113,7 +113,7 @@ public: combustionModel ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties = combustionPropertiesName ); @@ -127,7 +127,7 @@ public: //- Select using thermo and turbulence static autoPtr New ( - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties = combustionPropertiesName ); @@ -143,7 +143,7 @@ public: inline const fvMesh& mesh() const; //- Return const access to the thermo - inline const fluidReactionThermo& thermo() const; + inline const fluidMulticomponentThermo& thermo() const; //- Return access to turbulence inline const compressibleMomentumTransportModel& turbulence() const; diff --git a/src/combustionModels/combustionModel/combustionModelI.H b/src/combustionModels/combustionModel/combustionModelI.H index 23e2724b11..4219831514 100644 --- a/src/combustionModels/combustionModel/combustionModelI.H +++ b/src/combustionModels/combustionModel/combustionModelI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,8 @@ inline const Foam::fvMesh& Foam::combustionModel::mesh() const } -inline const Foam::fluidReactionThermo& Foam::combustionModel::thermo() const +inline const Foam::fluidMulticomponentThermo& +Foam::combustionModel::thermo() const { return thermo_; } diff --git a/src/combustionModels/combustionModel/combustionModelNew.C b/src/combustionModels/combustionModel/combustionModelNew.C index 526ed49284..ca855aa41b 100644 --- a/src/combustionModels/combustionModel/combustionModelNew.C +++ b/src/combustionModels/combustionModel/combustionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License Foam::autoPtr Foam::combustionModel::New ( - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/diffusion/diffusion.C b/src/combustionModels/diffusion/diffusion.C index c858f6999b..b837394df4 100644 --- a/src/combustionModels/diffusion/diffusion.C +++ b/src/combustionModels/diffusion/diffusion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ namespace combustionModels Foam::combustionModels::diffusion::diffusion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/diffusion/diffusion.H b/src/combustionModels/diffusion/diffusion.H index 10f8e39dd1..e6b01640f5 100644 --- a/src/combustionModels/diffusion/diffusion.H +++ b/src/combustionModels/diffusion/diffusion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ public: diffusion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C index 542a208f77..d8e2b08ad6 100644 --- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C +++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ namespace combustionModels Foam::combustionModels::infinitelyFastChemistry::infinitelyFastChemistry ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H index 006c14ebcb..feb475ad3c 100644 --- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H +++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,7 @@ public: infinitelyFastChemistry ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C index 464f4053fb..78f31ca69e 100644 --- a/src/combustionModels/laminar/laminar.C +++ b/src/combustionModels/laminar/laminar.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ namespace combustionModels Foam::combustionModels::laminar::laminar ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/laminar/laminar.H b/src/combustionModels/laminar/laminar.H index e1fb8c23cc..29ddd65648 100644 --- a/src/combustionModels/laminar/laminar.H +++ b/src/combustionModels/laminar/laminar.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ public: laminar ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C index 3e5bd18661..0208c7aa17 100644 --- a/src/combustionModels/noCombustion/noCombustion.C +++ b/src/combustionModels/noCombustion/noCombustion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ namespace combustionModels Foam::combustionModels::noCombustion::noCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H index a924212f4d..b1bef1086f 100644 --- a/src/combustionModels/noCombustion/noCombustion.H +++ b/src/combustionModels/noCombustion/noCombustion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ public: noCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C index 3936d4a459..803757db65 100644 --- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C +++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,7 +125,7 @@ void Foam::combustionModels::singleStepCombustion::calculateMaxProducts() Foam::combustionModels::singleStepCombustion::singleStepCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.H b/src/combustionModels/singleStepCombustion/singleStepCombustion.H index 8386489559..554288c75f 100644 --- a/src/combustionModels/singleStepCombustion/singleStepCombustion.H +++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,7 @@ public: singleStepCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/combustionModels/zoneCombustion/zoneCombustion.C b/src/combustionModels/zoneCombustion/zoneCombustion.C index ca6ab57ff7..ea3fbe316b 100644 --- a/src/combustionModels/zoneCombustion/zoneCombustion.C +++ b/src/combustionModels/zoneCombustion/zoneCombustion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,7 +114,7 @@ Foam::combustionModels::zoneCombustion::filter Foam::combustionModels::zoneCombustion::zoneCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ) diff --git a/src/combustionModels/zoneCombustion/zoneCombustion.H b/src/combustionModels/zoneCombustion/zoneCombustion.H index 75eb579273..e224566cb4 100644 --- a/src/combustionModels/zoneCombustion/zoneCombustion.H +++ b/src/combustionModels/zoneCombustion/zoneCombustion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ public: zoneCombustion ( const word& modelType, - const fluidReactionThermo& thermo, + const fluidMulticomponentThermo& thermo, const compressibleMomentumTransportModel& turb, const word& combustionProperties ); diff --git a/src/lagrangian/parcel/Make/options b/src/lagrangian/parcel/Make/options index 9e23e54546..da5e9a09a1 100644 --- a/src/lagrangian/parcel/Make/options +++ b/src/lagrangian/parcel/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ @@ -19,7 +19,7 @@ LIB_LIBS = \ -lspecie \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lradiationModels \ -lphysicalProperties \ -lregionModels \ diff --git a/src/lagrangian/parcelTurbulence/Make/options b/src/lagrangian/parcelTurbulence/Make/options index ab520f4860..39360da895 100644 --- a/src/lagrangian/parcelTurbulence/Make/options +++ b/src/lagrangian/parcelTurbulence/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -23,7 +23,7 @@ LIB_LIBS = \ -lspecie \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lradiationModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ diff --git a/src/radiationModels/Make/options b/src/radiationModels/Make/options index eaa375832e..73f97b1c88 100644 --- a/src/radiationModels/Make/options +++ b/src/radiationModels/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index 651f4eb502..b0d92ce028 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -16,7 +16,7 @@ LIB_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lthermophysicalProperties \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -ldistributionModels \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ diff --git a/src/specieTransfer/Make/options b/src/specieTransfer/Make/options index 66932ef6ab..22401caa46 100644 --- a/src/specieTransfer/Make/options +++ b/src/specieTransfer/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude @@ -14,7 +14,7 @@ LIB_LIBS = \ -lmeshTools \ -lfluidThermophysicalModels \ -lspecie \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C index bd7d1639d6..568b7fed60 100644 --- a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C @@ -28,7 +28,7 @@ License #include "volFields.H" #include "surfaceFields.H" #include "thermophysicalTransportModel.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * // @@ -65,7 +65,7 @@ Foam::specieTransferMassFractionFvPatchScalarField::composition { const word& name = physicalProperties::typeName; - return db.lookupObject(name).composition(); + return db.lookupObject(name).composition(); } diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 032fb96f57..29f5ef1968 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -8,7 +8,7 @@ wmake $targetType specie wmake $targetType thermophysicalProperties wmake $targetType basic -wmake $targetType reactionThermo +wmake $targetType multicomponentThermo wmake $targetType laminarFlameSpeed wmake $targetType chemistryModel wmake $targetType barotropicCompressibilityModel diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index d83944d2cc..703611ea32 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/src/thermophysicalModels/chemistryModel/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/functions/Polynomial \ @@ -10,7 +10,7 @@ EXE_INC = \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ + -lmulticomponentThermophysicalModels \ -lspecie \ -lODE \ -lfiniteVolume \ diff --git a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.C b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.C index b704bb790c..477783c2cb 100644 --- a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ void Foam::basicChemistryModel::correct() Foam::basicChemistryModel::basicChemistryModel ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : IOdictionary diff --git a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.H index 7550254be2..dca776eb32 100644 --- a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ SourceFiles #ifndef basicChemistryModel_H #define basicChemistryModel_H -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -78,7 +78,7 @@ protected: const fvMesh& mesh_; //- Reference to the thermo - const fluidReactionThermo& thermo_; + const fluidMulticomponentThermo& thermo_; //- Chemistry activation switch Switch chemistry_; @@ -111,7 +111,7 @@ public: autoPtr, basicChemistryModel, thermo, - (const fluidReactionThermo& thermo), + (const fluidMulticomponentThermo& thermo), (thermo) ); @@ -119,7 +119,7 @@ public: // Constructors //- Construct from thermo - basicChemistryModel(const fluidReactionThermo& thermo); + basicChemistryModel(const fluidMulticomponentThermo& thermo); //- Disallow default bitwise copy construction basicChemistryModel(const basicChemistryModel&) = delete; @@ -130,7 +130,7 @@ public: //- Select based on fluid reaction thermo static autoPtr New ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ); @@ -144,7 +144,7 @@ public: inline const fvMesh& mesh() const; //- Return const access to the thermo - inline const fluidReactionThermo& thermo() const; + inline const fluidMulticomponentThermo& thermo() const; //- Chemistry activation switch inline Switch chemistry() const; diff --git a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelI.H b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelI.H index 8248952d7f..b416f6e9ab 100644 --- a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelI.H +++ b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ inline const Foam::fvMesh& Foam::basicChemistryModel::mesh() const } -inline const Foam::fluidReactionThermo& +inline const Foam::fluidMulticomponentThermo& Foam::basicChemistryModel::thermo() const { return thermo_; diff --git a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelNew.C index 7c93c9740b..cae729727d 100644 --- a/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelNew.C +++ b/src/thermophysicalModels/chemistryModel/basicChemistryModel/basicChemistryModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ License Foam::autoPtr Foam::basicChemistryModel::New ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) { IOdictionary chemistryDict diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C index 0efa7b685e..7ab7a11ba0 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C @@ -33,7 +33,7 @@ License template Foam::chemistryModel::chemistryModel ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : odeChemistryModel(thermo), diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.H index 7652560190..2fb706d78a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.H @@ -202,7 +202,7 @@ public: // Constructors //- Construct from thermo - chemistryModel(const fluidReactionThermo& thermo); + chemistryModel(const fluidMulticomponentThermo& thermo); //- Disallow default bitwise copy construction chemistryModel(const chemistryModel&) = delete; diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C index 44b217d44c..3d6baac198 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ License template Foam::EulerImplicit::EulerImplicit ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : chemistrySolver(thermo), diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H index 58da9da50d..ba92e8da3c 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,7 @@ public: // Constructors //- Construct from thermo - EulerImplicit(const fluidReactionThermo& thermo); + EulerImplicit(const fluidMulticomponentThermo& thermo); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C index 7ce1b4f5fe..841851b5e4 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License template Foam::chemistrySolver::chemistrySolver ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : ChemistryModel(thermo) diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H index 6cac1be5f6..87ad3bd4ac 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ SourceFiles #include "IOdictionary.H" #include "scalarField.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,7 +59,7 @@ public: // Constructors //- Construct from thermo - chemistrySolver(const fluidReactionThermo& thermo); + chemistrySolver(const fluidMulticomponentThermo& thermo); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C index ea8a5f5920..f356523134 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ License template Foam::noChemistrySolver::noChemistrySolver ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : chemistrySolver(thermo) diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H index 0ec9c05ab4..287d20c616 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ public: // Constructors //- Construct from thermo - noChemistrySolver(const fluidReactionThermo& thermo); + noChemistrySolver(const fluidMulticomponentThermo& thermo); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C index 0e3bbc5110..53f1b4b8e8 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::ode::ode(const fluidReactionThermo& thermo) +Foam::ode::ode(const fluidMulticomponentThermo& thermo) : chemistrySolver(thermo), coeffsDict_(this->subDict("odeCoeffs")), diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H index 5f3474df22..44cde13355 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ public: // Constructors //- Construct from thermo - ode(const fluidReactionThermo& thermo); + ode(const fluidMulticomponentThermo& thermo); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.C b/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.C index 0df45550b0..5dc6150eb6 100644 --- a/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.C @@ -38,7 +38,7 @@ namespace Foam Foam::odeChemistryModel::odeChemistryModel ( - const fluidReactionThermo& thermo + const fluidMulticomponentThermo& thermo ) : basicChemistryModel(thermo), diff --git a/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.H b/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.H index ef816fb1a4..e52c3342b2 100644 --- a/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/odeChemistryModel/odeChemistryModel.H @@ -97,7 +97,7 @@ public: // Constructors //- Construct from thermo - odeChemistryModel(const fluidReactionThermo& thermo); + odeChemistryModel(const fluidMulticomponentThermo& thermo); //- Disallow default bitwise copy construction odeChemistryModel(const odeChemistryModel&) = delete; diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C index 09dc70c0b1..b8a4d045c2 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C +++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ namespace laminarFlameSpeedModels Foam::laminarFlameSpeedModels::Gulders::Gulders ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : laminarFlameSpeed(dict, ct), @@ -196,19 +196,20 @@ Foam::tmp Foam::laminarFlameSpeedModels::Gulders::Su0pTphi Foam::tmp Foam::laminarFlameSpeedModels::Gulders::operator()() const { - if (psiuReactionThermo_.composition().contains("ft")) + if (psiuMulticomponentThermo_.composition().contains("ft")) { - const volScalarField& ft = psiuReactionThermo_.composition().Y("ft"); + const volScalarField& ft = + psiuMulticomponentThermo_.composition().Y("ft"); return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), dimensionedScalar ( "stoichiometricAirFuelMassRatio", dimless, - psiuReactionThermo_.properties() + psiuMulticomponentThermo_.properties() )*ft/max(1 - ft, small) ); } @@ -216,8 +217,8 @@ Foam::laminarFlameSpeedModels::Gulders::operator()() const { return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), equivalenceRatio_ ); } diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.H b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.H index 7d3a0e66d5..f2973877dc 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.H +++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,11 +102,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo Gulders ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C index 6a68b0910e..d13ebc5cd9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C +++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ namespace laminarFlameSpeedModels Foam::laminarFlameSpeedModels::GuldersEGR::GuldersEGR ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : laminarFlameSpeed(dict, ct), @@ -200,33 +200,33 @@ Foam::laminarFlameSpeedModels::GuldersEGR::operator()() const { if ( - psiuReactionThermo_.composition().contains("ft") - && psiuReactionThermo_.composition().contains("egr") + psiuMulticomponentThermo_.composition().contains("ft") + && psiuMulticomponentThermo_.composition().contains("egr") ) { return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), dimensionedScalar ( "stoichiometricAirFuelMassRatio", dimless, - psiuReactionThermo_.properties() + psiuMulticomponentThermo_.properties() ) /( - scalar(1)/psiuReactionThermo_.composition().Y("ft") + scalar(1)/psiuMulticomponentThermo_.composition().Y("ft") - scalar(1) ), - psiuReactionThermo_.composition().Y("egr") + psiuMulticomponentThermo_.composition().Y("egr") ); } else { return Su0pTphi ( - psiuReactionThermo_.p(), - psiuReactionThermo_.Tu(), + psiuMulticomponentThermo_.p(), + psiuMulticomponentThermo_.Tu(), equivalenceRatio_ ); } diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.H b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.H index af9cf42e5b..9d8801b3be 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.H +++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,11 +103,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo GuldersEGR ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options index cb40ec6474..35889d256c 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Make/options +++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C index f0f5947244..f16b4c851a 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C +++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ namespace laminarFlameSpeedModels Foam::laminarFlameSpeedModels::RaviPetersen::RaviPetersen ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : laminarFlameSpeed(dict, ct), @@ -292,8 +292,8 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::RaviPetersen::speed Foam::tmp Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const { - const volScalarField& p = psiuReactionThermo_.p(); - const volScalarField& Tu = psiuReactionThermo_.Tu(); + const volScalarField& p = psiuMulticomponentThermo_.p(); + const volScalarField& Tu = psiuMulticomponentThermo_.Tu(); volScalarField EqR ( @@ -310,16 +310,17 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const dimensionedScalar(dimless, 0) ); - if (psiuReactionThermo_.composition().contains("ft")) + if (psiuMulticomponentThermo_.composition().contains("ft")) { - const volScalarField& ft = psiuReactionThermo_.composition().Y("ft"); + const volScalarField& ft = + psiuMulticomponentThermo_.composition().Y("ft"); EqR = dimensionedScalar ( "stoichiometricAirFuelMassRatio", dimless, - psiuReactionThermo_.properties() + psiuMulticomponentThermo_.properties() )*ft/max(1 - ft, small); } else diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H index 8c27b7dbba..dbfc9248b5 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H +++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -168,11 +168,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo RaviPetersen ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction diff --git a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C index 5c81d2697b..acdb6f88f9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C +++ b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ namespace laminarFlameSpeedModels Foam::laminarFlameSpeedModels::constant::constant ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : laminarFlameSpeed(dict, ct), @@ -72,7 +72,7 @@ Foam::laminarFlameSpeedModels::constant::operator()() const return volScalarField::New ( "Su0", - psiuReactionThermo_.T().mesh(), + psiuMulticomponentThermo_.T().mesh(), Su_ ); } diff --git a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.H b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.H index 2d031d7c4f..c98b0cd541 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.H +++ b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,11 +65,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo constant ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.C index 41849e9d81..11eee2fc73 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,14 +40,14 @@ namespace Foam Foam::laminarFlameSpeed::laminarFlameSpeed ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) : - psiuReactionThermo_(ct), + psiuMulticomponentThermo_(ct), fuel_(dict.lookup("fuel")), equivalenceRatio_(0) { - if (!psiuReactionThermo_.composition().contains("ft")) + if (!psiuMulticomponentThermo_.composition().contains("ft")) { equivalenceRatio_ = dimensionedScalar(dict.lookup("equivalenceRatio")).value(); diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H index a56411c0f2..7b486aa8ae 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ SourceFiles #ifndef laminarFlameSpeed_H #define laminarFlameSpeed_H -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" @@ -62,7 +62,7 @@ protected: // Protected data - const psiuReactionThermo& psiuReactionThermo_; + const psiuMulticomponentThermo& psiuMulticomponentThermo_; //- Fuel word fuel_; @@ -86,7 +86,7 @@ public: dictionary, ( const dictionary& dict, - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ), (dict, ct) ); @@ -94,11 +94,11 @@ public: // Constructors - //- Construct from dictionary and psiuReactionThermo + //- Construct from dictionary and psiuMulticomponentThermo laminarFlameSpeed ( const dictionary&, - const psiuReactionThermo& + const psiuMulticomponentThermo& ); //- Disallow default bitwise copy construction @@ -109,7 +109,7 @@ public: static autoPtr New ( - const psiuReactionThermo& + const psiuMulticomponentThermo& ); diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C index 85e21c7685..04365934e9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License Foam::autoPtr Foam::laminarFlameSpeed::New ( - const psiuReactionThermo& ct + const psiuMulticomponentThermo& ct ) { // do not register the dictionary diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/multicomponentThermo/Make/files similarity index 50% rename from src/thermophysicalModels/reactionThermo/Make/files rename to src/thermophysicalModels/multicomponentThermo/Make/files index 9c2ff0a62f..c107dbd4bc 100644 --- a/src/thermophysicalModels/reactionThermo/Make/files +++ b/src/thermophysicalModels/multicomponentThermo/Make/files @@ -1,16 +1,16 @@ mixtures/basicSpecieMixture/basicSpecieMixture.C mixtures/basicCombustionMixture/basicCombustionMixture.C -fluidReactionThermo/fluidReactionThermo.C +fluidMulticomponentThermo/fluidMulticomponentThermo.C -psiReactionThermo/psiReactionThermo.C -psiReactionThermo/psiReactionThermos.C +psiMulticomponentThermo/psiMulticomponentThermo.C +psiMulticomponentThermo/psiMulticomponentThermos.C -psiuReactionThermo/psiuReactionThermo.C -psiuReactionThermo/psiuReactionThermos.C +psiuMulticomponentThermo/psiuMulticomponentThermo.C +psiuMulticomponentThermo/psiuMulticomponentThermos.C -rhoReactionThermo/rhoReactionThermo.C -rhoReactionThermo/rhoReactionThermos.C +rhoMulticomponentThermo/rhoMulticomponentThermo.C +rhoMulticomponentThermo/rhoMulticomponentThermos.C derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C @@ -18,4 +18,4 @@ derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField functionObjects/moleFractions/moleFractionsFunctionObjects.C -LIB = $(FOAM_LIBBIN)/libreactionThermophysicalModels +LIB = $(FOAM_LIBBIN)/libmulticomponentThermophysicalModels diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/multicomponentThermo/Make/options similarity index 100% rename from src/thermophysicalModels/reactionThermo/Make/options rename to src/thermophysicalModels/multicomponentThermo/Make/options diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C similarity index 92% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C index 33548f2be7..a40512429e 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -88,10 +88,11 @@ void Foam::fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() return; } - const psiuReactionThermo& thermo = db().lookupObject - ( - physicalProperties::typeName - ); + const psiuMulticomponentThermo& thermo = + db().lookupObject + ( + physicalProperties::typeName + ); const label patchi = patch().index(); diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H index fd612e357f..9dfeeac0dc 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C similarity index 92% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C index aaa773ef5a..1e8bb16382 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -87,10 +87,11 @@ void Foam::gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs() return; } - const psiuReactionThermo& thermo = db().lookupObject - ( - physicalProperties::typeName - ); + const psiuMulticomponentThermo& thermo = + db().lookupObject + ( + physicalProperties::typeName + ); const label patchi = patch().index(); diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H index d9697434dc..274de97c26 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C similarity index 92% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C index b9b295c005..61779c96db 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -91,10 +91,11 @@ void Foam::mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() return; } - const psiuReactionThermo& thermo = db().lookupObject - ( - physicalProperties::typeName - ); + const psiuMulticomponentThermo& thermo = + db().lookupObject + ( + physicalProperties::typeName + ); const label patchi = patch().index(); diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H rename to src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H index e63775b2ea..7331ebf6a9 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H +++ b/src/thermophysicalModels/multicomponentThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.C b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.C similarity index 73% rename from src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.C rename to src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.C index 1d441917f8..74792e70d1 100644 --- a/src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,19 +23,19 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(fluidReactionThermo, 0); - defineRunTimeSelectionTable(fluidReactionThermo, fvMesh); + defineTypeNameAndDebug(fluidMulticomponentThermo, 0); + defineRunTimeSelectionTable(fluidMulticomponentThermo, fvMesh); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fluidReactionThermo::implementation::implementation +Foam::fluidMulticomponentThermo::implementation::implementation ( const fvMesh& mesh, const word& phaseName @@ -45,23 +45,24 @@ Foam::fluidReactionThermo::implementation::implementation // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::fluidReactionThermo::New +Foam::autoPtr +Foam::fluidMulticomponentThermo::New ( const fvMesh& mesh, const word& phaseName ) { - return basicThermo::New(mesh, phaseName); + return basicThermo::New(mesh, phaseName); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::fluidReactionThermo::~fluidReactionThermo() +Foam::fluidMulticomponentThermo::~fluidMulticomponentThermo() {} -Foam::fluidReactionThermo::implementation::~implementation() +Foam::fluidMulticomponentThermo::implementation::~implementation() {} diff --git a/src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.H b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H similarity index 82% rename from src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.H rename to src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H index a054024c76..bb81cf96ef 100644 --- a/src/thermophysicalModels/reactionThermo/fluidReactionThermo/fluidReactionThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fluidReactionThermo + Foam::fluidMulticomponentThermo Description Base-class for multi-component fluid thermodynamic properties. @@ -31,12 +31,12 @@ See also Foam::basicThermo SourceFiles - fluidReactionThermo.C + fluidMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef fluidReactionThermo_H -#define fluidReactionThermo_H +#ifndef fluidMulticomponentThermo_H +#define fluidMulticomponentThermo_H #include "fluidThermo.H" #include "basicSpecieMixture.H" @@ -47,10 +47,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class fluidReactionThermo Declaration + Class fluidMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -class fluidReactionThermo +class fluidMulticomponentThermo : virtual public fluidThermo { @@ -63,14 +63,14 @@ public: //- Runtime type information - TypeName("fluidReactionThermo"); + TypeName("fluidMulticomponentThermo"); //- Declare run-time constructor selection tables declareRunTimeSelectionTable ( autoPtr, - fluidReactionThermo, + fluidMulticomponentThermo, fvMesh, (const fvMesh& mesh, const word& phaseName), (mesh, phaseName) @@ -80,7 +80,7 @@ public: // Selectors //- Standard selection based on fvMesh - static autoPtr New + static autoPtr New ( const fvMesh&, const word& phaseName=word::null @@ -88,7 +88,7 @@ public: //- Destructor - virtual ~fluidReactionThermo(); + virtual ~fluidMulticomponentThermo(); // Member Functions @@ -102,12 +102,12 @@ public: /*---------------------------------------------------------------------------*\ - Class fluidReactionThermo Declaration + Class fluidMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -class fluidReactionThermo::implementation +class fluidMulticomponentThermo::implementation : - virtual public fluidReactionThermo + virtual public fluidMulticomponentThermo { public: diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C rename to src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.C index fea752ef6c..f82f4c5fac 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C +++ b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.H similarity index 93% rename from src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H rename to src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.H index dbcdf22385..87ad6b92fa 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H +++ b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,8 +26,8 @@ Class Description This function object calculates mole-fraction fields from the mass-fraction - fields of the psi/rhoReactionThermo and caches them for output and further - post-processing. + fields of the psi/rhoMulticomponentThermo and caches them for output and + further post-processing. The names of the mole-fraction fields are obtained from the corresponding mass-fraction fields prepended by "X_" @@ -36,14 +36,14 @@ Description \verbatim moleFractions { - type psiReactionThermoMoleFractions; + type psiMulticomponentThermoMoleFractions; } \endverbatim or \verbatim moleFractions { - type rhoReactionThermoMoleFractions; + type rhoMulticomponentThermoMoleFractions; } \endverbatim depending on the thermodynamics package used in the solver. diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C similarity index 80% rename from src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C rename to src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C index e6b3cdd18c..94647e2b89 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C +++ b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,29 +32,29 @@ namespace Foam { defineTemplateTypeNameAndDebugWithName ( - psiReactionThermoMoleFractionsFunctionObject, - "psiReactionThermoMoleFractions", + psiMulticomponentThermoMoleFractionsFunctionObject, + "psiMulticomponentThermoMoleFractions", 0 ); addToRunTimeSelectionTable ( functionObject, - psiReactionThermoMoleFractionsFunctionObject, + psiMulticomponentThermoMoleFractionsFunctionObject, dictionary ); defineTemplateTypeNameAndDebugWithName ( - rhoReactionThermoMoleFractionsFunctionObject, - "rhoReactionThermoMoleFractions", + rhoMulticomponentThermoMoleFractionsFunctionObject, + "rhoMulticomponentThermoMoleFractions", 0 ); addToRunTimeSelectionTable ( functionObject, - rhoReactionThermoMoleFractionsFunctionObject, + rhoMulticomponentThermoMoleFractionsFunctionObject, dictionary ); } diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H similarity index 71% rename from src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H rename to src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H index ac70ba0d53..df42460556 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H +++ b/src/thermophysicalModels/multicomponentThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,16 +22,16 @@ License along with OpenFOAM. If not, see . Typedef - Foam::psiReactionThermoMoleFractionsFunctionObject + Foam::psiMulticomponentThermoMoleFractionsFunctionObject Description - Instantiate the moleFractions functionObject for psiReactionThermo + Instantiate the moleFractions functionObject for psiMulticomponentThermo Typedef - Foam::rhoReactionThermoMoleFractionsFunctionObject + Foam::rhoMulticomponentThermoMoleFractionsFunctionObject Description - Instantiate the moleFractions functionObject for rhoReactionThermo + Instantiate the moleFractions functionObject for rhoMulticomponentThermo SourceFiles moleFractionsFunctionObjects.C @@ -42,18 +42,18 @@ SourceFiles #define moleFractionsFunctionObjects_H #include "moleFractions.H" -#include "psiReactionThermo.H" -#include "rhoReactionThermo.H" +#include "psiMulticomponentThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef moleFractions - psiReactionThermoMoleFractionsFunctionObject; + typedef moleFractions + psiMulticomponentThermoMoleFractionsFunctionObject; - typedef moleFractions - rhoReactionThermoMoleFractionsFunctionObject; + typedef moleFractions + rhoMulticomponentThermoMoleFractionsFunctionObject; } diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/multicomponentThermo/makeMulticomponentThermo.H similarity index 63% rename from src/thermophysicalModels/reactionThermo/makeReactionThermo.H rename to src/thermophysicalModels/multicomponentThermo/makeMulticomponentThermo.H index 96a23d7490..fa574edf42 100644 --- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/makeMulticomponentThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,19 +23,20 @@ License \*---------------------------------------------------------------------------*/ -#ifndef makeReactionThermo_H -#define makeReactionThermo_H +#ifndef makeMulticomponentThermo_H +#define makeMulticomponentThermo_H #include "makeThermo.H" #include "SpecieMixture.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define defineReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) \ +#define defineMulticomponentThermo( \ + BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) \ \ typedef CThermo \ < \ - BaseReactionThermo::composite, \ + BaseMulticomponentThermo::composite, \ SpecieMixture \ < \ Mixture \ @@ -56,49 +57,60 @@ License ) -#define addReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) \ +#define addMulticomponentThermo( \ + BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) \ \ - addThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) + addThermo(BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) -#define makeReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) \ +#define makeMulticomponentThermo( \ + BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) \ \ - defineReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys); \ + defineMulticomponentThermo \ + (BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys); \ \ - addReactionThermo(fluidReactionThermo, CThermo, Mixture, ThermoPhys); \ - addReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) + addMulticomponentThermo \ + (fluidMulticomponentThermo, CThermo, Mixture, ThermoPhys); \ + \ + addMulticomponentThermo \ + (BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) -#define makeReactionThermos( \ - BaseThermo, BaseReactionThermo, CThermo, Mixture, ThermoPhys) \ +#define makeMulticomponentThermos( \ + BaseThermo, BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) \ + \ + defineMulticomponentThermo \ + (BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys); \ + \ + addMulticomponentThermo(basicThermo, CThermo, Mixture, ThermoPhys); \ + addMulticomponentThermo(fluidThermo, CThermo, Mixture, ThermoPhys); \ + addMulticomponentThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \ \ - defineReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys); \ + addMulticomponentThermo \ + (fluidMulticomponentThermo, CThermo, Mixture, ThermoPhys); \ \ - addReactionThermo(basicThermo, CThermo, Mixture, ThermoPhys); \ - addReactionThermo(fluidThermo, CThermo, Mixture, ThermoPhys); \ - addReactionThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \ - addReactionThermo(fluidReactionThermo, CThermo, Mixture, ThermoPhys); \ - addReactionThermo(BaseReactionThermo, CThermo, Mixture, ThermoPhys) + addMulticomponentThermo \ + (BaseMulticomponentThermo, CThermo, Mixture, ThermoPhys) -#define makePsiuReactionThermo(Mixture, ThermoPhys) \ +#define makePsiuMulticomponentThermo(Mixture, ThermoPhys) \ \ - defineReactionThermo \ + defineMulticomponentThermo \ ( \ - psiuReactionThermo, \ + psiuMulticomponentThermo, \ heheuPsiThermo, \ Mixture, \ ThermoPhys \ ); \ \ - addThermo(psiuReactionThermo, heheuPsiThermo, Mixture, ThermoPhys) + addThermo(psiuMulticomponentThermo, heheuPsiThermo, Mixture, ThermoPhys) -#define makePsiuReactionThermos(Mixture, ThermoPhys) \ +#define makePsiuMulticomponentThermos(Mixture, ThermoPhys) \ \ - defineReactionThermo \ + defineMulticomponentThermo \ ( \ - psiuReactionThermo, \ + psiuMulticomponentThermo, \ heheuPsiThermo, \ Mixture, \ ThermoPhys \ @@ -107,7 +119,7 @@ License addThermo(basicThermo, heheuPsiThermo, Mixture, ThermoPhys); \ addThermo(fluidThermo, heheuPsiThermo, Mixture, ThermoPhys); \ addThermo(psiThermo, heheuPsiThermo, Mixture, ThermoPhys); \ - addThermo(psiuReactionThermo, heheuPsiThermo, Mixture, ThermoPhys) + addThermo(psiuMulticomponentThermo, heheuPsiThermo, Mixture, ThermoPhys) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/SpecieMixture/SpecieMixture.C similarity index 99% rename from src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/SpecieMixture/SpecieMixture.C index 8ffa6475e5..986ce5a437 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/SpecieMixture/SpecieMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/SpecieMixture/SpecieMixture.H similarity index 100% rename from src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/SpecieMixture/SpecieMixture.H diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C similarity index 97% rename from src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C index 4a072ab200..67e6a3c7e1 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H index fce24769c3..3f9f12c522 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H similarity index 96% rename from src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H index 00f61941fb..ed35322d61 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/basicCombustionMixture/basicCombustionMixtureI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C similarity index 100% rename from src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H similarity index 99% rename from src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H index bc57824431..6fafc4768f 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H b/src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H similarity index 97% rename from src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H index b25a000536..16b6efa770 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/basicSpecieMixture/basicSpecieMixtureI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C similarity index 97% rename from src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C index 5fef452ed3..3916ab2df9 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H index 93a5cf1fbb..6bea409aa0 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C index 30c497faee..c0b3c92eb5 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H index c2e06e5da8..3fed96965b 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.C index e250e9e03d..a6248abb52 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.H index 4259912994..dbc417809b 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.C similarity index 97% rename from src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.C index a9f184e2aa..b59c98c5f3 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.H index 066759c052..2288ca9db4 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C index 55bf5cd422..77f584759d 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H index 237db7b8d8..137a6eb61e 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.C index ce5a3deee9..62aa35e6e7 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.H index cfd03aa1a0..0efcfa8b7a 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.C similarity index 96% rename from src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.C index e9656922e9..04f4642910 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.H similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.H index 8f7cc3bd06..d24aa0edc7 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C similarity index 99% rename from src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C index 6470303089..23c2faa61f 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H similarity index 99% rename from src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H index 9e539db6ec..a25a597c21 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C similarity index 98% rename from src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C rename to src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C index c6f782e234..6184f18b5e 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H similarity index 99% rename from src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H rename to src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H index a6ba8f9a1a..7fc5136ebc 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H +++ b/src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.C similarity index 75% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C rename to src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.C index 0a438df431..63d5918f5c 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,19 +23,19 @@ License \*---------------------------------------------------------------------------*/ -#include "psiReactionThermo.H" +#include "psiMulticomponentThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(psiReactionThermo, 0); - defineRunTimeSelectionTable(psiReactionThermo, fvMesh); + defineTypeNameAndDebug(psiMulticomponentThermo, 0); + defineRunTimeSelectionTable(psiMulticomponentThermo, fvMesh); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::psiReactionThermo::implementation::implementation +Foam::psiMulticomponentThermo::implementation::implementation ( const fvMesh& mesh, const word& phaseName @@ -45,23 +45,23 @@ Foam::psiReactionThermo::implementation::implementation // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::psiReactionThermo::New +Foam::autoPtr Foam::psiMulticomponentThermo::New ( const fvMesh& mesh, const word& phaseName ) { - return basicThermo::New(mesh, phaseName); + return basicThermo::New(mesh, phaseName); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::psiReactionThermo::~psiReactionThermo() +Foam::psiMulticomponentThermo::~psiMulticomponentThermo() {} -Foam::psiReactionThermo::implementation::~implementation() +Foam::psiMulticomponentThermo::implementation::~implementation() {} diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H similarity index 76% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H rename to src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H index 4dff4a23b7..88dabee0c6 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::psiReactionThermo + Foam::psiMulticomponentThermo Description Base-class for multi-component fluid thermodynamic properties based on @@ -32,15 +32,15 @@ See also Foam::basicThermo SourceFiles - psiReactionThermo.C + psiMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef psiReactionThermo_H -#define psiReactionThermo_H +#ifndef psiMulticomponentThermo_H +#define psiMulticomponentThermo_H #include "psiThermo.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,13 +48,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class psiReactionThermo Declaration + Class psiMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -class psiReactionThermo +class psiMulticomponentThermo : virtual public psiThermo, - virtual public fluidReactionThermo + virtual public fluidMulticomponentThermo { public: @@ -68,14 +68,14 @@ public: //- Runtime type information - TypeName("psiReactionThermo"); + TypeName("psiMulticomponentThermo"); //- Declare run-time constructor selection tables declareRunTimeSelectionTable ( autoPtr, - psiReactionThermo, + psiMulticomponentThermo, fvMesh, (const fvMesh& mesh, const word& phaseName), (mesh, phaseName) @@ -85,7 +85,7 @@ public: // Selectors //- Standard selection based on fvMesh - static autoPtr New + static autoPtr New ( const fvMesh&, const word& phaseName=word::null @@ -93,17 +93,17 @@ public: //- Destructor - virtual ~psiReactionThermo(); + virtual ~psiMulticomponentThermo(); }; /*---------------------------------------------------------------------------*\ - Class psiReactionThermo::implementation Declaration + Class psiMulticomponentThermo::implementation Declaration \*---------------------------------------------------------------------------*/ -class psiReactionThermo::implementation +class psiMulticomponentThermo::implementation : - virtual public psiReactionThermo + virtual public psiMulticomponentThermo { public: @@ -119,16 +119,16 @@ public: /*---------------------------------------------------------------------------*\ - Class psiReactionThermo::composite Declaration + Class psiMulticomponentThermo::composite Declaration \*---------------------------------------------------------------------------*/ -class psiReactionThermo::composite +class psiMulticomponentThermo::composite : public basicThermo::implementation, public fluidThermo::implementation, public psiThermo::implementation, - public fluidReactionThermo::implementation, - public psiReactionThermo::implementation + public fluidMulticomponentThermo::implementation, + public psiMulticomponentThermo::implementation { public: @@ -144,8 +144,8 @@ public: basicThermo::implementation(mesh, phaseName), fluidThermo::implementation(mesh, phaseName), psiThermo::implementation(mesh, phaseName), - fluidReactionThermo::implementation(mesh, phaseName), - psiReactionThermo::implementation(mesh, phaseName) + fluidMulticomponentThermo::implementation(mesh, phaseName), + psiMulticomponentThermo::implementation(mesh, phaseName) {} }; diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C similarity index 77% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C rename to src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C index 166bc2fc0a..db8de0c1fa 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,28 +28,28 @@ License #include "singleComponentMixture.H" #include "psiThermo.H" -#include "psiReactionThermo.H" +#include "psiMulticomponentThermo.H" #include "hePsiThermo.H" #include "forGases.H" -#include "makeReactionThermo.H" +#include "makeMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makePsiReactionThermos(Mixture, ThermoPhysics) \ - makeReactionThermos \ +#define makePsiMulticomponentThermos(Mixture, ThermoPhysics) \ + makeMulticomponentThermos \ ( \ psiThermo, \ - psiReactionThermo, \ + psiMulticomponentThermo, \ hePsiThermo, \ Mixture, \ ThermoPhysics \ ) -#define makePsiReactionThermo(Mixture, ThermoPhysics) \ - makeReactionThermo \ +#define makePsiMulticomponentThermo(Mixture, ThermoPhysics) \ + makeMulticomponentThermo \ ( \ - psiReactionThermo, \ + psiMulticomponentThermo, \ hePsiThermo, \ Mixture, \ ThermoPhysics \ @@ -59,15 +59,19 @@ License namespace Foam { - forCoeffGases(makePsiReactionThermos, coefficientMultiComponentMixture); + forCoeffGases + ( + makePsiMulticomponentThermos, + coefficientMultiComponentMixture + ); forCoeffGases ( - makePsiReactionThermos, + makePsiMulticomponentThermos, coefficientWilkeMultiComponentMixture ); - forGases(makePsiReactionThermo, singleComponentMixture); + forGases(makePsiMulticomponentThermo, singleComponentMixture); } // ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.C similarity index 100% rename from src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.C diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H similarity index 96% rename from src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H index 795b247345..3df5e178fc 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,13 +22,13 @@ License along with OpenFOAM. If not, see . Class - Foam::heheuReactionThermo + Foam::heheuMulticomponentThermo Description - Foam::heheuReactionThermo + Foam::heheuMulticomponentThermo SourceFiles - heheuReactionThermo.C + heheuMulticomponentThermo.C \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C similarity index 82% rename from src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C index 858917709b..dfa5c91680 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "fvMesh.H" #include "zeroGradientFvPatchFields.H" #include "fixedUnburntEnthalpyFvPatchScalarField.H" @@ -34,13 +34,13 @@ License namespace Foam { - defineTypeNameAndDebug(psiuReactionThermo, 0); - defineRunTimeSelectionTable(psiuReactionThermo, fvMesh); + defineTypeNameAndDebug(psiuMulticomponentThermo, 0); + defineRunTimeSelectionTable(psiuMulticomponentThermo, fvMesh); } // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -Foam::wordList Foam::psiuReactionThermo::heuBoundaryTypes() +Foam::wordList Foam::psiuMulticomponentThermo::heuBoundaryTypes() { const volScalarField::Boundary& tbf = this->Tu().boundaryField(); @@ -70,7 +70,7 @@ Foam::wordList Foam::psiuReactionThermo::heuBoundaryTypes() return hbt; } -void Foam::psiuReactionThermo::heuBoundaryCorrection(volScalarField& heu) +void Foam::psiuMulticomponentThermo::heuBoundaryCorrection(volScalarField& heu) { volScalarField::Boundary& hbf = heu.boundaryFieldRef(); @@ -98,7 +98,7 @@ void Foam::psiuReactionThermo::heuBoundaryCorrection(volScalarField& heu) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::psiuReactionThermo::implementation::implementation +Foam::psiuMulticomponentThermo::implementation::implementation ( const fvMesh& mesh, const word& phaseName @@ -108,23 +108,24 @@ Foam::psiuReactionThermo::implementation::implementation // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::psiuReactionThermo::New +Foam::autoPtr +Foam::psiuMulticomponentThermo::New ( const fvMesh& mesh, const word& phaseName ) { - return basicThermo::New(mesh, phaseName); + return basicThermo::New(mesh, phaseName); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::psiuReactionThermo::~psiuReactionThermo() +Foam::psiuMulticomponentThermo::~psiuMulticomponentThermo() {} -Foam::psiuReactionThermo::implementation::~implementation() +Foam::psiuMulticomponentThermo::implementation::~implementation() {} diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H similarity index 87% rename from src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H index 2c3051cc63..4e494b5d29 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::psiuReactionThermo + Foam::psiuMulticomponentThermo Description Base-class for combustion fluid thermodynamic properties based on @@ -32,12 +32,12 @@ See also Foam::basicThermo SourceFiles - psiuReactionThermo.C + psiuMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef psiuReactionThermo_H -#define psiuReactionThermo_H +#ifndef psiuMulticomponentThermo_H +#define psiuMulticomponentThermo_H #include "psiThermo.H" #include "basicCombustionMixture.H" @@ -48,10 +48,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class psiuReactionThermo Declaration + Class psiuMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -class psiuReactionThermo +class psiuMulticomponentThermo : virtual public psiThermo { @@ -79,7 +79,7 @@ public: //- Runtime type information - TypeName("psiuReactionThermo"); + TypeName("psiuMulticomponentThermo"); // Declare run-time constructor selection tables @@ -87,7 +87,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - psiuReactionThermo, + psiuMulticomponentThermo, fvMesh, (const fvMesh& mesh, const word& phaseName), (mesh, phaseName) @@ -97,7 +97,7 @@ public: // Selectors //- Standard selection based on fvMesh - static autoPtr New + static autoPtr New ( const fvMesh&, const word& phaseName=word::null @@ -105,7 +105,7 @@ public: //- Destructor - virtual ~psiuReactionThermo(); + virtual ~psiuMulticomponentThermo(); // Member Functions @@ -179,12 +179,12 @@ public: /*---------------------------------------------------------------------------*\ - Class psiuReactionThermo::implementation Declaration + Class psiuMulticomponentThermo::implementation Declaration \*---------------------------------------------------------------------------*/ -class psiuReactionThermo::implementation +class psiuMulticomponentThermo::implementation : - virtual public psiuReactionThermo + virtual public psiuMulticomponentThermo { public: @@ -200,15 +200,15 @@ public: /*---------------------------------------------------------------------------*\ - Class psiuReactionThermo::composite Declaration + Class psiuMulticomponentThermo::composite Declaration \*---------------------------------------------------------------------------*/ -class psiuReactionThermo::composite +class psiuMulticomponentThermo::composite : public basicThermo::implementation, public fluidThermo::implementation, public psiThermo::implementation, - public psiuReactionThermo::implementation + public psiuMulticomponentThermo::implementation { public: @@ -224,7 +224,7 @@ public: basicThermo::implementation(mesh, phaseName), fluidThermo::implementation(mesh, phaseName), psiThermo::implementation(mesh, phaseName), - psiuReactionThermo::implementation(mesh, phaseName) + psiuMulticomponentThermo::implementation(mesh, phaseName) {} }; diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C similarity index 78% rename from src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C index 128832ff75..acaf047fab 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,20 +29,20 @@ License #include "veryInhomogeneousMixture.H" #include "psiThermo.H" -#include "psiuReactionThermo.H" +#include "psiuMulticomponentThermo.H" #include "heheuPsiThermo.H" #include "forAbsoluteGases.H" -#include "makeReactionThermo.H" +#include "makeMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forAbsoluteGases(makePsiuReactionThermos, egrMixture); - forAbsoluteGases(makePsiuReactionThermos, homogeneousMixture); - forAbsoluteGases(makePsiuReactionThermos, inhomogeneousMixture); - forAbsoluteGases(makePsiuReactionThermos, veryInhomogeneousMixture); + forAbsoluteGases(makePsiuMulticomponentThermos, egrMixture); + forAbsoluteGases(makePsiuMulticomponentThermos, homogeneousMixture); + forAbsoluteGases(makePsiuMulticomponentThermos, inhomogeneousMixture); + forAbsoluteGases(makePsiuMulticomponentThermos, veryInhomogeneousMixture); } // ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.C similarity index 75% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C rename to src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.C index 8275dd75cd..fa626469c3 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,19 +23,19 @@ License \*---------------------------------------------------------------------------*/ -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(rhoReactionThermo, 0); - defineRunTimeSelectionTable(rhoReactionThermo, fvMesh); + defineTypeNameAndDebug(rhoMulticomponentThermo, 0); + defineRunTimeSelectionTable(rhoMulticomponentThermo, fvMesh); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::rhoReactionThermo::implementation::implementation +Foam::rhoMulticomponentThermo::implementation::implementation ( const fvMesh& mesh, const word& phaseName @@ -45,23 +45,23 @@ Foam::rhoReactionThermo::implementation::implementation // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::rhoReactionThermo::New +Foam::autoPtr Foam::rhoMulticomponentThermo::New ( const fvMesh& mesh, const word& phaseName ) { - return basicThermo::New(mesh, phaseName); + return basicThermo::New(mesh, phaseName); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::rhoReactionThermo::~rhoReactionThermo() +Foam::rhoMulticomponentThermo::~rhoMulticomponentThermo() {} -Foam::rhoReactionThermo::implementation::~implementation() +Foam::rhoMulticomponentThermo::implementation::~implementation() {} diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H similarity index 76% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H rename to src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H index c9c07d1eab..f43b8c00aa 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::rhoReactionThermo + Foam::rhoMulticomponentThermo Description Base-class for multi-component fluid thermodynamic properties based on @@ -32,15 +32,15 @@ See also Foam::basicThermo SourceFiles - rhoReactionThermo.C + rhoMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef rhoReactionThermo_H -#define rhoReactionThermo_H +#ifndef rhoMulticomponentThermo_H +#define rhoMulticomponentThermo_H #include "rhoThermo.H" -#include "fluidReactionThermo.H" +#include "fluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,13 +48,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class rhoReactionThermo Declaration + Class rhoMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -class rhoReactionThermo +class rhoMulticomponentThermo : virtual public rhoThermo, - virtual public fluidReactionThermo + virtual public fluidMulticomponentThermo { public: @@ -68,14 +68,14 @@ public: //- Runtime type information - TypeName("rhoReactionThermo"); + TypeName("rhoMulticomponentThermo"); //- Declare run-time constructor selection tables declareRunTimeSelectionTable ( autoPtr, - rhoReactionThermo, + rhoMulticomponentThermo, fvMesh, (const fvMesh& mesh, const word& phaseName), (mesh, phaseName) @@ -85,7 +85,7 @@ public: // Selectors //- Standard selection based on fvMesh - static autoPtr New + static autoPtr New ( const fvMesh&, const word& phaseName=word::null @@ -93,17 +93,17 @@ public: //- Destructor - virtual ~rhoReactionThermo(); + virtual ~rhoMulticomponentThermo(); }; /*---------------------------------------------------------------------------*\ - Class rhoReactionThermo::implementation Declaration + Class rhoMulticomponentThermo::implementation Declaration \*---------------------------------------------------------------------------*/ -class rhoReactionThermo::implementation +class rhoMulticomponentThermo::implementation : - virtual public rhoReactionThermo + virtual public rhoMulticomponentThermo { public: @@ -120,16 +120,16 @@ public: /*---------------------------------------------------------------------------*\ - Class rhoReactionThermo::composite Declaration + Class rhoMulticomponentThermo::composite Declaration \*---------------------------------------------------------------------------*/ -class rhoReactionThermo::composite +class rhoMulticomponentThermo::composite : public basicThermo::implementation, public fluidThermo::implementation, public rhoThermo::implementation, - public fluidReactionThermo::implementation, - public rhoReactionThermo::implementation + public fluidMulticomponentThermo::implementation, + public rhoMulticomponentThermo::implementation { public: @@ -145,8 +145,8 @@ public: basicThermo::implementation(mesh, phaseName), fluidThermo::implementation(mesh, phaseName), rhoThermo::implementation(mesh, phaseName), - fluidReactionThermo::implementation(mesh, phaseName), - rhoReactionThermo::implementation(mesh, phaseName) + fluidMulticomponentThermo::implementation(mesh, phaseName), + rhoMulticomponentThermo::implementation(mesh, phaseName) {} }; diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C similarity index 69% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C rename to src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C index 7f8d726bbf..67f4167e4e 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,30 +29,30 @@ License #include "singleComponentMixture.H" #include "rhoThermo.H" -#include "rhoReactionThermo.H" +#include "rhoMulticomponentThermo.H" #include "heRhoThermo.H" #include "forGases.H" #include "forLiquids.H" #include "forTabulated.H" -#include "makeReactionThermo.H" +#include "makeMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeRhoReactionThermos(Mixture, ThermoPhysics) \ - makeReactionThermos \ +#define makeRhoMulticomponentThermos(Mixture, ThermoPhysics) \ + makeMulticomponentThermos \ ( \ rhoThermo, \ - rhoReactionThermo, \ + rhoMulticomponentThermo, \ heRhoThermo, \ Mixture, \ ThermoPhysics \ ) -#define makeRhoReactionThermo(Mixture, ThermoPhysics) \ - makeReactionThermo \ +#define makeRhoMulticomponentThermo(Mixture, ThermoPhysics) \ + makeMulticomponentThermo \ ( \ - rhoReactionThermo, \ + rhoMulticomponentThermo, \ heRhoThermo, \ Mixture, \ ThermoPhysics \ @@ -62,22 +62,30 @@ License namespace Foam { - forCoeffGases(makeRhoReactionThermos, coefficientMultiComponentMixture); + forCoeffGases + ( + makeRhoMulticomponentThermos, + coefficientMultiComponentMixture + ); forCoeffGases ( - makeRhoReactionThermos, + makeRhoMulticomponentThermos, coefficientWilkeMultiComponentMixture ); - forGases(makeRhoReactionThermo, singleComponentMixture); + forGases(makeRhoMulticomponentThermo, singleComponentMixture); - forCoeffLiquids(makeRhoReactionThermos, coefficientMultiComponentMixture); - forLiquids(makeRhoReactionThermos, valueMultiComponentMixture); - forLiquids(makeRhoReactionThermo, singleComponentMixture); + forCoeffLiquids + ( + makeRhoMulticomponentThermos, + coefficientMultiComponentMixture + ); + forLiquids(makeRhoMulticomponentThermos, valueMultiComponentMixture); + forLiquids(makeRhoMulticomponentThermo, singleComponentMixture); - forTabulated(makeRhoReactionThermos, valueMultiComponentMixture); - forTabulated(makeRhoReactionThermo, singleComponentMixture); + forTabulated(makeRhoMulticomponentThermos, valueMultiComponentMixture); + forTabulated(makeRhoMulticomponentThermo, singleComponentMixture); } // ************************************************************************* // diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options index 7471724330..1a65bf933a 100644 --- a/src/thermophysicalModels/solidThermo/Make/options +++ b/src/thermophysicalModels/solidThermo/Make/options @@ -4,11 +4,11 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude + -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude LIB_LIBS = \ -lmeshTools \ -lfiniteVolume \ -lspecie \ -lfluidThermophysicalModels \ - -lreactionThermophysicalModels + -lmulticomponentThermophysicalModels diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C index 2e33ac2614..e6c0ee6dae 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,81 +27,81 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::IrreversibleReaction:: +template +Foam::IrreversibleReaction:: IrreversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& k ) : - Reaction(reaction), + Reaction(reaction), k_(k) {} -template -Foam::IrreversibleReaction:: +template +Foam::IrreversibleReaction:: IrreversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), k_(species, dict) {} -template -Foam::IrreversibleReaction:: +template +Foam::IrreversibleReaction:: IrreversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), k_(species, ob, dict) {} -template -Foam::IrreversibleReaction:: +template +Foam::IrreversibleReaction:: IrreversibleReaction ( - const IrreversibleReaction& irr, + const IrreversibleReaction& irr, const speciesTable& species ) : - Reaction(irr, species), + Reaction(irr, species), k_(irr.k_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void -Foam::IrreversibleReaction::preEvaluate() const +template +void Foam::IrreversibleReaction:: +preEvaluate() const { k_.preEvaluate(); } -template -void -Foam::IrreversibleReaction::postEvaluate() const +template +void Foam::IrreversibleReaction:: +postEvaluate() const { k_.postEvaluate(); } -template -Foam::scalar Foam::IrreversibleReaction::kf +template +Foam::scalar Foam::IrreversibleReaction::kf ( const scalar p, const scalar T, @@ -113,8 +113,8 @@ Foam::scalar Foam::IrreversibleReaction::kf } -template -Foam::scalar Foam::IrreversibleReaction::kr +template +Foam::scalar Foam::IrreversibleReaction::kr ( const scalar kfwd, const scalar p, @@ -127,8 +127,8 @@ Foam::scalar Foam::IrreversibleReaction::kr } -template -Foam::scalar Foam::IrreversibleReaction::kr +template +Foam::scalar Foam::IrreversibleReaction::kr ( const scalar p, const scalar T, @@ -140,8 +140,9 @@ Foam::scalar Foam::IrreversibleReaction::kr } -template -Foam::scalar Foam::IrreversibleReaction::dkfdT +template +Foam::scalar +Foam::IrreversibleReaction::dkfdT ( const scalar p, const scalar T, @@ -153,8 +154,9 @@ Foam::scalar Foam::IrreversibleReaction::dkfdT } -template -Foam::scalar Foam::IrreversibleReaction::dkrdT +template +Foam::scalar +Foam::IrreversibleReaction::dkrdT ( const scalar p, const scalar T, @@ -168,15 +170,16 @@ Foam::scalar Foam::IrreversibleReaction::dkrdT } -template -bool Foam::IrreversibleReaction::hasDkdc() const +template +bool +Foam::IrreversibleReaction::hasDkdc() const { return k_.hasDdc(); } -template -void Foam::IrreversibleReaction::dkfdc +template +void Foam::IrreversibleReaction::dkfdc ( const scalar p, const scalar T, @@ -189,8 +192,8 @@ void Foam::IrreversibleReaction::dkfdc } -template -void Foam::IrreversibleReaction::dkrdc +template +void Foam::IrreversibleReaction::dkrdc ( const scalar p, const scalar T, @@ -205,13 +208,13 @@ void Foam::IrreversibleReaction::dkrdc } -template -void Foam::IrreversibleReaction::write +template +void Foam::IrreversibleReaction::write ( Ostream& os ) const { - Reaction::write(os); + Reaction::write(os); k_.write(os); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H index 168a977011..fa9510c816 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,10 +46,10 @@ namespace Foam Class IrreversibleReaction Declaration \*---------------------------------------------------------------------------*/ -template +template class IrreversibleReaction : - public Reaction + public Reaction { // Private Data @@ -67,14 +67,14 @@ public: //- Construct from components IrreversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& reactionRate ); //- Construct as copy given new speciesTable IrreversibleReaction ( - const IrreversibleReaction&, + const IrreversibleReaction&, const speciesTable& species ); @@ -82,7 +82,7 @@ public: IrreversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); @@ -90,29 +90,32 @@ public: IrreversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ); //- Construct and return a clone - virtual autoPtr> clone() const + virtual autoPtr> clone() const { - return autoPtr> + return autoPtr> ( - new IrreversibleReaction(*this) + new IrreversibleReaction + ( + *this + ) ); } //- Construct and return a clone with new speciesTable - virtual autoPtr> clone + virtual autoPtr> clone ( const speciesTable& species ) const { - return autoPtr> + return autoPtr> ( - new IrreversibleReaction + new IrreversibleReaction ( *this, species @@ -227,7 +230,7 @@ public: //- Disallow default bitwise assignment void operator= ( - const IrreversibleReaction& + const IrreversibleReaction& ) = delete; }; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C index 81207a2452..061994f672 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,61 +27,62 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::NonEquilibriumReversibleReaction:: +template +Foam::NonEquilibriumReversibleReaction:: NonEquilibriumReversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& forwardReactionRate, const ReactionRate& reverseReactionRate ) : - Reaction(reaction), + Reaction(reaction), fk_(forwardReactionRate), rk_(reverseReactionRate) {} -template -Foam::NonEquilibriumReversibleReaction:: +template +Foam::NonEquilibriumReversibleReaction:: NonEquilibriumReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), fk_(species, dict.subDict("forward")), rk_(species, dict.subDict("reverse")) {} -template -Foam::NonEquilibriumReversibleReaction:: +template +Foam::NonEquilibriumReversibleReaction:: NonEquilibriumReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), fk_(species, ob, dict.subDict("forward")), rk_(species, ob, dict.subDict("reverse")) {} -template -Foam::NonEquilibriumReversibleReaction:: +template +Foam::NonEquilibriumReversibleReaction:: NonEquilibriumReversibleReaction ( - const NonEquilibriumReversibleReaction& nerr, + const NonEquilibriumReversibleReaction& + nerr, const speciesTable& species ) : - Reaction(nerr, species), + Reaction(nerr, species), fk_(nerr.fk_), rk_(nerr.rk_) {} @@ -89,8 +90,9 @@ NonEquilibriumReversibleReaction // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::NonEquilibriumReversibleReaction:: +template +void +Foam::NonEquilibriumReversibleReaction:: preEvaluate() const { fk_.preEvaluate(); @@ -98,8 +100,9 @@ preEvaluate() const } -template -void Foam::NonEquilibriumReversibleReaction:: +template +void +Foam::NonEquilibriumReversibleReaction:: postEvaluate() const { fk_.postEvaluate(); @@ -107,9 +110,9 @@ postEvaluate() const } -template +template Foam::scalar -Foam::NonEquilibriumReversibleReaction::kf +Foam::NonEquilibriumReversibleReaction::kf ( const scalar p, const scalar T, @@ -121,9 +124,9 @@ Foam::NonEquilibriumReversibleReaction::kf } -template +template Foam::scalar -Foam::NonEquilibriumReversibleReaction::kr +Foam::NonEquilibriumReversibleReaction::kr ( const scalar, const scalar p, @@ -136,9 +139,9 @@ Foam::NonEquilibriumReversibleReaction::kr } -template +template Foam::scalar -Foam::NonEquilibriumReversibleReaction::kr +Foam::NonEquilibriumReversibleReaction::kr ( const scalar p, const scalar T, @@ -150,9 +153,10 @@ Foam::NonEquilibriumReversibleReaction::kr } -template +template Foam::scalar -Foam::NonEquilibriumReversibleReaction::dkfdT +Foam::NonEquilibriumReversibleReaction:: +dkfdT ( const scalar p, const scalar T, @@ -164,9 +168,10 @@ Foam::NonEquilibriumReversibleReaction::dkfdT } -template +template Foam::scalar -Foam::NonEquilibriumReversibleReaction::dkrdT +Foam::NonEquilibriumReversibleReaction:: +dkrdT ( const scalar p, const scalar T, @@ -180,16 +185,19 @@ Foam::NonEquilibriumReversibleReaction::dkrdT } -template -bool Foam::NonEquilibriumReversibleReaction:: +template +bool +Foam::NonEquilibriumReversibleReaction:: hasDkdc() const { return fk_.hasDdc() || rk_.hasDdc(); } -template -void Foam::NonEquilibriumReversibleReaction::dkfdc +template +void +Foam::NonEquilibriumReversibleReaction:: +dkfdc ( const scalar p, const scalar T, @@ -202,8 +210,10 @@ void Foam::NonEquilibriumReversibleReaction::dkfdc } -template -void Foam::NonEquilibriumReversibleReaction::dkrdc +template +void +Foam::NonEquilibriumReversibleReaction:: +dkrdc ( const scalar p, const scalar T, @@ -218,14 +228,15 @@ void Foam::NonEquilibriumReversibleReaction::dkrdc } -template +template void -Foam::NonEquilibriumReversibleReaction::write +Foam::NonEquilibriumReversibleReaction:: +write ( Ostream& os ) const { - Reaction::write(os); + Reaction::write(os); os << indent << "forward" << nl; os << indent << token::BEGIN_BLOCK << nl; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H index 15dbbf9b3c..d702021596 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,10 @@ namespace Foam Class NonEquilibriumReversibleReaction Declaration \*---------------------------------------------------------------------------*/ -template +template class NonEquilibriumReversibleReaction : - public Reaction + public Reaction { // Private Data @@ -69,7 +69,7 @@ public: //- Construct from components NonEquilibriumReversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& forwardReactionRate, const ReactionRate& reverseReactionRate ); @@ -79,7 +79,7 @@ public: ( const NonEquilibriumReversibleReaction < - ReactionThermo, + MulticomponentThermo, ReactionRate >&, const speciesTable& species @@ -89,7 +89,7 @@ public: NonEquilibriumReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); @@ -97,35 +97,35 @@ public: NonEquilibriumReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ); //- Construct and return a clone - virtual autoPtr> clone() const + virtual autoPtr> clone() const { - return autoPtr> + return autoPtr> ( new NonEquilibriumReversibleReaction < - ReactionThermo, + MulticomponentThermo, ReactionRate >(*this) ); } //- Construct and return a clone with new speciesTable - virtual autoPtr> clone + virtual autoPtr> clone ( const speciesTable& species ) const { - return autoPtr> + return autoPtr> ( new NonEquilibriumReversibleReaction < - ReactionThermo, + MulticomponentThermo, ReactionRate > ( @@ -244,7 +244,7 @@ public: ( const NonEquilibriumReversibleReaction < - ReactionThermo, + MulticomponentThermo, ReactionRate >& ) = delete; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index e85581ee59..40b0761474 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -28,22 +28,22 @@ License // * * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * // -template -Foam::scalar Foam::Reaction::TlowDefault(0); +template +Foam::scalar Foam::Reaction::TlowDefault(0); -template -Foam::scalar Foam::Reaction::ThighDefault(great); +template +Foam::scalar Foam::Reaction::ThighDefault(great); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::Reaction::setThermo +template +void Foam::Reaction::setThermo ( - const HashPtrTable& thermoDatabase + const HashPtrTable& thermoDatabase ) { - typename ReactionThermo::thermoType rhsThermo + typename MulticomponentThermo::thermoType rhsThermo ( rhs()[0].stoichCoeff *(*thermoDatabase[species()[rhs()[0].index]]).W() @@ -58,7 +58,7 @@ void Foam::Reaction::setThermo *(*thermoDatabase[species()[rhs()[i].index]]); } - typename ReactionThermo::thermoType lhsThermo + typename MulticomponentThermo::thermoType lhsThermo ( lhs()[0].stoichCoeff *(*thermoDatabase[species()[lhs()[0].index]]).W() @@ -84,23 +84,23 @@ void Foam::Reaction::setThermo << exit(FatalError); } - ReactionThermo::thermoType::operator=(lhsThermo == rhsThermo); + MulticomponentThermo::thermoType::operator=(lhsThermo == rhsThermo); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::Reaction::Reaction +template +Foam::Reaction::Reaction ( const speciesTable& species, const List& lhs, const List& rhs, - const HashPtrTable& thermoDatabase + const HashPtrTable& thermoDatabase ) : reaction(species, lhs, rhs), - ReactionThermo::thermoType(*thermoDatabase[species[0]]), + MulticomponentThermo::thermoType(*thermoDatabase[species[0]]), Tlow_(TlowDefault), Thigh_(ThighDefault) { @@ -108,30 +108,30 @@ Foam::Reaction::Reaction } -template -Foam::Reaction::Reaction +template +Foam::Reaction::Reaction ( - const Reaction& r, + const Reaction& r, const speciesTable& species ) : reaction(r, species), - ReactionThermo::thermoType(r), + MulticomponentThermo::thermoType(r), Tlow_(r.Tlow()), Thigh_(r.Thigh()) {} -template -Foam::Reaction::Reaction +template +Foam::Reaction::Reaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) : reaction(species, dict), - ReactionThermo::thermoType(*thermoDatabase[species[0]]), + MulticomponentThermo::thermoType(*thermoDatabase[species[0]]), Tlow_(dict.lookupOrDefault("Tlow", TlowDefault)), Thigh_(dict.lookupOrDefault("Thigh", ThighDefault)) { @@ -141,12 +141,12 @@ Foam::Reaction::Reaction // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr> -Foam::Reaction::New +template +Foam::autoPtr> +Foam::Reaction::New ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) { @@ -156,9 +156,10 @@ Foam::Reaction::New dictionaryConstructorTablePtr_->find(reactionTypeName); // Backwards compatibility check. Reaction names used to have "Reaction" - // (Reaction::typeName_()) appended. This was removed as it - // is unnecessary given the context in which the reaction is specified. If - // this reaction name was not found, search also for the old name. + // (Reaction::typeName_()) appended. This was + // removed as it is unnecessary given the context in which the reaction is + // specified. If this reaction name was not found, search also for the old + // name. if (cstrIter == dictionaryConstructorTablePtr_->end()) { cstrIter = dictionaryConstructorTablePtr_->find @@ -177,19 +178,19 @@ Foam::Reaction::New << exit(FatalError); } - return autoPtr> + return autoPtr> ( cstrIter()(species, thermoDatabase, dict) ); } -template -Foam::autoPtr> -Foam::Reaction::New +template +Foam::autoPtr> +Foam::Reaction::New ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ) @@ -240,29 +241,29 @@ Foam::Reaction::New << exit(FatalError); } - return autoPtr> + return autoPtr> ( cstrIter()(species, thermoDatabase, dict) ); } - return autoPtr> + return autoPtr> ( cstrIter()(species, thermoDatabase, ob, dict) ); } -template -Foam::autoPtr> -Foam::Reaction::New +template +Foam::autoPtr> +Foam::Reaction::New ( const speciesTable& species, - const PtrList& speciesThermo, + const PtrList& speciesThermo, const dictionary& dict ) { - HashPtrTable thermoDatabase; + HashPtrTable thermoDatabase; forAll(speciesThermo, i) { thermoDatabase.insert @@ -278,15 +279,15 @@ Foam::Reaction::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::Reaction::write(Ostream& os) const +template +void Foam::Reaction::write(Ostream& os) const { reaction::write(os); } -template -void Foam::Reaction::C +template +void Foam::Reaction::C ( const scalar p, const scalar T, @@ -314,8 +315,8 @@ void Foam::Reaction::C } -template -Foam::scalar Foam::Reaction::omega +template +Foam::scalar Foam::Reaction::omega ( const scalar p, const scalar T, @@ -342,8 +343,8 @@ Foam::scalar Foam::Reaction::omega } -template -void Foam::Reaction::dNdtByV +template +void Foam::Reaction::dNdtByV ( const scalar p, const scalar T, @@ -373,8 +374,8 @@ void Foam::Reaction::dNdtByV } -template -void Foam::Reaction::ddNdtByVdcTp +template +void Foam::Reaction::ddNdtByVdcTp ( const scalar p, const scalar T, diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H index 11311075bf..977782f38e 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,8 +25,8 @@ Class Foam::Reaction Description - Simple extension of ReactionThermo to handle reaction kinetics in addition - to the equilibrium thermodynamics already handled. + Simple extension of MulticomponentThermo to handle reaction kinetics in + addition to the equilibrium thermodynamics already handled. SourceFiles ReactionI.H @@ -52,11 +52,11 @@ namespace Foam // Forward declaration of friend functions and operators -template +template class Reaction; -template -inline Ostream& operator<<(Ostream&, const Reaction&); +template +inline Ostream& operator<<(Ostream&, const Reaction&); class objectRegistry; @@ -65,11 +65,11 @@ class objectRegistry; Class Reaction Declaration \*---------------------------------------------------------------------------*/ -template +template class Reaction : public reaction, - public ReactionThermo::thermoType + public MulticomponentThermo::thermoType { public: @@ -91,7 +91,10 @@ private: // Private Member Functions //- Construct reaction thermo - void setThermo(const HashPtrTable& thermoDatabase); + void setThermo + ( + const HashPtrTable& thermoDatabase + ); public: @@ -109,7 +112,7 @@ public: dictionary, ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ), (species, thermoDatabase, dict) @@ -122,7 +125,7 @@ public: objectRegistry, ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ), @@ -138,25 +141,29 @@ public: const speciesTable& species, const List& lhs, const List& rhs, - const HashPtrTable& thermoDatabase + const HashPtrTable& thermoDatabase ); //- Construct as copy given new speciesTable - Reaction(const Reaction&, const speciesTable& species); + Reaction + ( + const Reaction&, + const speciesTable& species + ); //- Construct from dictionary Reaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); //- Construct and return a clone - virtual autoPtr> clone() const = 0; + virtual autoPtr> clone() const = 0; //- Construct and return a clone with new speciesTable - virtual autoPtr> clone + virtual autoPtr> clone ( const speciesTable& species ) const = 0; @@ -166,19 +173,19 @@ public: //- Return a pointer to new patchField created on freestore // from dictionary - static autoPtr> New + static autoPtr> New ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); //- Return a pointer to new patchField created on freestore // from objectRegistry and dictionary - static autoPtr> New + static autoPtr> New ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ); @@ -186,10 +193,10 @@ public: //- Return a pointer to new patchField created on freestore from dict. // This is used to construct a single reaction given a speciesThermo // list from which a temporary thermoDatabase is created. - static autoPtr> New + static autoPtr> New ( const speciesTable& species, - const PtrList& speciesThermo, + const PtrList& speciesThermo, const dictionary& dict ); @@ -364,15 +371,15 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const Reaction&) = delete; + void operator=(const Reaction&) = delete; // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, - const Reaction& + const Reaction& ); }; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H index 7214dd6134..8ba1f17b83 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,15 +27,15 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -inline Foam::scalar Foam::Reaction::Tlow() const +template +inline Foam::scalar Foam::Reaction::Tlow() const { return Tlow_; } -template -inline Foam::scalar Foam::Reaction::Thigh() const +template +inline Foam::scalar Foam::Reaction::Thigh() const { return Thigh_; } @@ -43,11 +43,11 @@ inline Foam::scalar Foam::Reaction::Thigh() const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template +template inline Foam::Ostream& Foam::operator<< ( Ostream& os, - const Reaction& r + const Reaction& r ) { r.write(os); diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.C index f603f3fa13..00df518246 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,16 +27,16 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::ReactionProxy::ReactionProxy +template +Foam::ReactionProxy::ReactionProxy ( const speciesTable& species, const List& lhs, const List& rhs, - const HashPtrTable& thermoDatabase + const HashPtrTable& thermoDatabase ) : - Reaction + Reaction ( species, lhs, @@ -46,14 +46,14 @@ Foam::ReactionProxy::ReactionProxy {} -template -Foam::ReactionProxy::ReactionProxy +template +Foam::ReactionProxy::ReactionProxy ( - const Reaction& r, + const Reaction& r, const speciesTable& species ) : - Reaction + Reaction ( r, species @@ -61,15 +61,15 @@ Foam::ReactionProxy::ReactionProxy {} -template -Foam::ReactionProxy::ReactionProxy +template +Foam::ReactionProxy::ReactionProxy ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) : - Reaction + Reaction ( species, thermoDatabase, @@ -78,41 +78,41 @@ Foam::ReactionProxy::ReactionProxy {} -template -Foam::autoPtr> -Foam::ReactionProxy::clone() const +template +Foam::autoPtr> +Foam::ReactionProxy::clone() const { NotImplemented; - return autoPtr>(); + return autoPtr>(); } -template -Foam::autoPtr> -Foam::ReactionProxy::clone +template +Foam::autoPtr> +Foam::ReactionProxy::clone ( const speciesTable& species ) const { NotImplemented; - return autoPtr>(); + return autoPtr>(); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::ReactionProxy::preEvaluate() const +template +void Foam::ReactionProxy::preEvaluate() const {} -template -void Foam::ReactionProxy::postEvaluate() const +template +void Foam::ReactionProxy::postEvaluate() const {} -template -Foam::scalar Foam::ReactionProxy::kf +template +Foam::scalar Foam::ReactionProxy::kf ( const scalar p, const scalar T, @@ -125,8 +125,8 @@ Foam::scalar Foam::ReactionProxy::kf } -template -Foam::scalar Foam::ReactionProxy::kr +template +Foam::scalar Foam::ReactionProxy::kr ( const scalar kfwd, const scalar p, @@ -140,8 +140,8 @@ Foam::scalar Foam::ReactionProxy::kr } -template -Foam::scalar Foam::ReactionProxy::kr +template +Foam::scalar Foam::ReactionProxy::kr ( const scalar p, const scalar T, @@ -154,8 +154,8 @@ Foam::scalar Foam::ReactionProxy::kr } -template -Foam::scalar Foam::ReactionProxy::dkfdT +template +Foam::scalar Foam::ReactionProxy::dkfdT ( const scalar p, const scalar T, @@ -168,8 +168,8 @@ Foam::scalar Foam::ReactionProxy::dkfdT } -template -Foam::scalar Foam::ReactionProxy::dkrdT +template +Foam::scalar Foam::ReactionProxy::dkrdT ( const scalar p, const scalar T, @@ -184,16 +184,16 @@ Foam::scalar Foam::ReactionProxy::dkrdT } -template -bool Foam::ReactionProxy::hasDkdc() const +template +bool Foam::ReactionProxy::hasDkdc() const { NotImplemented; return false; } -template -void Foam::ReactionProxy::dkfdc +template +void Foam::ReactionProxy::dkfdc ( const scalar p, const scalar T, @@ -206,8 +206,8 @@ void Foam::ReactionProxy::dkfdc } -template -void Foam::ReactionProxy::dkrdc +template +void Foam::ReactionProxy::dkrdc ( const scalar p, const scalar T, diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.H index 5ea4e8ed9d..360a0ededc 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionProxy/ReactionProxy.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,10 +49,10 @@ namespace Foam Class ReactionProxy Declaration \*---------------------------------------------------------------------------*/ -template +template class ReactionProxy : - public Reaction + public Reaction { public: @@ -65,13 +65,13 @@ public: const speciesTable& species, const List& lhs, const List& rhs, - const HashPtrTable& thermoDatabase + const HashPtrTable& thermoDatabase ); //- Construct as copy given new speciesTable ReactionProxy ( - const Reaction&, + const Reaction&, const speciesTable& species ); @@ -79,15 +79,15 @@ public: ReactionProxy ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); //- Construct and return a clone - virtual autoPtr> clone() const; + virtual autoPtr> clone() const; //- Construct and return a clone with new speciesTable - virtual autoPtr> clone + virtual autoPtr> clone ( const speciesTable& species ) const; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C index 5b1363e531..ffe8631c1f 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,81 +27,83 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::ReversibleReaction:: +template +Foam::ReversibleReaction:: ReversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& k ) : - Reaction(reaction), + Reaction(reaction), k_(k) {} -template -Foam::ReversibleReaction:: +template +Foam::ReversibleReaction:: ReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), k_(species, dict) {} -template -Foam::ReversibleReaction:: +template +Foam::ReversibleReaction:: ReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ) : - Reaction(species, thermoDatabase, dict), + Reaction(species, thermoDatabase, dict), k_(species, ob, dict) {} -template -Foam::ReversibleReaction:: +template +Foam::ReversibleReaction:: ReversibleReaction ( - const ReversibleReaction& rr, + const ReversibleReaction& rr, const speciesTable& species ) : - Reaction(rr, species), + Reaction(rr, species), k_(rr.k_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template +template void -Foam::ReversibleReaction::preEvaluate() const +Foam::ReversibleReaction:: +preEvaluate() const { k_.preEvaluate(); } -template +template void -Foam::ReversibleReaction::postEvaluate() const +Foam::ReversibleReaction:: +postEvaluate() const { k_.postEvaluate(); } -template -Foam::scalar Foam::ReversibleReaction::kf +template +Foam::scalar Foam::ReversibleReaction::kf ( const scalar p, const scalar T, @@ -113,8 +115,8 @@ Foam::scalar Foam::ReversibleReaction::kf } -template -Foam::scalar Foam::ReversibleReaction::kr +template +Foam::scalar Foam::ReversibleReaction::kr ( const scalar kfwd, const scalar p, @@ -127,8 +129,8 @@ Foam::scalar Foam::ReversibleReaction::kr } -template -Foam::scalar Foam::ReversibleReaction::kr +template +Foam::scalar Foam::ReversibleReaction::kr ( const scalar p, const scalar T, @@ -140,8 +142,8 @@ Foam::scalar Foam::ReversibleReaction::kr } -template -Foam::scalar Foam::ReversibleReaction::dkfdT +template +Foam::scalar Foam::ReversibleReaction::dkfdT ( const scalar p, const scalar T, @@ -153,8 +155,8 @@ Foam::scalar Foam::ReversibleReaction::dkfdT } -template -Foam::scalar Foam::ReversibleReaction::dkrdT +template +Foam::scalar Foam::ReversibleReaction::dkrdT ( const scalar p, const scalar T, @@ -170,15 +172,16 @@ Foam::scalar Foam::ReversibleReaction::dkrdT } -template -bool Foam::ReversibleReaction::hasDkdc() const +template +bool +Foam::ReversibleReaction::hasDkdc() const { return k_.hasDdc(); } -template -void Foam::ReversibleReaction::dkfdc +template +void Foam::ReversibleReaction::dkfdc ( const scalar p, const scalar T, @@ -191,8 +194,8 @@ void Foam::ReversibleReaction::dkfdc } -template -void Foam::ReversibleReaction::dkrdc +template +void Foam::ReversibleReaction::dkrdc ( const scalar p, const scalar T, @@ -209,13 +212,13 @@ void Foam::ReversibleReaction::dkrdc } -template -void Foam::ReversibleReaction::write +template +void Foam::ReversibleReaction::write ( Ostream& os ) const { - Reaction::write(os); + Reaction::write(os); k_.write(os); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H index dded56aea2..f851298b4c 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,10 @@ namespace Foam Class ReversibleReaction Declaration \*---------------------------------------------------------------------------*/ -template +template class ReversibleReaction : - public Reaction + public Reaction { // Private Data @@ -68,14 +68,14 @@ public: //- Construct from components ReversibleReaction ( - const Reaction& reaction, + const Reaction& reaction, const ReactionRate& k ); //- Construct as copy given new speciesTable ReversibleReaction ( - const ReversibleReaction&, + const ReversibleReaction&, const speciesTable& species ); @@ -83,7 +83,7 @@ public: ReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const dictionary& dict ); @@ -91,29 +91,32 @@ public: ReversibleReaction ( const speciesTable& species, - const HashPtrTable& thermoDatabase, + const HashPtrTable& thermoDatabase, const objectRegistry& ob, const dictionary& dict ); //- Construct and return a clone - virtual autoPtr> clone() const + virtual autoPtr> clone() const { - return autoPtr> + return autoPtr> ( - new ReversibleReaction(*this) + new ReversibleReaction + ( + *this + ) ); } //- Construct and return a clone with new speciesTable - virtual autoPtr> clone + virtual autoPtr> clone ( const speciesTable& species ) const { - return autoPtr> + return autoPtr> ( - new ReversibleReaction + new ReversibleReaction ( *this, species @@ -228,7 +231,7 @@ public: //- Disallow default bitwise assignment void operator= ( - const ReversibleReaction& + const ReversibleReaction& ) = delete; };