diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index a0bd72c3b4b73d2d0a28a80acb40f7a95d7ec863..7805adf8d76f7f4753a89aa5115aef2437c479c4 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -45,7 +45,6 @@ Description #include "solidRegionDiffNo.H" #include "solidThermo.H" #include "radiationModel.H" -#include "IOporosityModelList.H" #include "IObasicSourceList.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H index d30848804e830b517accca121df2e741be4f1dcf..cc5eda691d9e2779a037f950e4cb93b0f183accd 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H @@ -17,7 +17,7 @@ PtrList<dimensionedScalar> rhoMax(fluidRegions.size()); PtrList<dimensionedScalar> rhoMin(fluidRegions.size()); - PtrList<IObasicSourceList> heatSources(fluidRegions.size()); + PtrList<IObasicSourceList> fluidSources(fluidRegions.size()); // Populate fluid field pointer lists forAll(fluidRegions, i) @@ -194,7 +194,7 @@ ); Info<< " Adding sources\n" << endl; - heatSources.set + fluidSources.set ( i, new IObasicSourceList(fluidRegions[i]) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H index ee005e0d22964bab19e15fb14ef680bdeeaf8371..935b27d57ce1bc83e40aa8113f66fba0bad8ddd2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H @@ -12,7 +12,7 @@ volScalarField& p = thermo.p(); const volScalarField& psi = thermo.psi(); - IObasicSourceList& sources = heatSources[i]; + IObasicSourceList& sources = fluidSources[i]; const dimensionedScalar initialMass ( diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H index 0162955f3764ee58b5dfd24a25ae608692ab8a87..9c32ec054e1e9537fb01b020dd153003f82ce984 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H @@ -11,9 +11,6 @@ sources.constrain(UEqn()); - // Add porous resistance - pZones.addResistance(UEqn()); - if (momentumPredictor) { solve diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index a2021a5edc66f83255886fc86c18535c4c2e689d..fbc39c85569d6e478ab99659512b2493d9dbf89c 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -14,8 +14,7 @@ List<scalar> initialMassFluid(fluidRegions.size()); - PtrList<IObasicSourceList> heatSources(fluidRegions.size()); - PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size()); + PtrList<IObasicSourceList> fluidSources(fluidRegions.size()); // Populate fluid field pointer lists forAll(fluidRegions, i) @@ -192,16 +191,9 @@ ); Info<< " Adding sources\n" << endl; - heatSources.set + fluidSources.set ( i, new IObasicSourceList(fluidRegions[i]) ); - - Info<< " Adding porous zones\n" << endl; - porousZonesFluid.set - ( - i, - new IOporosityModelList(fluidRegions[i]) - ); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 28f0ea96834746cf0dfafaea0951bbd8a5b5503c..84a22048e422f86bf48d47b9e2c2891981495e38 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -20,9 +20,7 @@ radiation::radiationModel& rad = radiation[i]; - IObasicSourceList& sources = heatSources[i]; - - const IOporosityModelList& pZones = porousZonesFluid[i]; + IObasicSourceList& sources = fluidSources[i]; const dimensionedScalar initialMass (