zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fvMesh: fvSchemes and fvSolution are now demand-driven

Browse Source 
fvMesh is no longer derived from fvSchemes and fvSolution, these are now
demand-driven and accessed by the member functions schemes() and solution()
respectively.  This means that the system/fvSchemes and system/fvSolution files
are no longer required during fvMesh constructions simplifying the mesh
generation and manipulation phase; theses files are read on the first call of
their access functions.

The fvSchemes member function names have also been simplified taking advantage
of the context in which they are called, for example

    mesh.ddtScheme(fieldName) -> mesh.schemes().ddt(fieldName)
This commit is contained in:
Henry Weller
2022-03-23 16:23:55 +00:00
parent acd5528557
commit ddbf2d7853
122 changed files with 418 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/DNS/dnsFoam/createFields.H
View File

@ -30,6 +30,6 @@ volVectorField U
#include "createPhi.H"
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
#include "readTurbulenceProperties.H"

2
applications/solvers/basic/potentialFoam/createControls.H
View File

@ -1,6 +1,6 @@
const dictionary& potentialFlow
(
mesh.solutionDict().subDict("potentialFlow")
mesh.solution().dict().subDict("potentialFlow")
);
const int nNonOrthCorr

2
applications/solvers/basic/potentialFoam/createFields.H
View File

@ -111,6 +111,6 @@ setRefCell
PhiRefCell,
PhiRefValue
);
mesh.setFluxRequired(Phi.name());
mesh.schemes().setFluxRequired(Phi.name());
#include "createMRF.H"

2
applications/solvers/combustion/XiFoam/PDRFoam/bEqn.H
View File

@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
mesh,
fields,
phi,
mesh.divScheme("div(phi,ft_b_ha_hau)")
mesh.schemes().div("div(phi,ft_b_ha_hau)")
)
);

2
applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
View File

@ -43,7 +43,7 @@ volVectorField U
#include "compressibleCreatePhi.H"
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::RASModel> turbulence

2
applications/solvers/combustion/XiFoam/createFields.H
View File

@ -44,7 +44,7 @@ volVectorField U
#include "compressibleCreatePhi.H"
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::momentumTransportModel> turbulence

2
applications/solvers/combustion/XiFoam/ftEqn.H
View File

@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
mesh,
fields,
phi,
mesh.divScheme("div(phi,ft_b_ha_hau)")
mesh.schemes().div("div(phi,ft_b_ha_hau)")
)
);

2
applications/solvers/combustion/reactingFoam/YEqn.H
View File

@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
mesh,
fields,
phi,
mesh.divScheme("div(phi,Yi_h)")
mesh.schemes().div("div(phi,Yi_h)")
)
);

4
applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H
View File

