ENH: Updates to porosity solvers

This commit is contained in:
andy
2012-10-18 16:39:06 +01:00
parent 4cc5aa152e
commit af8f5ed606
16 changed files with 19 additions and 19 deletions

View File

@ -38,7 +38,7 @@ Description
#include "psiThermo.H"
#include "turbulenceModel.H"
#include "MRFZones.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "fvcSmooth.H"
#include "pimpleControl.H"
#include "bound.H"

View File

@ -1,5 +1,5 @@
MRFZones mrfZones(mesh);
mrfZones.correctBoundaryVelocity(U);
porousZones pZones(mesh);
IOporosityModelList pZones(mesh);
Switch pressureImplicitPorosity(false);

View File

@ -38,7 +38,7 @@ Description
#include "turbulenceModel.H"
#include "bound.H"
#include "MRFZones.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -6,7 +6,7 @@
// nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
if (pZones.size())
if (pZones.active())
{
// nUCorrectors for pressureImplicitPorosity
simple.dict().readIfPresent("nUCorrectors", nUCorr);

View File

@ -45,7 +45,7 @@ Description
#include "solidRegionDiffNo.H"
#include "solidThermo.H"
#include "radiationModel.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "IObasicSourceList.H"

View File

@ -36,7 +36,7 @@ Description
#include "regionProperties.H"
#include "solidThermo.H"
#include "radiationModel.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "IObasicSourceList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -18,7 +18,7 @@
PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
PtrList<IObasicSourceList> heatSources(fluidRegions.size());
PtrList<porousZones> porousZonesFluid(fluidRegions.size());
PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size());
// Populate fluid field pointer lists
forAll(fluidRegions, i)
@ -205,7 +205,7 @@
porousZonesFluid.set
(
i,
new porousZones(fluidRegions[i])
new IOporosityModelList(fluidRegions[i])
);
}

View File

@ -14,7 +14,7 @@
IObasicSourceList& sources = heatSources[i];
const porousZones& pZones = porousZonesFluid[i];
const IOporosityModelList& pZones = porousZonesFluid[i];
const dimensionedScalar initialMass
(

View File

@ -15,7 +15,7 @@
List<scalar> initialMassFluid(fluidRegions.size());
PtrList<IObasicSourceList> heatSources(fluidRegions.size());
PtrList<porousZones> porousZonesFluid(fluidRegions.size());
PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size());
// Populate fluid field pointer lists
forAll(fluidRegions, i)
@ -202,6 +202,6 @@
porousZonesFluid.set
(
i,
new porousZones(fluidRegions[i])
new IOporosityModelList(fluidRegions[i])
);
}

View File

@ -22,7 +22,7 @@
IObasicSourceList& sources = heatSources[i];
const porousZones& pZones = porousZonesFluid[i];
const IOporosityModelList& pZones = porousZonesFluid[i];
const dimensionedScalar initialMass
(

View File

@ -40,7 +40,7 @@ Description
#include "basicReactingMultiphaseCloud.H"
#include "rhoCombustionModel.H"
#include "radiationModel.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "IObasicSourceList.H"
#include "SLGThermo.H"
#include "fvcSmooth.H"

View File

@ -1,3 +1,3 @@
Info<< "Creating porous zones" << nl << endl;
porousZones pZones(mesh);
IOporosityModelList pZones(mesh);

View File

@ -10,7 +10,7 @@
HbyA = rAU*(UEqn == sources(rho, U))().H();
surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
if (pZones.size() == 0)
if (!pZones.active())
{
// ddtPhiCorr only used without porosity
phiHbyA += fvc::ddtPhiCorr(rAU, rho, U, phi);

View File

@ -44,7 +44,7 @@ Description
#include "basicReactingMultiphaseCloud.H"
#include "rhoCombustionModel.H"
#include "radiationModel.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "IObasicSourceList.H"
#include "SLGThermo.H"
#include "pimpleControl.H"

View File

@ -1 +1 @@
porousZones pZones(mesh);
IOporosityModelList pZones(mesh);

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ Description
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
#include "turbulenceModel.H"
#include "porousZones.H"
#include "IOporosityModelList.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //