diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options index b922d0f573..e80fe3d1a2 100644 --- a/src/regionModels/pyrolysisModels/Make/options +++ b/src/regionModels/pyrolysisModels/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \ @@ -28,4 +29,5 @@ LIB_LIBS = \ -lcompressibleLESModels \ -lLESdeltas \ -lregionModels \ - -lradiationModels + -lradiationModels \ + -lreactionThermophysicalModels diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index 7e40068412..a36d8a5bb7 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 72255b9439..025bc2156f 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -4,6 +4,7 @@ makeType=${1:-libso} set -x wmake $makeType specie +wmake $makeType solidSpecie wmake $makeType thermophysicalFunctions ./properties/Allwmake $* @@ -15,7 +16,7 @@ wmake $makeType barotropicCompressibilityModel wmake $makeType thermalPorousZone wmake $makeType SLGThermo -wmake $makeType solidSpecie + wmake $makeType solidThermo wmake $makeType solidChemistryModel diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H index b2401e1123..52978db2e5 100644 --- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H +++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H @@ -87,6 +87,27 @@ public: return mixture_; } + const ThermoType& cellVolMixture + ( + const scalar, + const scalar, + const label + ) const + { + return mixture_; + } + + const ThermoType& patchFaceVolMixture + ( + const scalar, + const scalar, + const label, + const label + ) const + { + return mixture_; + } + //- Read dictionary void read(const dictionary&); }; diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C index 1d2c76d036..5121436412 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "unitConversion.H" #include "zeroGradientFvPatchFields.H" -#include "basicSolidMixture.H" + // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -71,7 +71,7 @@ greyMeanSolidAbsorptionEmission::X(const word specie) const } } const scalarField& Yj = mixture_.Y(specie); - const label mySpecieI = mixture_.components()[specie]; + const label mySpecieI = mixture_.species()[specie]; forAll(Xj, iCell) { Xj[iCell] = Yj[iCell]/mixture_.rho(mySpecieI, p[iCell], T[iCell]); @@ -93,10 +93,10 @@ greyMeanSolidAbsorptionEmission coeffsDict_((dict.subDict(typeName + "Coeffs"))), thermo_(mesh.lookupObject("thermophysicalProperties")), speciesNames_(0), - mixture_(dynamic_cast(thermo_)), + mixture_(dynamic_cast(thermo_)), solidData_(mixture_.Y().size()) { - if (!isA(thermo_)) + if (!isA(thermo_)) { FatalErrorIn ( diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H index 3eed717f21..6e965c98e8 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H @@ -90,7 +90,7 @@ private: HashTable