From 08767723cb088adec9c3f59b4a56509e05603fc6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 10 Dec 2012 11:03:23 +0000
Subject: [PATCH] ENH: Updated handling of source contributions in CHT solvers
---
.../chtMultiRegionFoam/chtMultiRegionFoam.C | 1 -
.../fluid/createFluidFields.H | 4 ++--
.../fluid/setRegionFluidFields.H | 2 +-
.../heatTransfer/chtMultiRegionFoam/fluid/UEqn.H | 3 ---
.../chtMultiRegionFoam/fluid/createFluidFields.H | 12 ++----------
.../chtMultiRegionFoam/fluid/setRegionFluidFields.H | 4 +---
6 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index a0bd72c3b4b..7805adf8d76 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 d30848804e8..cc5eda691d9 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 ee005e0d229..935b27d57ce 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 0162955f376..9c32ec054e1 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 a2021a5edc6..fbc39c85569 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 28f0ea96834..84a22048e42 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
(
--
GitLab