@ -39,7 +39,7 @@ volScalarField& p = thermo.p();
#include "compressibleCreatePhi.H"
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info << "Creating turbulence model.\n" << nl;
autoPtr<compressible::momentumTransportModel> turbulence
@ -94,7 +94,7 @@ pressureReference pressureReference
thermo.incompressible()
);
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
hydrostaticInitialisation
(

2
applications/solvers/combustion/reactingFoam/createFields.H
View File

@ -40,7 +40,7 @@ volScalarField& p = thermo.p();
pressureReference pressureReference(p, pimple.dict(), false);
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info << "Creating turbulence model.\n" << nl;

2
applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
View File

@ -1,5 +1,5 @@
word fluxScheme("Kurganov");
if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
if (mesh.schemes().dict().readIfPresent("fluxScheme", fluxScheme))
{
if ((fluxScheme == "Tadmor") || (fluxScheme == "Kurganov"))
{

2
applications/solvers/compressible/rhoPimpleFoam/createFields.H
View File

@ -47,7 +47,7 @@ pressureReference pressureReference
thermo.incompressible()
);
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::momentumTransportModel> turbulence

10
applications/solvers/compressible/rhoPimpleFoam/pEqn.H
View File

@ -95,7 +95,7 @@ if (pimple.transonic())
}
else
{
if (mesh.steady())
if (mesh.schemes().steady())
{
adjustMass = adjustPhi(phiHbyA, U, p);
}
@ -133,7 +133,7 @@ else
}
}
if (mesh.steady())
if (mesh.schemes().steady())
{
#include "incompressible/continuityErrs.H"
}
@ -161,7 +161,7 @@ U.correctBoundaryConditions();
fvConstraints.constrain(U);
K = 0.5*magSqr(U);
if (mesh.steady())
if (mesh.schemes().steady())
{
fvConstraints.constrain(p);
}
@ -175,7 +175,7 @@ if (adjustMass && !thermo.incompressible())
p.correctBoundaryConditions();
}
if (mesh.steady() || pimple.simpleRho() || adjustMass)
if (mesh.schemes().steady() || pimple.simpleRho() || adjustMass)
{
rho = thermo.rho();
}
@ -183,7 +183,7 @@ if (mesh.steady() || pimple.simpleRho() || adjustMass)
// Correct rhoUf if the mesh is moving
fvc::correctRhoUf(rhoUf, rho, U, phi);
if (mesh.steady() || pimple.simpleRho())
if (mesh.schemes().steady() || pimple.simpleRho())
{
rho.relax();
}

6
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -138,7 +138,7 @@ int main(int argc, char *argv[])
if
(
!mesh.steady()
!mesh.schemes().steady()
&& !pimple.simpleRho()
&& pimple.firstPimpleIter()
)
@ -164,7 +164,7 @@ int main(int argc, char *argv[])
}
}
if (!mesh.steady())
if (!mesh.schemes().steady())
{
rho = thermo.rho();
}

2
applications/solvers/compressible/rhoSimpleFoam/createFields.H
View File

@ -45,7 +45,7 @@ pressureReference pressureReference
thermo.incompressible()
);
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::momentumTransportModel> turbulence

4
applications/solvers/electromagnetics/mhdFoam/createFields.H
View File

@ -111,5 +111,5 @@ DBU.name() = "DBU";
pressureReference pressureReference(p, piso.dict());
mesh.setFluxRequired(p.name());
mesh.setFluxRequired(pB.name());
mesh.schemes().setFluxRequired(p.name());
mesh.schemes().setFluxRequired(pB.name());

2
applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
View File

@ -1,3 +1,3 @@
const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
const dictionary& Bpiso = mesh.solution().dict().subDict("BPISO");
const int nBcorr = Bpiso.lookupOrDefault<int>("nCorrectors", 1);

2
applications/solvers/heatTransfer/buoyantFoam/createFields.H
View File

@ -84,7 +84,7 @@ pressureReference pressureReference
thermo.incompressible()
);
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
hydrostaticInitialisation
(

10
applications/solvers/heatTransfer/buoyantFoam/pEqn.H
View File

@ -23,7 +23,7 @@ surfaceScalarField phiHbyA
MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
bool adjustMass = mesh.steady() && adjustPhi(phiHbyA, U, p_rgh);
bool adjustMass = mesh.schemes().steady() && adjustPhi(phiHbyA, U, p_rgh);
const surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
@ -97,7 +97,7 @@ else
phi = phiHbyA + p_rghEqn.flux();
if (mesh.steady())
if (mesh.schemes().steady())
{
#include "incompressible/continuityErrs.H"
}
@ -131,7 +131,7 @@ U.correctBoundaryConditions();
fvConstraints.constrain(U);
K = 0.5*magSqr(U);
if (mesh.steady())
if (mesh.schemes().steady())
{
if (fvConstraints.constrain(p))
{
@ -150,12 +150,12 @@ if (adjustMass && !thermo.incompressible())
p_rgh.correctBoundaryConditions();
}
if (mesh.steady() || pimple.simpleRho() || adjustMass)
if (mesh.schemes().steady() || pimple.simpleRho() || adjustMass)
{
rho = thermo.rho();
}
if (mesh.steady() || pimple.simpleRho())
if (mesh.schemes().steady() || pimple.simpleRho())
{
rho.relax();
}

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
View File

@ -7,7 +7,7 @@ if (Y.size())
mesh,
fields,
phi,
mesh.divScheme("div(phi,Yi_h)")
mesh.schemes().div("div(phi,Yi_h)")
)
);
}

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View File

