From d4207f56c56d2acde3fca3dcd5fe468939c58ae8 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 20 Apr 2020 09:57:42 +0100 Subject: [PATCH] psiReactionThermophysicalTransportModel: ThermophysicalTransportModel instantiated on psiReactionThermo Updated reacting solvers to use psiReactionThermophysicalTransportModel or rhoReactionThermophysicalTransportModel as appropriate to provide support for interacting heat and specie transport. --- .../solvers/combustion/fireFoam/Make/options | 2 + .../combustion/fireFoam/createFields.H | 4 +- .../solvers/combustion/fireFoam/fireFoam.C | 2 +- .../combustion/reactingFoam/Make/options | 2 + .../combustion/reactingFoam/createFields.H | 4 +- .../combustion/reactingFoam/reactingFoam.C | 2 +- .../rhoReactingBuoyantFoam/Make/options | 2 + .../rhoReactingBuoyantFoam/createFields.H | 9 +- .../rhoReactingBuoyantFoam.C | 2 +- .../chtMultiRegionFoam/Make/options | 2 + .../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +- .../fluid/createFluidFields.H | 4 +- .../fluid/setRegionFluidFields.H | 2 +- .../lagrangian/coalChemistryFoam/Make/options | 2 + .../coalChemistryFoam/coalChemistryFoam.C | 2 +- .../coalChemistryFoam/createFields.H | 4 +- .../reactingParcelFoam/Make/options | 2 + .../reactingParcelFoam/createFields.H | 9 +- .../reactingParcelFoam/reactingParcelFoam.C | 2 +- .../simpleReactingParcelFoam/Make/options | 2 + .../simpleReactingParcelFoam/createFields.H | 9 +- .../simpleReactingParcelFoam.C | 2 +- .../solvers/lagrangian/sprayFoam/Make/options | 2 + .../lagrangian/sprayFoam/createFields.H | 4 +- .../sprayFoam/engineFoam/Make/options | 2 + .../sprayFoam/engineFoam/engineFoam.C | 2 +- .../solvers/lagrangian/sprayFoam/sprayFoam.C | 1 + src/ThermophysicalTransportModels/Allwmake | 1 + .../psiReactionThermo/Make/files | 3 + .../psiReactionThermo/Make/options | 17 ++++ .../psiReactionThermophysicalTransportModel.H | 81 ++++++++++++++++++ ...psiReactionThermophysicalTransportModels.C | 62 ++++++++++++++ ...psiReactionThermophysicalTransportModels.H | 82 +++++++++++++++++++ 33 files changed, 305 insertions(+), 25 deletions(-) create mode 100644 src/ThermophysicalTransportModels/psiReactionThermo/Make/files create mode 100644 src/ThermophysicalTransportModels/psiReactionThermo/Make/options create mode 100644 src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModel.H create mode 100644 src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.C create mode 100644 src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.H diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 99c5621770..85f90f3232 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -28,6 +29,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lpsiReactionThermophysicalTransportModels \ -lspecie \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 0eae486af8..6fd2fd48fc 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -65,9 +65,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + psiReactionThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index aeb6fc03e6..d8a6faa145 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "psiReactionThermophysicalTransportModel.H" #include "basicReactingCloud.H" #include "surfaceFilmModel.H" #include "radiationModel.H" diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index abfa4daab3..7aa232c8e7 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -20,6 +21,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lpsiReactionThermophysicalTransportModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index fc0c6d1d88..d365020944 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -62,9 +62,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + psiReactionThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating reaction model\n" << endl; diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 40d636264c..d32cdd5740 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "psiReactionThermophysicalTransportModel.H" #include "psiReactionThermo.H" #include "CombustionModel.H" #include "multivariateScheme.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index e9e306e8b1..8b4b02a225 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -24,6 +25,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lrhoReactionThermophysicalTransportModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index bc77022749..150fd57c48 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -63,9 +63,14 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr +thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + rhoReactionThermophysicalTransportModel::New + ( + turbulence(), + thermo + ) ); Info<< "Creating reaction model\n" << endl; diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index e32c64ee08..df355e7e8a 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -34,7 +34,7 @@ Description #include "rhoReactionThermo.H" #include "CombustionModel.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "rhoReactionThermophysicalTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 48a84f5ba4..f9abec6553 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -19,6 +19,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude @@ -34,6 +35,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lrhoReactionThermophysicalTransportModels \ -lmeshTools \ -lfiniteVolume \ -lradiationModels \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index ef50d567c8..be103c5163 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "rhoReactionThermophysicalTransportModel.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" #include "fixedGradientFvPatchFields.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index 86556eb53f..24788c0da9 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -9,7 +9,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()); @@ -164,7 +164,7 @@ forAll(fluidRegions, i) thermophysicalTransportFluid.set ( i, - fluidThermophysicalTransportModel::New + rhoReactionThermophysicalTransportModel::New ( turbulenceFluid[i], thermoFluid[i] diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 50cd8fcee9..d12f3398f1 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -28,7 +28,7 @@ surfaceScalarField& phi = phiFluid[i]; compressible::momentumTransportModel& turbulence = turbulenceFluid[i]; - fluidThermophysicalTransportModel& thermophysicalTransport = + rhoReactionThermophysicalTransportModel& thermophysicalTransport = thermophysicalTransportFluid[i]; volScalarField& K = KFluid[i]; diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 6a007cd77f..b2adc8faae 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -28,6 +29,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lpsiReactionThermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 12534c1cb9..652dda5124 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "psiReactionThermophysicalTransportModel.H" #include "basicThermoCloud.H" #include "coalCloud.H" #include "psiReactionThermo.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 00e0d68bdb..0c51864b8d 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -108,9 +108,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + psiReactionThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index f6d3f8b89e..04b9bb80f7 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -31,6 +32,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lrhoReactionThermophysicalTransportModels \ -lspecie \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index d223baa3c8..f406c50700 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -62,9 +62,14 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr +thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + rhoReactionThermophysicalTransportModel::New + ( + turbulence(), + thermo + ) ); Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index e530200517..69307f5314 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "rhoReactionThermophysicalTransportModel.H" #include "basicReactingMultiphaseCloud.H" #include "surfaceFilmModel.H" #include "rhoReactionThermo.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 45148e303f..1dde5a705b 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -30,6 +31,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lrhoReactionThermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index d772e29024..ccb2ec258a 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -85,9 +85,14 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr +thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + rhoReactionThermophysicalTransportModel::New + ( + turbulence(), + thermo + ) ); Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index 0ba5d29225..3c9631a652 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "rhoReactionThermophysicalTransportModel.H" #include "basicReactingMultiphaseCloud.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 9b187387d6..0459d9c2b5 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ @@ -30,6 +31,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lpsiReactionThermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 2f428aec17..1c7a456ded 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -87,9 +87,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + psiReactionThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index 1fb211632f..7955e92863 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ @@ -33,6 +34,7 @@ EXE_LIBS = \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ + -lpsiReactionThermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 543c22a6dc..d58c9740ef 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C @@ -34,7 +34,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "fluidThermoMomentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" +#include "psiReactionThermophysicalTransportModel.H" #include "basicSprayCloud.H" #include "psiReactionThermo.H" #include "CombustionModel.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 4e18697d10..95d48bf813 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -34,6 +34,7 @@ Description #include "dynamicFvMesh.H" #include "momentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" +#include "psiReactionThermophysicalTransportModel.H" #include "basicSprayCloud.H" #include "psiReactionThermo.H" #include "CombustionModel.H" diff --git a/src/ThermophysicalTransportModels/Allwmake b/src/ThermophysicalTransportModels/Allwmake index 03f304f4b2..efd6252185 100755 --- a/src/ThermophysicalTransportModels/Allwmake +++ b/src/ThermophysicalTransportModels/Allwmake @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments wmake $targetType +wmake $targetType psiReactionThermo wmake $targetType rhoReactionThermo #------------------------------------------------------------------------------ diff --git a/src/ThermophysicalTransportModels/psiReactionThermo/Make/files b/src/ThermophysicalTransportModels/psiReactionThermo/Make/files new file mode 100644 index 0000000000..97090ba1a7 --- /dev/null +++ b/src/ThermophysicalTransportModels/psiReactionThermo/Make/files @@ -0,0 +1,3 @@ +psiReactionThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libpsiReactionThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/psiReactionThermo/Make/options b/src/ThermophysicalTransportModels/psiReactionThermo/Make/options new file mode 100644 index 0000000000..461c395c23 --- /dev/null +++ b/src/ThermophysicalTransportModels/psiReactionThermo/Make/options @@ -0,0 +1,17 @@ +EXE_INC = \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -lfluidThermophysicalModels \ + -lreactionThermophysicalModels \ + -lmomentumTransportModels \ + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModel.H new file mode 100644 index 0000000000..823248f88a --- /dev/null +++ b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModel.H @@ -0,0 +1,81 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Typedef + Foam::compressible::thermophysicalTransportModel + +Typedef + Foam::compressible::laminarThermophysicalTransportModel + +Typedef + Foam::compressible::RASThermophysicalTransportModel + +Typedef + Foam::compressible::LESThermophysicalTransportModel + +Description + Typedefs for laminar, RAS and LES thermophysical transport models + for psiReactionThermo flow. + +\*---------------------------------------------------------------------------*/ + +#ifndef psiReactionThermophysicalTransportModel_H +#define psiReactionThermophysicalTransportModel_H + +#include "psiReactionThermo.H" +#include "laminarThermophysicalTransportModel.H" +#include "RASThermophysicalTransportModel.H" +#include "LESThermophysicalTransportModel.H" +#include "fluidThermoMomentumTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef ThermophysicalTransportModel + < + compressible::momentumTransportModel, + psiReactionThermo + > psiReactionThermophysicalTransportModel; + + typedef laminarThermophysicalTransportModel + < + psiReactionThermophysicalTransportModel + > laminarRhoReactionThermophysicalTransportModel; + + typedef RASThermophysicalTransportModel + < + psiReactionThermophysicalTransportModel + > RASRhoReactionThermophysicalTransportModel; + + typedef LESThermophysicalTransportModel + < + psiReactionThermophysicalTransportModel + > LESRhoReactionThermophysicalTransportModel; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.C new file mode 100644 index 0000000000..23d2eb089e --- /dev/null +++ b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.C @@ -0,0 +1,62 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "psiReactionThermophysicalTransportModels.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeThermophysicalTransportModels +( + ThermophysicalTransportModel, + fluidThermoCompressibleMomentumTransportModel, + psiReactionThermo +); + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Fourier.H" +makeLaminarThermophysicalTransportModel(Fourier); + + +// -------------------------------------------------------------------------- // +// RAS models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); + + +// -------------------------------------------------------------------------- // +// LES models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); + + +// ************************************************************************* // diff --git a/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.H new file mode 100644 index 0000000000..daa6b0c117 --- /dev/null +++ b/src/ThermophysicalTransportModels/psiReactionThermo/psiReactionThermophysicalTransportModels.H @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "psiReactionThermophysicalTransportModel.H" +#include "fluidThermoMomentumTransportModels.H" +#include "makeThermophysicalTransportModel.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeThermophysicalTransportModelTypes +( + ThermophysicalTransportModel, + fluidThermoCompressibleMomentumTransportModel, + psiReactionThermo +); + + +#define makeLaminarThermophysicalTransportModel(Type) \ + makeThermophysicalTransportModel \ + ( \ + ThermophysicalTransportModel, \ + fluidThermoCompressibleMomentumTransportModel, \ + psiReactionThermo, \ + laminar, \ + Type \ + ) + +#define makeRASLESThermophysicalTransportModel(SType, Type) \ + makeTurbulenceThermophysicalTransportModel \ + ( \ + ThermophysicalTransportModel, \ + fluidThermoCompressibleMomentumTransportModel, \ + psiReactionThermo, \ + SType, \ + Type \ + ) + +#define makeRASThermophysicalTransportModel(Type) \ + makeThermophysicalTransportModel \ + ( \ + ThermophysicalTransportModel, \ + fluidThermoCompressibleMomentumTransportModel, \ + psiReactionThermo, \ + RAS, \ + Type \ + ) + +#define makeLESThermophysicalTransportModel(Type) \ + makeThermophysicalTransportModel \ + ( \ + ThermophysicalTransportModel, \ + fluidThermoCompressibleMomentumTransportModel, \ + psiReactionThermo, \ + LES, \ + Type \ + ) + + +// ************************************************************************* //