From 7fa2c35514f41239b716e9fea1c7d17cdd368b5f Mon Sep 17 00:00:00 2001 From: ignis Date: Tue, 18 Oct 2016 00:15:00 +0900 Subject: [PATCH] added new specie thermo combination constTransport-sensibleEnthalpy-janafThermo-perfectGas-specie --- .../psiChemistryModel/psiChemistryModels.C | 7 +++++++ .../rhoChemistryModel/rhoChemistryModels.C | 7 +++++++ .../chemistrySolver/makeChemistrySolvers.C | 2 ++ .../chemistryReader/makeChemistryReaders.C | 2 ++ .../psiReactionThermo/psiReactionThermos.C | 9 +++++++++ .../specie/include/reactionTypes.H | 2 ++ .../specie/include/thermoPhysicsTypes.H | 13 +++++++++++++ .../specie/reaction/reactions/makeReactions.C | 1 + 8 files changed, 43 insertions(+) diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C index ddaab215..4f0fb343 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C @@ -54,6 +54,13 @@ namespace Foam gasHThermoPhysics ); + makeChemistryModel + ( + chemistryModel, + psiChemistryModel, + constTransportGasHThermoPhysics + ); + makeChemistryModel ( chemistryModel, diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C index 8a45d09c..1c388b2a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C @@ -47,6 +47,13 @@ namespace Foam constGasHThermoPhysics ); + makeChemistryModel + ( + chemistryModel, + rhoChemistryModel, + constTransportGasHThermoPhysics + ); + makeChemistryModel ( chemistryModel, diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C index f17f5fa9..ff001a77 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C @@ -35,6 +35,7 @@ namespace Foam { // Chemistry solvers based on sensibleEnthalpy makeChemistrySolverTypes(psiChemistryModel, constGasHThermoPhysics); + makeChemistrySolverTypes(psiChemistryModel, constTransportGasHThermoPhysics); makeChemistrySolverTypes(psiChemistryModel, gasHThermoPhysics); makeChemistrySolverTypes(psiChemistryModel, canteraGasHThermoPhysics); makeChemistrySolverTypes @@ -49,6 +50,7 @@ namespace Foam ; makeChemistrySolverTypes(psiChemistryModel, icoPoly8HThermoPhysics); makeChemistrySolverTypes(rhoChemistryModel, constGasHThermoPhysics); + makeChemistrySolverTypes(rhoChemistryModel, constTransportGasHThermoPhysics); makeChemistrySolverTypes(rhoChemistryModel, gasHThermoPhysics); makeChemistrySolverTypes(rhoChemistryModel, canteraGasHThermoPhysics); makeChemistrySolverTypes diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C index 4530c826..e58bea95 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C @@ -40,6 +40,7 @@ namespace Foam // Solid chemistry readers based on sensibleEnthalpy makeChemistryReader(constGasHThermoPhysics); +makeChemistryReader(constTransportGasHThermoPhysics); makeChemistryReader(gasHThermoPhysics); makeChemistryReader(canteraGasHThermoPhysics); makeChemistryReader(constIncompressibleGasHThermoPhysics); @@ -47,6 +48,7 @@ makeChemistryReader(incompressibleGasHThermoPhysics); makeChemistryReader(icoPoly8HThermoPhysics); makeChemistryReaderType(foamChemistryReader, constGasHThermoPhysics); +makeChemistryReaderType(foamChemistryReader, constTransportGasHThermoPhysics); makeChemistryReaderType(foamChemistryReader, gasHThermoPhysics); makeChemistryReaderType(foamChemistryReader, canteraGasHThermoPhysics); makeChemistryReaderType diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C index 3f445204..d3637d1e 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C @@ -232,6 +232,15 @@ makeReactionMixtureThermo constGasHThermoPhysics ); +makeReactionMixtureThermo +( + psiThermo, + psiReactionThermo, + hePsiThermo, + reactingMixture, + constTransportGasHThermoPhysics +); + makeReactionMixtureThermo ( psiThermo, diff --git a/src/thermophysicalModels/specie/include/reactionTypes.H b/src/thermophysicalModels/specie/include/reactionTypes.H index 72fc5b1f..00581f82 100644 --- a/src/thermophysicalModels/specie/include/reactionTypes.H +++ b/src/thermophysicalModels/specie/include/reactionTypes.H @@ -46,6 +46,8 @@ namespace Foam // sensible enthalpy based reactions typedef Reaction constGasHReaction; + typedef Reaction constTransportGasHReaction; + typedef Reaction gasHReaction; typedef Reaction canteraGasHReaction; diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H index 828140f2..516a3635 100644 --- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H +++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H @@ -80,6 +80,19 @@ namespace Foam > > gasHThermoPhysics; + typedef + constTransport + < + species::thermo + < + janafThermo + < + perfectGas + >, + sensibleEnthalpy + > + > constTransportGasHThermoPhysics; + typedef canteraTransport < diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C index 08fb8dc2..9ef625f2 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C @@ -96,6 +96,7 @@ namespace Foam { // sensible enthalpy based reactions makeReactions(constGasHThermoPhysics, constGasHReaction) + makeReactions(constTransportGasHThermoPhysics, constTransportGasHReaction) makeReactions(gasHThermoPhysics, gasHReaction) makeReactions(canteraGasHThermoPhysics, canteraGasHReaction) makeReactions