@ -214,7 +214,7 @@ forAll(fluidRegions, i)
)
);
fluidRegions[i].setFluxRequired(p_rghFluid[i].name());
fluidRegions[i].schemes().setFluxRequired(p_rghFluid[i].name());
initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
View File

@ -20,7 +20,7 @@ else
{
if (Ecorr == 0)
{
if (!mesh.steady() && pimples.firstPimpleIter())
if (!mesh.schemes().steady() && pimples.firstPimpleIter())
{
#include "rhoEqn.H"
}
@ -61,7 +61,7 @@ else
thermophysicalTransport.correct();
}
if (!mesh.steady() && pimples.finalPimpleIter())
if (!mesh.schemes().steady() && pimples.finalPimpleIter())
{
rho = thermo.rho();
}

4
applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,7 +55,7 @@ int main(int argc, char *argv[])
Info<< "\nEvolving thermodynamics\n" << endl;
if (mesh.solutionDict().found("SIMPLE"))
if (mesh.solution().dict().found("SIMPLE"))
{
simpleControl simple(mesh);

4
applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,7 +97,7 @@ int main(int argc, char *argv[])
// mesh.relaxationFactor("alpha")
// *(lambda*max(Ua & U, zeroSensitivity) - alpha);
alpha +=
mesh.fieldRelaxationFactor("alpha")
mesh.solution().fieldRelaxationFactor("alpha")
*(min(max(alpha + lambda*(Ua & U), zeroAlpha), alphaMax) - alpha);
zeroCells(alpha, inletCells);

4
applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H
View File

@ -31,7 +31,7 @@ volVectorField U
pressureReference pressureReference(p, simple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Reading field pa\n" << endl;
@ -74,7 +74,7 @@ setRefCell
paRefCell,
paRefValue
);
mesh.setFluxRequired(pa.name());
mesh.schemes().setFluxRequired(pa.name());
autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));

4
applications/solvers/incompressible/icoFoam/createFields.H
View File

@ -54,5 +54,5 @@ volVectorField U
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
setRefCell(p, mesh.solution().dict().subDict("PISO"), pRefCell, pRefValue);
mesh.schemes().setFluxRequired(p.name());

2
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
View File

@ -41,7 +41,7 @@ surfaceScalarField phi
);
pressureReference pressureReference(p, pimple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating SRF model\n" << endl;
autoPtr<SRF::SRFModel> SRF

2
applications/solvers/incompressible/pimpleFoam/createFields.H
View File

@ -32,7 +32,7 @@ volVectorField U
pressureReference pressureReference(p, pimple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));

2
applications/solvers/incompressible/pisoFoam/createFields.H
View File

@ -31,7 +31,7 @@ volVectorField U
pressureReference pressureReference(p, piso.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));

2
applications/solvers/incompressible/shallowWaterFoam/createFields.H
View File

@ -76,4 +76,4 @@ hTotal.write();
Info<< "Creating Coriolis Force" << endl;
const dimensionedVector F("F", ((2.0*Omega) & gHat)*gHat);
mesh.setFluxRequired(h.name());
mesh.schemes().setFluxRequired(h.name());

2
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
View File

@ -42,7 +42,7 @@ surfaceScalarField phi
pressureReference pressureReference(p, simple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating SRF model\n" << endl;
autoPtr<SRF::SRFModel> SRF(SRF::SRFModel::New(Urel));

2
applications/solvers/incompressible/simpleFoam/createFields.H
View File

@ -30,7 +30,7 @@ volVectorField U
pressureReference pressureReference(p, simple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));

