diff --git a/Allwclean b/Allwclean index 569262a61..fa17a8986 100755 --- a/Allwclean +++ b/Allwclean @@ -21,6 +21,7 @@ wclean ./applications/solvers/dfSprayFoam wclean ./applications/solvers/df0DFoam wclean ./applications/solvers/dfLowMachFoam wclean ./applications/solvers/dfHighSpeedFoam +wclean ./applications/solvers/dfBuoyancyFoam rm -rf src_orig/ rm -rf bin/ diff --git a/applications/solvers/dfBuoyancyFoam/Make/options b/applications/solvers/dfBuoyancyFoam/Make/options index 24a198dc9..24ec8e59d 100644 --- a/applications/solvers/dfBuoyancyFoam/Make/options +++ b/applications/solvers/dfBuoyancyFoam/Make/options @@ -32,6 +32,7 @@ EXE_INC = -std=c++14 \ -I$(DF_SRC)/dfCanteraMixture/lnInclude \ -I$(DF_SRC)/dfChemistryModel/lnInclude \ -I$(DF_SRC)/dfCombustionModels/lnInclude \ + -I$(DF_SRC)/radiationModels/lnInclude \ -I$(CANTERA_ROOT)/include \ $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include,) \ $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include/torch/csrc/api/include,) \ @@ -62,6 +63,7 @@ EXE_LIBS = \ -ldfCanteraMixture \ -ldfChemistryModel \ -ldfCombustionModels \ + -ldfRadiationModels \ $(CANTERA_ROOT)/lib/libcantera.so \ $(if $(LIBTORCH_ROOT),$(LIBTORCH_ROOT)/lib/libtorch.so,) \ $(if $(LIBTORCH_ROOT),$(LIBTORCH_ROOT)/lib/libc10.so,) \ diff --git a/applications/solvers/dfBuoyancyFoam/YEEqn.H b/applications/solvers/dfBuoyancyFoam/YEEqn.H index 245aeda0d..c1b9c48ce 100644 --- a/applications/solvers/dfBuoyancyFoam/YEEqn.H +++ b/applications/solvers/dfBuoyancyFoam/YEEqn.H @@ -9,7 +9,7 @@ tmp> mvConvection ) ); { - // radiation->correct(); + radiation->correct(); combustion->correct(); HRR = combustion->Qdot(); @@ -68,8 +68,8 @@ tmp> mvConvection - fvm::laplacian(turbulence->alphaEff(), he) == // combustion->Qdot() // ha Eqn has no reaction source - // + radiation->Sh(thermo, he) - parcels.Sh(he) + radiation->Sh(thermo, he) + + parcels.Sh(he) // + surfaceFilm.Sh() // + fvOptions(rho, he) ); diff --git a/applications/solvers/dfBuoyancyFoam/createFields.H b/applications/solvers/dfBuoyancyFoam/createFields.H index 6b9464c8f..bb9ba1e06 100644 --- a/applications/solvers/dfBuoyancyFoam/createFields.H +++ b/applications/solvers/dfBuoyancyFoam/createFields.H @@ -164,5 +164,5 @@ volScalarField K("K", 0.5*magSqr(U)); #include "createClouds.H" #include "createSurfaceFilmModel.H" // #include "createPyrolysisModel.H" -// #include "createRadiationModel.H" +#include "createRadiationModel.H" // #include "createFvOptions.H" diff --git a/applications/solvers/dfBuoyancyFoam/dfBuoyancyFoam.C b/applications/solvers/dfBuoyancyFoam/dfBuoyancyFoam.C index b32a006b6..68b7b679e 100644 --- a/applications/solvers/dfBuoyancyFoam/dfBuoyancyFoam.C +++ b/applications/solvers/dfBuoyancyFoam/dfBuoyancyFoam.C @@ -42,7 +42,7 @@ Description #include "basicReactingCloud.H" #include "surfaceFilmModel.H" #include "pyrolysisModelCollection.H" -// #include "radiationModel.H" +#include "radiationModel.H" #include "SLGThermo.H" // #include "solidChemistryModel.H" // #include "psiReactionThermo.H"