diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options index 30c3b5d6a153a9837675ae93228e607eb507b296..bfe0fa7d39c30b9e590b7a10baaa62bf145fdb39 100644 --- a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options @@ -20,7 +20,10 @@ EXE_INC = \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude + -I$(LIB_SRC)/combustionModels/lnInclude \ + -I$(LIB_SRC)/fieldSources/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude + EXE_LIBS = \ -lfiniteVolume \ @@ -44,4 +47,6 @@ EXE_LIBS = \ -lODE \ -lregionModels \ -lsurfaceFilmModels \ - -lcombustionModels + -lcombustionModels \ + -lfieldSources \ + -lsampling diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index a63bfce6ab296921406ef84dfc8de185405c9f89..b9137a48fa279b6ac88aae50d54590546617479b 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -37,13 +37,13 @@ do done # Run -runParallel `getApplication` 4 +#runParallel `getApplication` 4 # Reconstruct -for i in bottomAir topAir heater leftSolid rightSolid -do - reconstructPar -region $i > log.reconstructPar.$i2 >&1 -done +#for i in bottomAir topAir heater leftSolid rightSolid +#do +# reconstructPar -region $i > log.reconstructPar.$i2 >&1 +#done echo diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties index 67629a878b29a468488555018ad2f66da330ffbe..dc0d1417d50c1d65060dbee01ac954166a99e5d3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties @@ -15,8 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluidRegionNames ( bottomAir topAir ); - -solidRegionNames ( heater leftSolid rightSolid ); +regions +( + fluid (bottomAir topAir) + solid (heater leftSolid rightSolid) + porousFluid () + porousSolid () +); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties index 138248c73f436f010eb18947ef973a9df90b14fb..d76684c2cddba17a9d809b86225e36a95258dae3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties @@ -15,8 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluidRegionNames ( bottomWater topAir ); - -solidRegionNames ( heater leftSolid rightSolid ); +regions +( + fluid (bottomWater topAir) + solid (heater leftSolid rightSolid) + porousFluid () + porousSolid () +); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties index 67629a878b29a468488555018ad2f66da330ffbe..9ca5dc857c35bb5b70fc26e27f990a4c6c77e438 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties @@ -15,8 +15,13 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluidRegionNames ( bottomAir topAir ); +regions +( + fluid (bottomAir topAir) + solid (heater leftSolid rightSolid) + porousFluid () + porousSolid () +); -solidRegionNames ( heater leftSolid rightSolid ); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties index 67629a878b29a468488555018ad2f66da330ffbe..dc0d1417d50c1d65060dbee01ac954166a99e5d3 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties @@ -15,8 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluidRegionNames ( bottomAir topAir ); - -solidRegionNames ( heater leftSolid rightSolid ); +regions +( + fluid (bottomAir topAir) + solid (heater leftSolid rightSolid) + porousFluid () + porousSolid () +); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties index 67629a878b29a468488555018ad2f66da330ffbe..dc0d1417d50c1d65060dbee01ac954166a99e5d3 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties @@ -15,8 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluidRegionNames ( bottomAir topAir ); - -solidRegionNames ( heater leftSolid rightSolid ); +regions +( + fluid (bottomAir topAir) + solid (heater leftSolid rightSolid) + porousFluid () + porousSolid () +); // ************************************************************************* //