4
applications/solvers/lagrangian/denseParticleFoam/createFields.H
View File

@ -61,7 +61,7 @@ surfaceScalarField phic
pressureReference pressureReference(p, pimple.dict());
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
Info<< "Creating turbulence model\n" << endl;
@ -127,7 +127,7 @@ parcelCloudList clouds(rhoc, Uc, muc, g);
// Particle fraction upper limit
scalar alphacMin
(
1 - mesh.solverDict(alphac.name()).lookup<scalar>("max")
1 - mesh.solution().solverDict(alphac.name()).lookup<scalar>("max")
);
// Update alphac from the particle locations

2
applications/solvers/multiphase/cavitatingFoam/correctPhi.H
View File

@ -22,7 +22,7 @@ correctUphiBCs(U, phi, true);
surfaceScalarField rhof(fvc::interpolate(rho, "div(phi,rho)"));
dimensionedScalar rAUf("rAUf", dimTime, 1.0);
mesh.setFluxRequired(pcorr.name());
mesh.schemes().setFluxRequired(pcorr.name());
while (pimple.correctNonOrthogonal())
{

6
applications/solvers/multiphase/cavitatingFoam/createFields.H
View File

@ -43,7 +43,7 @@ volVectorField U
#include "createPhi.H"
mesh.setFluxRequired(p.name());
mesh.schemes().setFluxRequired(p.name());
// Mass flux (corrected by rhoEqn.H)
surfaceScalarField rhoPhi
@ -86,8 +86,8 @@ rho == max
rhoMin
);
mesh.setFluxRequired(p.name());
mesh.setFluxRequired(rho.name());
mesh.schemes().setFluxRequired(p.name());
mesh.schemes().setFluxRequired(rho.name());
// Create incompressible turbulence model
autoPtr<incompressible::momentumTransportModel> turbulence

4
applications/solvers/multiphase/compressibleInterFoam/createFields.H
View File

@ -48,8 +48,8 @@ dimensionedScalar pMin
mixture
);
mesh.setFluxRequired(p_rgh.name());
mesh.setFluxRequired(alpha1.name());
mesh.schemes().setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(alpha1.name());
#include "readGravitationalAcceleration.H"

2
applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
View File

@ -332,7 +332,7 @@ void Foam::compressibleMultiphaseMixture::solve()
{
const Time& runTime = mesh_.time();
const dictionary& alphaControls = mesh_.solverDict("alpha");
const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
scalar cAlpha(alphaControls.lookup<scalar>("cAlpha"));

2
applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
View File

@ -35,7 +35,7 @@ const volScalarField& rho = mixture.rho();
dimensionedScalar pMin("pMin", dimPressure, mixture);
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
#include "readGravitationalAcceleration.H"

2
applications/solvers/multiphase/driftFluxFoam/alphaControls.H
View File

@ -1,4 +1,4 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));

4
applications/solvers/multiphase/driftFluxFoam/createFields.H
View File

@ -103,8 +103,8 @@ if (p_rgh.needReference())
p_rgh = p - rho*gh;
}
mesh.setFluxRequired(p_rgh.name());
mesh.setFluxRequired(alpha1.name());
mesh.schemes().setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(alpha1.name());
// MULES Correction
tmp<surfaceScalarField> talphaPhiCorr0;

4
applications/solvers/multiphase/interFoam/createFields.H
View File

@ -87,10 +87,10 @@ if (p_rgh.needReference())
p_rgh = p - rho*gh;
}
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
volScalarField& alpha1(mixture.alpha1());
mesh.setFluxRequired(alpha1.name());
mesh.schemes().setFluxRequired(alpha1.name());
#include "createAlphaFluxes.H"

2
applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
View File

@ -1,4 +1,4 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));

4
applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
View File

@ -113,8 +113,8 @@ if (p_rgh.needReference())
p_rgh = p - rho*gh;
}
mesh.setFluxRequired(p_rgh.name());
mesh.setFluxRequired(alpha2.name());
mesh.schemes().setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(alpha2.name());
#include "createMRF.H"
#include "createFvModels.H"

4
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -154,7 +154,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
mixture_(mixture),
cAlpha_
(
mixture.U().mesh().solverDict
mixture.U().mesh().solution().solverDict
(
mixture_.alpha1().name()
).lookup<scalar>("cAlpha")

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/createFields.H
View File

@ -62,7 +62,7 @@ if (p_rgh.needReference() && fluid.incompressible())
p_rgh = p - fluid.rho()*gh;
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
PtrList<volScalarField> rAUs;
PtrList<surfaceScalarField> rAUfs;

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
View File

@ -836,7 +836,7 @@ bool Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::
implicitPhasePressure(const phaseModel& phase) const
{
return
this->mesh_.solverDict(phase.volScalarField::name()).
this->mesh_.solution().solverDict(phase.volScalarField::name()).
template lookupOrDefault<Switch>
(
"implicitPhasePressure",

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
View File

@ -609,7 +609,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctInterfaceThermo()
<< endl;
const scalar dmdtfRelax =
this->mesh().fieldRelaxationFactor(dmdtf.member());
this->mesh().solution().fieldRelaxationFactor(dmdtf.member());
dmdtf = (1 - dmdtfRelax)*dmdtf + dmdtfRelax*dmdtfNew;

5
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C
View File

@ -28,6 +28,7 @@ License
#include "sinteringModel.H"
#include "fvm.H"
#include "fvcDdt.H"
#include "fvcDiv.H"
#include "mixedFvPatchField.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -204,8 +205,8 @@ void Foam::diameterModels::shapeModels::fractal::correct()
fvScalarMatrix kappaEqn
(
fvm::ddt(alpha, fi, kappa_)
+ fvm::div(fAlphaPhi, kappa_)
fvm::ddt(alpha, fi, kappa_) + fvm::div(fAlphaPhi, kappa_)
- fvm::Sp(fvc::ddt(alpha, fi) + fvc::div(fAlphaPhi), kappa_)
==
- sinteringModel_->R()
+ Su_

3
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C
View File

@ -224,7 +224,8 @@ void Foam::diameterModels::velocityGroup::correct()
if
(
phase().mesh().solverDict(popBalName_).lookupOrDefault<Switch>
phase().mesh().solution().solverDict(popBalName_)
.lookupOrDefault<Switch>
(
"scale",
true

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
View File

@ -335,7 +335,7 @@ Foam::phaseSystem::phaseSystem
forAll(phases(), phasei)
{
const volScalarField& alphai = phases()[phasei];
mesh_.setFluxRequired(alphai.name());
mesh_.schemes().setFluxRequired(alphai.name());
}
}

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C
View File

@ -47,7 +47,7 @@ void Foam::phaseSystem::solve
const PtrList<surfaceScalarField>& rAUfs
)
{
const dictionary& alphaControls = mesh_.solverDict("alpha");
const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
const label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
const label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));

7
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
View File

@ -33,6 +33,7 @@ License
#include "surfaceTensionModel.H"
#include "fvm.H"
#include "fvcDdt.H"
#include "fvcDiv.H"
#include "shapeModel.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -1036,7 +1037,7 @@ void Foam::diameterModels::populationBalanceModel::solve()
{
const label nCorr = this->nCorr();
const scalar tolerance =
mesh_.solverDict(name_).lookup<scalar>("tolerance");
mesh_.solution().solverDict(name_).lookup<scalar>("tolerance");
if (nCorr > 0)
{
@ -1070,8 +1071,8 @@ void Foam::diameterModels::populationBalanceModel::solve()
fvScalarMatrix sizeGroupEqn
(
fvm::ddt(alpha, fi)
+ fvm::div(phase.alphaPhi(), fi)
fvm::ddt(alpha, fi) + fvm::div(phase.alphaPhi(), fi)
- fvm::Sp(fvc::ddt(alpha) + fvc::div(phase.alphaPhi()), fi)
==
Su_[i]
- fvm::Sp(Sp_[i], fi)

6
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
View File

@ -29,7 +29,7 @@ inline Foam::label
Foam::diameterModels::populationBalanceModel::sourceUpdateInterval() const
{
return
mesh_.solverDict(name_)
mesh_.solution().solverDict(name_)
.lookupOrDefault<label>("sourceUpdateInterval", 1);
}
@ -59,7 +59,7 @@ Foam::diameterModels::populationBalanceModel::dict() const
inline Foam::label Foam::diameterModels::populationBalanceModel::nCorr() const
{
return mesh_.solverDict(name_).lookup<label>("nCorr");
return mesh_.solution().solverDict(name_).lookup<label>("nCorr");
}
@ -67,7 +67,7 @@ inline Foam::Switch
Foam::diameterModels::populationBalanceModel::solveOnFinalIterOnly() const
{
return
mesh_.solverDict(name_).lookupOrDefault<bool>
mesh_.solution().solverDict(name_).lookupOrDefault<bool>
(
"solveOnFinalIterOnly",
false

2
applications/solvers/multiphase/multiphaseInterFoam/createFields.H
View File

@ -83,7 +83,7 @@ if (p_rgh.needReference())
p_rgh = p - rho*gh;
}
mesh.setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(p_rgh.name());
#include "createMRF.H"
#include "createFvModels.H"

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -303,7 +303,7 @@ void Foam::multiphaseMixture::solve()
volScalarField& alpha = phases_.first();
const dictionary& alphaControls = mesh_.solverDict("alpha");
const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
scalar cAlpha(alphaControls.lookup<scalar>("cAlpha"));

2
applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
View File

@ -73,7 +73,7 @@ p_gh = p - (g & mesh.C());
pressureReference pressureReference(p_gh, pimple.dict());
mesh.setFluxRequired(p_gh.name());
mesh.schemes().setFluxRequired(p_gh.name());
#include "createMRF.H"
#include "createFvModels.H"

2
applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
View File

@ -1,3 +1,3 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));

4
applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
View File

@ -102,5 +102,5 @@ if (p_rgh.needReference())
p_rgh = p - rho*gh;
}
mesh.setFluxRequired(p_rgh.name());
mesh.setFluxRequired(alpha1.name());
mesh.schemes().setFluxRequired(p_rgh.name());
mesh.schemes().setFluxRequired(alpha1.name());

3
applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
View File

@ -1,3 +1,4 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
const dictionary& stressControl =
mesh.solution().dict().subDict("stressAnalysis");
Switch compactNormalStress(stressControl.lookup("compactNormalStress"));

2
applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
View File

@ -51,7 +51,7 @@ else
divSigmaExp -= fvc::div((2*mu + lambda)*fvc::grad(D), "div(sigmaD)");
}
mesh.setFluxRequired(D.name());
mesh.schemes().setFluxRequired(D.name());
#include "createFvModels.H"
#include "createFvConstraints.H"

2
applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
View File

@ -1,6 +1,6 @@
{
const dictionary& stressControl =
mesh.solutionDict().subDict("stressAnalysis");
mesh.solution().dict().subDict("stressAnalysis");
nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
convergenceTolerance = stressControl.lookup<scalar>("D");

2
applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
View File

@ -1,5 +1,5 @@
const scalar accFac
(
mesh.solutionDict().subDict("stressAnalysis")
mesh.solution().dict().subDict("stressAnalysis")
.lookup<scalar>("accelerationFactor")
);